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

Part XXXIV
Modules
shell, slideshow, sot, starmath

3 files changed, 7 insertions, 7 deletions

diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index d6a5f53b06d1..9cf5a4f65a80 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -1290,7 +1290,7 @@ sal_Int32 SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::s
 
     ::rtl::OUString aMediaType;
     xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= aMediaType;
-    if ( aMediaType.getLength() )
+    if ( !aMediaType.isEmpty() )
     {
         ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
         aDataFlavor.MimeType = aMediaType;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index c1981aa2fc99..dc21316b0497 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1840,7 +1840,7 @@ void UCBStorage_Impl::Init()
             try {
                 Any aAny = m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                 rtl::OUString aTmp;
-                if ( ( aAny >>= aTmp ) && aTmp.getLength() )
+                if ( ( aAny >>= aTmp ) && !aTmp.isEmpty() )
                     m_aContentType = m_aOriginalContentType = aTmp;
             }
             catch( Exception& )
@@ -1977,7 +1977,7 @@ void UCBStorage_Impl::ReadContent()
                     Any aAny = aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                     if ( ( aAny >>= aMediaType ) && ( aMediaType.compareToAscii("application/vnd.sun.star.oleobject") == 0 ) )
                         pElement->m_bIsStorage = sal_True;
-                    else if ( !aMediaType.getLength() )
+                    else if ( aMediaType.isEmpty() )
                     {
                         // older files didn't have that special content type, so they must be detected
                         OpenStream( pElement, STREAM_STD_READ, m_bDirect );
@@ -2063,12 +2063,12 @@ sal_Int32 UCBStorage_Impl::GetObjectCount()
                 rtl::OUString aTmp;
                 if ( ( rAny.Value >>= aTmp ) && aTmp == rPath )
                     bFound = sal_True;
-                if ( aType.getLength() )
+                if ( !aType.isEmpty() )
                     break;
             }
             else if ( rAny.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
             {
-                if ( ( rAny.Value >>= aType ) && aType.getLength() && bFound )
+                if ( ( rAny.Value >>= aType ) && !aType.isEmpty() && bFound )
                     break;
             }
         }
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index ce4c6a7931ad..cdf5470c01dc 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -129,7 +129,7 @@ void OLESimpleStorage::UpdateOriginal_Impl()
 void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< io::XInputStream >& xInputStream )
     throw ( uno::Exception )
 {
-    if ( !pStorage || !aName.getLength() || !xInputStream.is() )
+    if ( !pStorage || aName.isEmpty() || !xInputStream.is() )
         throw uno::RuntimeException();
 
     if ( pStorage->IsContained( aName ) )
@@ -174,7 +174,7 @@ void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, :
 void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess )
     throw ( uno::Exception )
 {
-    if ( !pStorage || !aName.getLength() || !xNameAccess.is() )
+    if ( !pStorage || aName.isEmpty() || !xNameAccess.is() )
         throw uno::RuntimeException();
 
     if ( pStorage->IsContained( aName ) )