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

Part XXII
modules
jvmfwk, l10ntools, lingucomponent

5 files changed, 20 insertions, 20 deletions

diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index 836f80fefbc2..2bf56d4c12d5 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -183,7 +183,7 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
     struct dirent   *dirp;
     DIR             *dir;
 
-    if( sFullpath.getLength() < 1 ) return;
+    if(sFullpath.isEmpty()) return;
 
     rtl::OString   sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 );
 
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 041b57d34b7a..dc07f414afeb 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -222,7 +222,7 @@ extern FILE *GetNextFile()
 /*****************************************************************************/
 {
     // look for next valid filename in input file list
-    if ( sTempFile.getLength())
+    if ( !sTempFile.isEmpty())
     {
         fclose( pTempFile );
         String sTemp(rtl::OStringToOUString(sTempFile,
@@ -941,7 +941,7 @@ int Export::Execute( int nToken, const char * pToken )
                         }
                         else
                         {
-                            if (pResData->sText[ sLangIndex ].getLength())
+                            if (!pResData->sText[ sLangIndex ].isEmpty())
                             {
                                 rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
                                 sError.append(sLangIndex);
@@ -963,7 +963,7 @@ int Export::Execute( int nToken, const char * pToken )
                             PrepareTextToMerge( sOrig, STRING_TYP_HELPTEXT, sLangIndex, pResData );
                         else
                         {
-                            if (pResData->sHelpText[ sLangIndex ].getLength())
+                            if (!pResData->sHelpText[ sLangIndex ].isEmpty())
                             {
                                 rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
                                 sError.append(sLangIndex);
@@ -980,7 +980,7 @@ int Export::Execute( int nToken, const char * pToken )
                             PrepareTextToMerge( sOrig, STRING_TYP_QUICKHELPTEXT, sLangIndex, pResData );
                         else
                         {
-                            if (pResData->sQuickHelpText[ sLangIndex ].getLength())
+                            if (!pResData->sQuickHelpText[ sLangIndex ].isEmpty())
                             {
                                 rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
                                 sError.append(sLangIndex);
@@ -997,7 +997,7 @@ int Export::Execute( int nToken, const char * pToken )
                             PrepareTextToMerge( sOrig, STRING_TYP_TITLE, sLangIndex, pResData );
                         else
                         {
-                            if ( pResData->sTitle[ sLangIndex ].getLength())
+                            if ( !pResData->sTitle[ sLangIndex ].isEmpty())
                             {
                                 rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
                                 sError.append(sLangIndex);
@@ -1160,13 +1160,13 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
 
        // mandatory to export: en-US
 
-     if (( pResData->sText[ SOURCE_LANGUAGE ].getLength())
+     if (( !pResData->sText[ SOURCE_LANGUAGE ].isEmpty())
         ||
-        (  pResData->sHelpText[ SOURCE_LANGUAGE ].getLength())
+        (  !pResData->sHelpText[ SOURCE_LANGUAGE ].isEmpty())
         ||
-        (  pResData->sQuickHelpText[ SOURCE_LANGUAGE ].getLength())
+        (  !pResData->sQuickHelpText[ SOURCE_LANGUAGE ].isEmpty())
          ||
-        (  pResData->sTitle[ SOURCE_LANGUAGE ].getLength()))
+        (  !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty()))
 
        {
         ByteString sGID = pResData->sGId;
@@ -1187,25 +1187,25 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
         for( unsigned int n = 0; n < aLanguages.size(); n++ ){
             sCur = aLanguages[ n ];
                 if ( !sCur.EqualsIgnoreCaseAscii("x-comment") ){
-                    if (pResData->sText[ sCur ].getLength())
+                    if (!pResData->sText[ sCur ].isEmpty())
                         sXText = pResData->sText[ sCur ];
                     else {
                         sXText = pResData->sText[ SOURCE_LANGUAGE ];
                     }
 
-                    if (pResData->sHelpText[ sCur ].getLength())
+                    if (!pResData->sHelpText[ sCur ].isEmpty())
                         sXHText = pResData->sHelpText[ sCur ];
                     else {
                         sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
                     }
 
-                    if (pResData->sQuickHelpText[ sCur ].getLength())
+                    if (!pResData->sQuickHelpText[ sCur ].isEmpty())
                         sXQHText = pResData->sQuickHelpText[ sCur ];
                     else {
                         sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
                     }
 
-                    if (pResData->sTitle[ sCur ].getLength())
+                    if (!pResData->sTitle[ sCur ].isEmpty())
                         sXTitle = pResData->sTitle[ sCur ];
                     else
                         sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
@@ -1215,7 +1215,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
 
                     if ( !sXHText.Len())
                     {
-                        if (pResData->sHelpText[ SOURCE_LANGUAGE ].getLength())
+                        if (!pResData->sHelpText[ SOURCE_LANGUAGE ].isEmpty())
                             sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
                     }
                 }
@@ -1334,7 +1334,7 @@ sal_Bool Export::WriteExportList( ResData *pResData, ExportList *pExportList,
         for (unsigned int n = 0; n < aLanguages.size(); ++n)
         {
             sCur = aLanguages[ n ];
-            if ((*pEntry)[ SOURCE_LANGUAGE ].getLength())
+            if (!(*pEntry)[ SOURCE_LANGUAGE ].isEmpty())
             {
                 if ( bEnableExport )
                 {
@@ -1344,7 +1344,7 @@ sal_Bool Export::WriteExportList( ResData *pResData, ExportList *pExportList,
                     if( rTyp.EqualsIgnoreCaseAscii("pairedlist") )
                     {
                         sLID = GetPairedListID( sText );
-                        if ((*pEntry)[ sCur ].getLength())
+                        if (!(*pEntry)[ sCur ].isEmpty())
                             sText = (*pEntry)[ sCur ];
                         sText = GetPairedListString( sText );
                     }
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index b2e061cc3825..5e0ec8d032cb 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
@@ -115,7 +115,7 @@ namespace fs
             rtl::OString tmp(rtl::OUStringToOString(data, RTL_TEXTENCODING_UTF8));
             return std::string(tmp.getStr());
         }
-        bool empty() const { return data.getLength() == 0; }
+        bool empty() const { return data.isEmpty(); }
         path operator/(const std::string &in) const
         {
             path ret(*this);
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 6ff89316772e..47d1ddf2b8ba 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -200,7 +200,7 @@ bool HelpParser::CreateSDF(
                   sBuffer.append( GSI_SEQUENCE4 );      //"\t\t\t\t";
                 sBuffer.append( sOUTimeStamp );
                 rtl::OString sOut(rtl::OUStringToOString(sBuffer.makeStringAndClear().getStr() , RTL_TEXTENCODING_UTF8));
-                if( data.getLength() > 0 )
+                if( !data.isEmpty() )
                     aSDFStream.WriteLine( sOut );
                 pXMLElement=NULL;
             }else fprintf(stdout,"\nDBG: NullPointer in HelpParser::CreateSDF , Language %s\n",sCur.GetBuffer() );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index fb397582a9a7..db31f186abeb 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -190,7 +190,7 @@ MergeDataFile::MergeDataFile(
     ByteString sLine;
     const ByteString sHACK("HACK");
     const ::rtl::OString sFileNormalized(lcl_NormalizeFilename(sFile));
-    const bool isFileEmpty = sFileNormalized.getLength();
+    const bool isFileEmpty = !sFileNormalized.isEmpty();
 
     if( !aInputStream.IsOpen() )
     {