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

Part XII
Module
dbaccess

5 files changed, 13 insertions, 13 deletions

diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index 6f153937fe2f..f139b02a4215 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -244,7 +244,7 @@ namespace COMPMOD_NAMESPACE
         const Reference< XMultiServiceFactory >& _rxServiceManager)
     {
         OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
-        OSL_ENSURE(_rImplementationName.getLength(), "OModule::getComponentFactory : invalid argument (implementation name) !");
+        OSL_ENSURE(!_rImplementationName.isEmpty(), "OModule::getComponentFactory : invalid argument (implementation name) !");
 
         if (!s_pImplementationNames)
         {
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index 021c23b65373..25940ac8c389 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -105,7 +105,7 @@ namespace dbmm
         DocumentPasswordRequest aRequest(
             ::rtl::OUString(), NULL,
             InteractionClassification_QUERY,
-            _io_rPassword.getLength() ? PasswordRequestMode_PASSWORD_REENTER : PasswordRequestMode_PASSWORD_ENTER,
+            _io_rPassword.isEmpty() ? PasswordRequestMode_PASSWORD_ENTER : PasswordRequestMode_PASSWORD_REENTER,
             _rDocumentName
         );
 
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index d2977ee4751d..54be4c4c3f74 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1069,8 +1069,8 @@ namespace dbmm
             SubDocuments& _out_rDocs, const SubDocumentType _eType, size_t& _io_counter )
         {
             const ::rtl::OUString sHierarhicalBase(
-                _rContainerLoc.getLength()  ?   ::rtl::OUStringBuffer( _rContainerLoc ).appendAscii( "/" ).makeStringAndClear()
-                                            :   ::rtl::OUString() );
+                _rContainerLoc.isEmpty() ? ::rtl::OUString() :
+                                           ::rtl::OUStringBuffer( _rContainerLoc ).appendAscii( "/" ).makeStringAndClear());
 
             Sequence< ::rtl::OUString > aElementNames( _rxContainer->getElementNames() );
             for (   const ::rtl::OUString* elementName = aElementNames.getConstArray();
@@ -1625,8 +1625,8 @@ namespace dbmm
     bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( const ::rtl::OUString& _rScriptType,
             ::rtl::OUString& _inout_rScriptCode ) const
     {
-        OSL_PRECOND( _inout_rScriptCode.getLength(), "MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: invalid script!" );
-        if ( !_inout_rScriptCode.getLength() )
+        OSL_PRECOND( !_inout_rScriptCode.isEmpty(), "MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: invalid script!" );
+        if ( _inout_rScriptCode.isEmpty() )
             return false;
 
         bool bSuccess = false;
@@ -1634,7 +1634,7 @@ namespace dbmm
         try
         {
             if  (   !_rScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) )
-                ||  !_rScriptType.getLength()
+                ||  _rScriptType.isEmpty()
                 )
             {
                 OSL_FAIL(
@@ -1724,7 +1724,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( ScriptEventDescriptor& _inout_rScriptEvent ) const
     {
-        if ( _inout_rScriptEvent.ScriptType.getLength() && _inout_rScriptEvent.ScriptCode.getLength() )
+        if ( !(_inout_rScriptEvent.ScriptType.isEmpty() || _inout_rScriptEvent.ScriptCode.isEmpty()) )
             return impl_adjustScriptLibrary_nothrow( _inout_rScriptEvent.ScriptType, _inout_rScriptEvent.ScriptCode );
         return false;
     }
@@ -1749,7 +1749,7 @@ namespace dbmm
             ) );
         }
 
-        if ( sScriptType.getLength() && sScript.getLength() )
+        if ( !(sScriptType.isEmpty() || sScript.isEmpty()) )
             if ( !impl_adjustScriptLibrary_nothrow( sScriptType, sScript ) )
                 return false;
 
diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index aee93d10bdc6..9b7440a4aae7 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -160,9 +160,9 @@ namespace dbmm
                     const ::rtl::OUString& _rDetail3 = ::rtl::OUString()
                 )
         {
-            if ( _rDetail1.getLength() ) aErrorDetails.push_back( _rDetail1 );
-            if ( _rDetail2.getLength() ) aErrorDetails.push_back( _rDetail2 );
-            if ( _rDetail3.getLength() ) aErrorDetails.push_back( _rDetail3 );
+            if ( !_rDetail1.isEmpty() ) aErrorDetails.push_back( _rDetail1 );
+            if ( !_rDetail2.isEmpty() ) aErrorDetails.push_back( _rDetail2 );
+            if ( !_rDetail3.isEmpty() ) aErrorDetails.push_back( _rDetail3 );
         }
     };
 
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index db39028f399d..38ded5ae0d80 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -442,7 +442,7 @@ namespace dbmm
     {
         ::rtl::OUStringBuffer aBuffer;
 
-        if ( m_pData->sBackupLocation.getLength() )
+        if ( !m_pData->sBackupLocation.isEmpty() )
         {
             String sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
             sBackedUp.SearchAndReplaceAllAscii( "$location$", m_pData->sBackupLocation );