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

Part IX
Module
connectivity

5 files changed, 17 insertions, 17 deletions

diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 1bd5969b94ea..cdde095e21c0 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -194,7 +194,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
             t.pEnv->DeleteLocalRef((jstring)args[1].l);
             OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" );
         }
-        if(tableNamePattern.getLength())
+        if(!tableNamePattern.isEmpty())
         {
             t.pEnv->DeleteLocalRef((jstring)args[2].l);
             OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" );
@@ -374,7 +374,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
             t.pEnv->DeleteLocalRef((jstring)args[0].l);
         if(args[1].l)
             t.pEnv->DeleteLocalRef((jstring)args[1].l);
-        if(table.getLength())
+        if(!table.isEmpty())
             t.pEnv->DeleteLocalRef((jstring)args[2].l);
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     }
@@ -413,7 +413,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier
             t.pEnv->DeleteLocalRef((jstring)args[0].l);
         if(args[1].l)
             t.pEnv->DeleteLocalRef((jstring)args[1].l);
-        if(table.getLength())
+        if(!table.isEmpty())
             t.pEnv->DeleteLocalRef((jstring)args[2].l);
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     }
@@ -532,13 +532,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference(
             t.pEnv->DeleteLocalRef((jstring)args[0].l);
         if(args[1].l)
             t.pEnv->DeleteLocalRef((jstring)args[1].l);
-        if(primaryTable.getLength())
+        if(!primaryTable.isEmpty())
             t.pEnv->DeleteLocalRef((jstring)args[2].l);
         if(foreignCatalog.hasValue())
             t.pEnv->DeleteLocalRef((jstring)args[3].l);
         if(args[4].l)
             t.pEnv->DeleteLocalRef((jstring)args[4].l);
-        if(foreignTable.getLength())
+        if(!foreignTable.isEmpty())
             t.pEnv->DeleteLocalRef((jstring)args[5].l);
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     }
@@ -568,7 +568,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod
     if ( m_aLogger.isLoggable( LogLevel::FINEST ) )
     {
         ::rtl::OUString sLoggedResult( sReturn );
-        if ( !sLoggedResult.getLength() )
+        if ( sLoggedResult.isEmpty() )
             sLoggedResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<empty string>" ) );
         m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult );
     }
@@ -1175,7 +1175,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL(  ) t
 ::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString sURL = m_pConnection->getURL();
-    if ( !sURL.getLength() )
+    if ( sURL.isEmpty() )
     {
         static jmethodID mID(NULL);
         sURL = impl_callStringMethod( "getURL", mID );
@@ -1446,9 +1446,9 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs(
 
             if(catalog.hasValue())
                 t.pEnv->DeleteLocalRef((jstring)args[0].l);
-            if(schemaPattern.getLength())
+            if(!schemaPattern.isEmpty())
                 t.pEnv->DeleteLocalRef((jstring)args[1].l);
-            if(typeNamePattern.getLength())
+            if(!typeNamePattern.isEmpty())
                 t.pEnv->DeleteLocalRef((jstring)args[2].l);
             if(args[3].l)
                 t.pEnv->DeleteLocalRef((jintArray)args[3].l);
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index af15252bc6c1..4a7650c5da39 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -605,7 +605,7 @@ namespace
                 STR_NO_CLASSNAME,
                 "$classname$", _rDriverClass
              ) );
-        if ( _rDriverClassPath.getLength() )
+        if ( !_rDriverClassPath.isEmpty() )
         {
             const ::rtl::OUString sError2( _aResource.getResourceStringWithSubstitution(
                 STR_NO_CLASSNAME_PATH,
@@ -687,7 +687,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
             java_sql_SQLException_BASE::st_getMyClass();
             java_lang_Throwable::st_getMyClass();
 
-            if ( !_sDriverClass.getLength() )
+            if ( _sDriverClass.isEmpty() )
             {
                 m_aLogger.log( LogLevel::SEVERE, STR_LOG_NO_DRIVER_CLASS );
                 ::dbtools::throwGenericSQLException(
@@ -700,7 +700,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
                 m_aLogger.log( LogLevel::INFO, STR_LOG_LOADING_DRIVER, _sDriverClass );
                 // the driver manager holds the class of the driver for later use
                 ::std::auto_ptr< java_lang_Class > pDrvClass;
-                if ( !_sDriverClassPath.getLength() )
+                if ( _sDriverClassPath.isEmpty() )
                 {
                     // if forName didn't find the class it will throw an exception
                     pDrvClass = ::std::auto_ptr< java_lang_Class >(java_lang_Class::forName(_sDriverClass));
@@ -799,7 +799,7 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
     ::comphelper::NamedValueCollection aSettings( info );
     sDriverClass = aSettings.getOrDefault( "JavaDriverClass", sDriverClass );
     sDriverClassPath = aSettings.getOrDefault( "JavaDriverClassPath", sDriverClassPath);
-    if ( !sDriverClassPath.getLength() )
+    if ( sDriverClassPath.isEmpty() )
         sDriverClassPath = impl_getJavaDriverClassPath_nothrow(sDriverClass);
     bAutoRetrievingEnabled = aSettings.getOrDefault( "IsAutoRetrievingEnabled", bAutoRetrievingEnabled );
     sGeneratedValueStatement = aSettings.getOrDefault( "AutoRetrievingStatement", sGeneratedValueStatement );
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index f327d79f88ea..f10dfd325974 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -179,7 +179,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  )
         if ( m_pConnection )
         {
             ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement);
-            if ( sStmt.getLength() )
+            if ( !sStmt.isEmpty() )
             {
                 m_aLogger.log( LogLevel::FINER, STR_LOG_GENERATED_VALUES_FALLBACK, sStmt );
                 ::comphelper::disposeComponent(m_xGeneratedStatement);
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 5c552c0c0ef8..4cace9ac636a 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -192,9 +192,9 @@ namespace
         {
             ::std::auto_ptr< java_lang_Throwable > pThrow( new java_lang_Throwable( _pEnvironment, jThrow ) );
             ::rtl::OUString sMessage = pThrow->getMessage();
-            if ( !sMessage.getLength() )
+            if ( sMessage.isEmpty() )
                 sMessage = pThrow->getLocalizedMessage();
-            if(  !sMessage.getLength() )
+            if(  sMessage.isEmpty() )
                 sMessage = pThrow->toString();
             _out_rException = SQLException( sMessage, _rxContext, ::rtl::OUString(), -1, Any() );
             return true;
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 8f90a1cdd951..d1ed30769682 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -356,7 +356,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
                             ORowSetValue aValue;
                             aValue.fill(x);
                             const ::rtl::OUString sValue = aValue;
-                            if ( sValue.getLength() )
+                            if ( !sValue.isEmpty() )
                                 pBigDecimal.reset(new java_math_BigDecimal(sValue));
                             else
                                 pBigDecimal.reset(new java_math_BigDecimal(0.0));