[Libreoffice-commits] .: embeddedobj/source

2011-12-22 Thread Caolán McNamara 
 embeddedobj/source/commonembedding/persistence.cxx |   34 ++---
 embeddedobj/source/commonembedding/xfactory.cxx|   22 ++---
 embeddedobj/source/general/docholder.cxx   |8 ++--
 embeddedobj/source/general/dummyobject.cxx |4 +-
 embeddedobj/source/general/xcreator.cxx|   24 +++---
 embeddedobj/source/msole/oleembed.cxx  |   20 ++--
 embeddedobj/source/msole/olemisc.cxx   |4 +-
 embeddedobj/source/msole/olepersist.cxx|   24 +++---
 embeddedobj/source/msole/ownview.cxx   |   26 
 embeddedobj/source/msole/xolefactory.cxx   |   10 +++---
 10 files changed, 88 insertions(+), 88 deletions(-)

New commits:
commit 7c0c3362de894ddd4526f56e1849f116eb25cedd
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Wed Dec 21 19:54:11 2011 -0200

Fix for fdo43460 Part XV getLength() to isEmpty()

Part XV
Module
embeddeobj

diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index 8afe92d..654e221 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -246,7 +246,7 @@ static void SetDocToEmbedded( const uno::Reference 
frame::XModel  xDocument, c
 aSeq[0].Value = sal_True;
 xDocument-attachResource( ::rtl::OUString(), aSeq );
 
-if ( aModuleName.getLength() )
+if ( !aModuleName.isEmpty() )
 {
 try
 {
@@ -465,7 +465,7 @@ uno::Reference util::XCloseable  
OCommonEmbeddedObject::LoadLink_Impl()
 ::rtl::OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) 
const
 {
 ::rtl::OUString aFilterName = GetPresetFilterName();
-if ( !aFilterName.getLength() )
+if ( aFilterName.isEmpty() )
 {
 try {
 ::comphelper::MimeConfigurationHelper aHelper( m_xFactory );
@@ -486,8 +486,8 @@ void OCommonEmbeddedObject::FillDefaultLoadArgs_Impl( const 
uno::Reference embe
 o_rLoadArgs.put( ReadOnly, m_bReadOnly );
 
 ::rtl::OUString aFilterName = GetFilterName( 
::comphelper::OStorageHelper::GetXStorageFormat( i_rxStorage ) );
-OSL_ENSURE( aFilterName.getLength(), 
OCommonEmbeddedObject::FillDefaultLoadArgs_Impl: Wrong document service name! 
);
-if ( !aFilterName.getLength() )
+OSL_ENSURE( !aFilterName.isEmpty(), 
OCommonEmbeddedObject::FillDefaultLoadArgs_Impl: Wrong document service name! 
);
+if ( aFilterName.isEmpty() )
 throw io::IOException();// TODO: error message/code
 
 o_rLoadArgs.put( FilterName, aFilterName );
@@ -543,7 +543,7 @@ uno::Reference util::XCloseable  
OCommonEmbeddedObject::LoadDocumentFromStorag
 {
 }
 
-OSL_ENSURE( aTempFileURL.getLength(), Coudn't retrieve temporary file 
URL!\n );
+OSL_ENSURE( !aTempFileURL.isEmpty(), Coudn't retrieve temporary file 
URL!\n );
 
 aLoadArgs.put( URL, aTempFileURL );
 aLoadArgs.put( InputStream, xTempInpStream );
@@ -613,8 +613,8 @@ uno::Reference io::XInputStream  
OCommonEmbeddedObject::StoreDocumentToTempStr
 
 ::rtl::OUString aFilterName = GetFilterName( nStorageFormat );
 
-OSL_ENSURE( aFilterName.getLength(), Wrong document service name! );
-if ( !aFilterName.getLength() )
+OSL_ENSURE( !aFilterName.isEmpty(), Wrong document service name! );
+if ( aFilterName.isEmpty() )
 throw io::IOException(); // TODO:
 
 uno::Sequence beans::PropertyValue  aArgs( 4 );
@@ -692,7 +692,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
 {}
 }
 
-if ( !aBaseURL.getLength() )
+if ( aBaseURL.isEmpty() )
 {
 for ( nInd = 0; nInd  m_aDocMediaDescriptor.getLength(); nInd++ )
 if ( m_aDocMediaDescriptor[nInd].Name.equals(
@@ -703,7 +703,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
 }
 }
 
-if ( !aBaseURL.getLength() )
+if ( aBaseURL.isEmpty() )
 aBaseURL = m_aDefaultParentBaseURL;
 
 return aBaseURL;
@@ -724,7 +724,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
 break;
 }
 
-if ( !aBaseURL.getLength() )
+if ( aBaseURL.isEmpty() )
 {
 for ( nInd = 0; nInd  lObjArgs.getLength(); nInd++ )
 if ( lObjArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( DefaultParentBaseURL ) ) ) )
@@ -775,8 +775,8 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const 
uno::Reference embed:
 {
 ::rtl::OUString aFilterName = GetFilterName( nStorageFormat );
 
-OSL_ENSURE( aFilterName.getLength(), Wrong document service name! );
-if ( !aFilterName.getLength() )
+OSL_ENSURE( !aFilterName.isEmpty(), Wrong document service name! );
+if ( aFilterName.isEmpty() )
 throw io::IOException(); // TODO:
 
 uno::Sequence beans::PropertyValue  aArgs( 3 );
@@ -896,7

[Libreoffice-commits] .: embeddedobj/source

2011-10-05 Thread Caolán McNamara 
 embeddedobj/source/msole/olepersist.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ed156a994ab3473b7028425f0c986ab0bf831f67
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 5 12:30:26 2011 +0100

fix post cast removal build error

diff --git a/embeddedobj/source/msole/olepersist.cxx 
b/embeddedobj/source/msole/olepersist.cxx
index 4aec3ea..540064b 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1066,7 +1066,7 @@ void OleEmbeddedObject::StoreObjectToStream( 
uno::Reference io::XOutputStream 
 m_pOleComponent-StoreOwnTmpIfNecessary();
 
 // now all the changes should be in temporary location
-if ( !m_aTempURL )
+if ( m_aTempURL.isEmpty() )
 throw uno::RuntimeException();
 
 // open temporary file for reading
@@ -2021,7 +2021,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const 
uno::Reference embed::XStorag
 catch ( uno::Exception )
 {
 delete pNewOleComponent;
-if ( m_aTempURL )
+if ( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
 m_aTempURL = aOldTempURL;
 throw;
@@ -2033,7 +2033,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const 
uno::Reference embed::XStorag
 catch( uno::Exception )
 {
 delete pNewOleComponent;
-if ( m_aTempURL )
+if ( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
 m_aTempURL = aOldTempURL;
 throw;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits