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

Please find attached a partial fix for Easy Hack FDO43460

Part XXVII
Modules
padmin, pyuno, rdbmaker, regexp, registry, rsc, sal

25 files changed, 109 insertions, 109 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 62a4f1417a89..d23f4268b888 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -165,7 +165,7 @@ void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString& rSel
     for( std::list< rtl::OUString >::const_iterator it = aDrivers.begin(); it != aDrivers.end(); ++it )
     {
         rtl::OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) );
-        if( aDriver.getLength() )
+        if( !aDriver.isEmpty() )
         {
             int nPos = m_aDriverBox.InsertEntry( aDriver );
             m_aDriverBox.SetEntryData( nPos, new String( *it ) );
@@ -567,7 +567,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
 
         aValue = aConfig.ReadKey( "PageSize", aDefPageSize );
         int nLeft, nRight, nTop, nBottom;
-        if( aValue.getLength() &&
+        if( !aValue.isEmpty() &&
             aInfo.m_pParser->getMargins( rtl::OStringToOUString(aValue, aEncoding),
                                          nLeft, nRight, nTop, nBottom ) )
         {
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 5dc0864d276c..6ab1dfc69677 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -344,7 +344,7 @@ void RTSCommandPage::save()
             aToken.compareToAscii( "external_dialog" )
           )
         {
-            if( aToken.getLength() )
+            if( !aToken.isEmpty() )
             {
                 if( aFeatures.Len() )
                     aFeatures += ',';
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 51e996e005ea..1aeab2c6c1a2 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -278,7 +278,7 @@ void PADialog::UpdateDefPrt()
 void PADialog::UpdateText()
 {
     OUString aDev( getSelectedDevice() );
-    if( aDev.getLength() )
+    if( !aDev.isEmpty() )
     {
         const PrinterInfo& rInfo = m_rPIManager.getPrinterInfo( aDev );
         String aDriver( rInfo.m_aPrinterName );
@@ -722,7 +722,7 @@ void PADialog::UpdateDevice()
         while( nIndex != -1 && ! bAutoQueue )
         {
             OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
-            if( aToken.getLength() )
+            if( !aToken.isEmpty() )
             {
                 if( aToken.compareToAscii( "autoqueue" ) == 0 )
                     bAutoQueue = true;
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 9e93e1961c3f..dced1006d265 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -191,10 +191,10 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
 
         // pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console
         // sadly, there is no api for setting the pythonpath, we have to use the environment variable
-        if( pythonHome.getLength() )
+        if( !pythonHome.isEmpty() )
             setPythonHome( pythonHome );
 
-        if( pythonPath.getLength() )
+        if( !pythonPath.isEmpty() )
             prependPythonPath( pythonPath );
 
 #if WNT
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index f02cec84e3a0..0382259f95b3 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -270,7 +270,7 @@ static PyObject* getComponentContext (PyObject*, PyObject*)
         else
         {
             OUString iniFile;
-            if( !path.getLength() )
+            if( path.isEmpty() )
             {
                 PyErr_SetString(
                     PyExc_RuntimeError, "osl_getUrlFromAddress fails, that's why I cannot find ini "
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 21b63893323a..9dc5b5214419 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -955,7 +955,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
         else
         {
             str = OUString(RTL_CONSTASCII_USTRINGPARAM("Could not load uno.py, no stacktrace available"));
-            if ( e.Message.getLength() > 0 )
+            if ( !e.Message.isEmpty() )
             {
                 str += OUString (RTL_CONSTASCII_USTRINGPARAM(" (Error loading uno.py: "));
                 str += e.Message;
@@ -997,7 +997,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
             buf.appendAscii( "Couldn't convert exception value to a string" );
         }
         buf.appendAscii( ", traceback follows\n" );
-        if( str.getLength() > 0 )
+        if( !str.isEmpty() )
         {
             buf.append( str );
             buf.appendAscii( "\n" );
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index 8df5fd4bbeff..0ca56c33c88d 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -60,7 +60,7 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
 {
     sal_Bool ret =  sal_False;
 
-    if (type.getLength() > 0 && depend.getLength() > 0)
+    if (!type.isEmpty() && !depend.isEmpty())
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
         {
@@ -87,7 +87,7 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
 
 TypeUsingSet TypeDependency::getDependencies(const OString& type)
 {
-    if (type.getLength() > 0)
+    if (!type.isEmpty())
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
         {
@@ -100,7 +100,7 @@ TypeUsingSet TypeDependency::getDependencies(const OString& type)
 
 sal_Bool TypeDependency::hasDependencies(const OString& type)
 {
-    if (type.getLength() > 0)
+    if (!type.isEmpty())
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
         {
@@ -150,7 +150,7 @@ static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dep
     {
         fieldType = reader.getFieldType(i);
 
-        if (fieldType.getLength() > 0)
+        if (!fieldType.isEmpty())
         {
             dependencies.insert(type, fieldType, TYPEUSE_MEMBER);
             checkTypeDependencies(typeMgr, dependencies, fieldType);
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 6cf654412f7a..0f4e2ab51657 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -130,7 +130,7 @@ sal_Bool FileStream::isValid()
 
 void FileStream::open(const OString& name, FileAccessMode mode)
 {
-    if ( name.getLength() > 0 )
+    if ( !name.isEmpty() )
     {
         m_name = name;
         m_pFile = fopen(m_name.getStr(), checkAccessMode(mode));
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 4a4e8ae32a60..a383346d79bb 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -335,7 +335,7 @@ int __cdecl main( int argc, char * argv[] )
         }
     }
 
-    if ( bootReg.getLength() )
+    if ( !bootReg.isEmpty() )
     {
         pTypeMgr = new SpecialTypeManager();
         useSpecial = sal_True;
@@ -429,7 +429,7 @@ int __cdecl main( int argc, char * argv[] )
                 tmpName = typeName.copy( lastIndex+1 );
                 if (tmpName == "*")
                 {
-                    if (bootReg.getLength())
+                    if (!bootReg.isEmpty())
                     {
                         fprintf(stderr, "%s ERROR: %s\n",
                                 options.getProgramName().getStr(),
@@ -443,7 +443,7 @@ int __cdecl main( int argc, char * argv[] )
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.isEmpty())
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -476,7 +476,7 @@ int __cdecl main( int argc, char * argv[] )
         {
         } else
         {
-            if (!bootReg.getLength())
+            if (bootReg.isEmpty())
             {
                 // produce all types
                 if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True,
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index ea717b95edda..7e051fab7742 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -755,7 +755,7 @@ Regexpr::Regexpr( const ::com::sun::star::util::SearchOptions & rOptions,
   }
 
   if ( rOptions.searchString == NULL ||
-       rOptions.searchString.getLength() <= 0) {
+       rOptions.searchString.isEmpty()) {
     return;
   }
 
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 6657cb3f5fb7..c48ae9c8680a 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -105,7 +105,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
     *pnSubKeys = 0;
 
     ORegKey* pKey = this;
-    if ( keyName.getLength() )
+    if ( !keyName.isEmpty() )
     {
         _ret = openKey(keyName, (RegKeyHandle*)&pKey);
         if (_ret != REG_NO_ERROR)
@@ -148,7 +148,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
     }
 
     *phOpenSubKeys = (RegKeyHandle*)pSubKeys;
-    if (keyName.getLength())
+    if (!keyName.isEmpty())
     {
         (void) releaseKey(pKey);
     }
@@ -169,7 +169,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName,
     *pnSubKeys = 0;
 
     ORegKey* pKey = this;
-    if (keyName.getLength())
+    if (!keyName.isEmpty())
     {
         _ret = openKey(keyName, (RegKeyHandle*)&pKey);
         if (_ret != REG_NO_ERROR)
@@ -208,7 +208,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName,
     }
 
     *pSubKeyNames = pSubKeys;
-    if (keyName.getLength())
+    if (!keyName.isEmpty())
     {
         releaseKey(pKey);
     }
@@ -982,7 +982,7 @@ RegError ORegKey::getKeyType(const OUString& name, RegKeyType* pKeyType) const
 
     REG_GUARD(m_pRegistry->m_mutex);
 
-    if ( name.getLength() )
+    if ( !name.isEmpty() )
     {
         ORegKey* pThis = const_cast< ORegKey* >(this);
 
@@ -999,7 +999,7 @@ RegError ORegKey::getKeyType(const OUString& name, RegKeyType* pKeyType) const
 RegError ORegKey::getResolvedKeyName(const OUString& keyName,
                                      OUString& resolvedName)
 {
-    if (keyName.getLength() == 0)
+    if (keyName.isEmpty())
         return REG_INVALID_KEYNAME;
 
     resolvedName = getFullPath(keyName);
@@ -1059,7 +1059,7 @@ OStoreDirectory ORegKey::getStoreDir()
 }
 
 OUString ORegKey::getFullPath(OUString const & path) const {
-    OSL_ASSERT(m_name.getLength() != 0 && path.getLength() != 0);
+    OSL_ASSERT(!m_name.isEmpty() && !path.isEmpty());
     OUStringBuffer b(m_name);
     if (b.getLength() > 0 && b[b.getLength() - 1] == '/') {
         if (path[0] == '/') {
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 3f19d00c349e..9fb415aa2277 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -838,7 +838,7 @@ void TypeWriter::createBlop()
     }
 
     // create CP entry for doku
-    if (m_doku.getLength())
+    if (!m_doku.isEmpty())
     {
         pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
         pInfo->m_value.aUtf8 = m_doku.getStr();
@@ -846,7 +846,7 @@ void TypeWriter::createBlop()
     }
 
     // create CP entry for idl source filename
-    if (m_fileName.getLength())
+    if (!m_fileName.isEmpty())
     {
         pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
         pInfo->m_value.aUtf8 = m_fileName.getStr();
@@ -884,7 +884,7 @@ void TypeWriter::createBlop()
 
             pBuffer += writeUINT16(pBuffer, m_fields[i].m_access);
 
-            if (m_fields[i].m_name.getLength())
+            if (!m_fields[i].m_name.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_fields[i].m_name.getStr();
@@ -892,7 +892,7 @@ void TypeWriter::createBlop()
             }
             pBuffer += writeUINT16(pBuffer, cpIndexName);
 
-            if (m_fields[i].m_typeName.getLength())
+            if (!m_fields[i].m_typeName.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_fields[i].m_typeName.getStr();
@@ -908,7 +908,7 @@ void TypeWriter::createBlop()
             }
             pBuffer += writeUINT16(pBuffer, cpIndexValue);
 
-            if (m_fields[i].m_doku.getLength())
+            if (!m_fields[i].m_doku.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_fields[i].m_doku.getStr();
@@ -916,7 +916,7 @@ void TypeWriter::createBlop()
             }
             pBuffer += writeUINT16(pBuffer, cpIndexDoku2);
 
-            if (m_fields[i].m_fileName.getLength())
+            if (!m_fields[i].m_fileName.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_fields[i].m_fileName.getStr();
@@ -970,7 +970,7 @@ void TypeWriter::createBlop()
                 pBuffer,
                 sal::static_int_cast< sal_uInt16 >(m_methods[i].m_mode));
 
-            if (m_methods[i].m_name.getLength())
+            if (!m_methods[i].m_name.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_methods[i].m_name.getStr();
@@ -979,7 +979,7 @@ void TypeWriter::createBlop()
             pBuffer += writeUINT16(pBuffer, cpIndexName);
             cpIndexName = 0;
 
-            if (m_methods[i].m_returnTypeName.getLength())
+            if (!m_methods[i].m_returnTypeName.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_methods[i].m_returnTypeName.getStr();
@@ -987,7 +987,7 @@ void TypeWriter::createBlop()
             }
             pBuffer += writeUINT16(pBuffer, cpIndexReturn);
 
-            if (m_methods[i].m_doku.getLength())
+            if (!m_methods[i].m_doku.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_methods[i].m_doku.getStr();
@@ -1001,7 +1001,7 @@ void TypeWriter::createBlop()
 
             for (j = 0; j < m_methods[i].m_paramCount; j++)
             {
-                if (m_methods[i].m_params[j].m_typeName.getLength())
+                if (!m_methods[i].m_params[j].m_typeName.isEmpty())
                 {
                     pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                     pInfo->m_value.aUtf8 = m_methods[i].m_params[j].m_typeName.getStr();
@@ -1015,7 +1015,7 @@ void TypeWriter::createBlop()
                     sal::static_int_cast< sal_uInt16 >(
                         m_methods[i].m_params[j].m_mode));
 
-                if (m_methods[i].m_params[j].m_name.getLength())
+                if (!m_methods[i].m_params[j].m_name.isEmpty())
                 {
                     pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                     pInfo->m_value.aUtf8 = m_methods[i].m_params[j].m_name.getStr();
@@ -1029,7 +1029,7 @@ void TypeWriter::createBlop()
 
             for (j = 0; j < m_methods[i].m_excCount; j++)
             {
-                if (m_methods[i].m_excNames[j].getLength())
+                if (!m_methods[i].m_excNames[j].isEmpty())
                 {
                     pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                     pInfo->m_value.aUtf8 = m_methods[i].m_excNames[j].getStr();
@@ -1070,7 +1070,7 @@ void TypeWriter::createBlop()
             cpIndexName = 0;
             cpIndexDoku2 = 0;
 
-            if (m_references[i].m_name.getLength())
+            if (!m_references[i].m_name.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_references[i].m_name.getStr();
@@ -1078,7 +1078,7 @@ void TypeWriter::createBlop()
             }
             pBuffer += writeUINT16(pBuffer, cpIndexName);
 
-            if (m_references[i].m_doku.getLength())
+            if (!m_references[i].m_doku.isEmpty())
             {
                 pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
                 pInfo->m_value.aUtf8 = m_references[i].m_doku.getStr();
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 027f6c2a7612..5eb88c7c36d8 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -481,7 +481,7 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
         m_readOnly = sal_True;
     }
 
-    if (0 == regName.getLength() &&
+    if (regName.isEmpty() &&
         store_AccessCreate == sAccessMode)
     {
         errCode = rRegFile.createInMemory();
@@ -555,7 +555,7 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
 {
     REG_GUARD(m_mutex);
 
-    if (regName.getLength())
+    if (!regName.isEmpty())
     {
         ORegistry* pReg = new ORegistry();
 
@@ -589,7 +589,7 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
             m_file.close();
             m_isOpen = sal_False;
 
-            if (m_name.getLength())
+            if (!m_name.isEmpty())
             {
                 OUString systemName;
                 if ( FileBase::getSystemPathFromFileURL(m_name, systemName) != FileBase::E_None )
@@ -653,7 +653,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
 
     *phNewKey = NULL;
 
-    if ( !keyName.getLength() )
+    if ( keyName.isEmpty() )
         return REG_INVALID_KEYNAME;
 
     REG_GUARD(m_mutex);
@@ -683,7 +683,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
     do
     {
         token = sFullKeyName.getToken( 0, '/', nIndex );
-        if (token.getLength())
+        if (!token.isEmpty())
         {
             if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, KEY_MODE_CREATE))
             {
@@ -714,7 +714,7 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
 
     *phOpenKey = NULL;
 
-    if ( !keyName.getLength() )
+    if ( keyName.isEmpty() )
     {
         return REG_INVALID_KEYNAME;
     }
@@ -795,7 +795,7 @@ RegError ORegistry::closeKey(RegKeyHandle hKey)
 RegError ORegistry::deleteKey(RegKeyHandle hKey, const OUString& keyName)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
-    if ( !keyName.getLength() )
+    if ( keyName.isEmpty() )
         return REG_INVALID_KEYNAME;
 
     REG_GUARD(m_mutex);
@@ -811,7 +811,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
 {
     RegError _ret = REG_NO_ERROR;
 
-    if ( !keyName.getLength() )
+    if ( keyName.isEmpty() )
     {
         return REG_INVALID_KEYNAME;
     }
@@ -1361,7 +1361,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
     if(pTargetKey->getName().getLength() > 1)
         sFullPath += pTargetKey->getName();
     sFullPath += sRelPath;
-    if (sRelPath.getLength() > 1 || sFullPath.getLength() == 0)
+    if (sRelPath.getLength() > 1 || sFullPath.isEmpty())
         sFullPath += ROOT;
 
     OUString sFullKeyName = sFullPath;
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index ed5924beca71..998bc625de0a 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -61,7 +61,7 @@ public:
     std::string const & getTypeReg() const
         { return m_typeRegName; }
     bool hasBase() const
-        { return (m_base.getLength() > 0); }
+        { return (!m_base.isEmpty()); }
     const OString & getBase() const
         { return m_base; }
     bool forceOutput() const
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index f3dfe6b12fbe..c12e1c1f200f 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -62,7 +62,7 @@ public:
     std::string const & getRegName1() const { return m_regName1; }
     std::string const & getRegName2() const { return m_regName2; }
 
-    bool isStartKeyValid() const { return (m_startKey.getLength() > 0); }
+    bool isStartKeyValid() const { return (!m_startKey.isEmpty()); }
     OUString const & getStartKey() const { return m_startKey; }
     bool matchedWithExcludeKey( const OUString& keyName) const;
 
@@ -323,55 +323,55 @@ static OString getFieldAccess(RTFieldAccess fieldAccess)
     }
     if ( (fieldAccess & RT_ACCESS_READONLY) == RT_ACCESS_READONLY )
     {
-        ret += OString(ret.getLength() > 0 ? ",READONLY" : "READONLY");
+        ret += OString(ret.isEmpty() ? "READONLY" : ",READONLY");
     }
     if ( (fieldAccess & RT_ACCESS_OPTIONAL) == RT_ACCESS_OPTIONAL )
     {
-        ret += OString(ret.getLength() > 0 ? ",OPTIONAL" : "OPTIONAL");
+        ret += OString(ret.isEmpty() ? "OPTIONAL" : ",OPTIONAL");
     }
     if ( (fieldAccess & RT_ACCESS_MAYBEVOID) == RT_ACCESS_MAYBEVOID )
     {
-        ret += OString(ret.getLength() > 0 ? ",MAYBEVOID" : "MAYBEVOID");
+        ret += OString(ret.isEmpty() ? "MAYBEVOID" : ",MAYBEVOID");
     }
     if ( (fieldAccess & RT_ACCESS_BOUND) == RT_ACCESS_BOUND )
     {
-        ret += OString(ret.getLength() > 0 ? ",BOUND" : "BOUND");
+        ret += OString(ret.isEmpty() ? "BOUND" : ",BOUND");
     }
     if ( (fieldAccess & RT_ACCESS_CONSTRAINED) == RT_ACCESS_CONSTRAINED )
     {
-        ret += OString(ret.getLength() > 0 ? ",CONSTRAINED" : "CONSTRAINED");
+        ret += OString(ret.isEmpty() ? "CONSTRAINED" : ",CONSTRAINED");
     }
     if ( (fieldAccess & RT_ACCESS_TRANSIENT) == RT_ACCESS_TRANSIENT )
     {
-        ret += OString(ret.getLength() > 0 ? ",TRANSIENT" : "TRANSIENT");
+        ret += OString(ret.isEmpty() ? "TRANSIENT" : ",TRANSIENT");
     }
     if ( (fieldAccess & RT_ACCESS_MAYBEAMBIGUOUS) == RT_ACCESS_MAYBEAMBIGUOUS )
     {
-        ret += OString(ret.getLength() > 0 ? ",MAYBEAMBIGUOUS" : "MAYBEAMBIGUOUS");
+        ret += OString(ret.isEmpty() ? "MAYBEAMBIGUOUS" : ",MAYBEAMBIGUOUS");
     }
     if ( (fieldAccess & RT_ACCESS_MAYBEDEFAULT) == RT_ACCESS_MAYBEDEFAULT )
     {
-        ret += OString(ret.getLength() > 0 ? ",MAYBEDEFAULT" : "MAYBEDEFAULT");
+        ret += OString(ret.isEmpty() ? "MAYBEDEFAULT" : ",MAYBEDEFAULT");
     }
     if ( (fieldAccess & RT_ACCESS_REMOVEABLE) == RT_ACCESS_REMOVEABLE )
     {
-        ret += OString(ret.getLength() > 0 ? ",REMOVEABLE" : "REMOVEABLE");
+        ret += OString(ret.isEmpty() ? "REMOVEABLE" : ",REMOVEABLE");
     }
     if ( (fieldAccess & RT_ACCESS_ATTRIBUTE) == RT_ACCESS_ATTRIBUTE )
     {
-        ret += OString(ret.getLength() > 0 ? ",ATTRIBUTE" : "ATTRIBUTE");
+        ret += OString(ret.isEmpty() ? "ATTRIBUTE" : ",ATTRIBUTE");
     }
     if ( (fieldAccess & RT_ACCESS_PROPERTY) == RT_ACCESS_PROPERTY )
     {
-        ret += OString(ret.getLength() > 0 ? ",PROPERTY" : "PROPERTY");
+        ret += OString(ret.isEmpty() ? "PROPERTY" : ",PROPERTY");
     }
     if ( (fieldAccess & RT_ACCESS_CONST) == RT_ACCESS_CONST )
     {
-        ret += OString(ret.getLength() > 0 ? ",CONST" : "CONST");
+        ret += OString(ret.isEmpty() ? "CONST" : ",CONST");
     }
     if ( (fieldAccess & RT_ACCESS_READWRITE) == RT_ACCESS_READWRITE )
     {
-        ret += OString(ret.getLength() > 0 ? ",READWRITE" : "READWRITE");
+        ret += OString(ret.isEmpty() ? "READWRITE" : ",READWRITE");
     }
     return ret;
 }
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 00ec27b77554..2a36f69de16d 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -99,12 +99,12 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
 {
     rtl::OStringBuffer aLangStr( 64 );
     aLangStr.append( rLang.toAsciiLowerCase() );
-    if( rCountry.getLength() )
+    if( !rCountry.isEmpty() )
     {
         aLangStr.append( '-' );
         aLangStr.append( rCountry.toAsciiUpperCase() );
     }
-    if( rVariant.getLength() )
+    if( !rVariant.isEmpty() )
     {
         aLangStr.append( '-' );
         aLangStr.append( rVariant );
@@ -116,9 +116,9 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
         pTypCont->AddLanguage( aL.getStr() );
         nRet = GetLangId( aL );
     }
-    if( rVariant.getLength() )
+    if( !rVariant.isEmpty() )
         rVariant = rtl::OString();
-    else if( rCountry.getLength() )
+    else if( !rCountry.isEmpty() )
         rCountry = rtl::OString();
     else
         rLang = rtl::OString();
@@ -154,7 +154,7 @@ rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang)
     do
     {
         aLangFallbacks.push_back(getLangIdAndShortenLocale( this, aLg, aCountry, aVariant ) );
-    } while( aLg.getLength() );
+    } while( !aLg.isEmpty() );
 
     if( bAppendEnUsFallback )
     {
@@ -838,7 +838,7 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey,
     ERRTYPE         aError;
     fprintf( fOutput, "#include <string.h>\n" );
     WriteInc( fOutput, nFileKey );
-    if( rHxxName.getLength() )
+    if( !rHxxName.isEmpty() )
         fprintf( fOutput, "#include \"%s\"\n", rHxxName.getStr() );
     fprintf( fOutput, "\n\n" );
 
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index e4cc72a2d561..40ee8ddf4997 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -145,7 +145,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
     }
 
     rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" );
-    if ( aEnvIsoTokens.getLength() )
+    if ( !aEnvIsoTokens.isEmpty() )
     {
         rtl::OString aIsoToken;
         sal_uInt16 nTokenCounter = 0;
@@ -153,7 +153,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
         while ( bOneMore )
         {
             aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' ');
-            if ( aIsoToken.getLength() )
+            if ( !aIsoToken.isEmpty() )
             {
                 SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId );
                 if ( ! GetLangId( aIsoToken ))
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e8ececa423a3..93dc64e823a8 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -223,13 +223,13 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
                 const rtl::OString aSysSearchDir( (*ppStr)+5 );
 
                 // ignore empty -lip= arguments that we get lots of these days
-                if (aSysSearchDir.getLength())
+                if (!aSysSearchDir.isEmpty())
                 {
                     DirEntry aSysDir(rtl::OStringToOUString(aSysSearchDir, RTL_TEXTENCODING_ASCII_US));
                     m_aOutputFiles.back().aSysSearchDirs.push_back(
                         rtl::OUStringToOString(aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US) );
                     rtl::OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath;
-                    if( aLangSearchPath.getLength() )
+                    if( !aLangSearchPath.isEmpty() )
                     {
                         aLangSearchPath = aLangSearchPath +
                         rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US);
@@ -290,7 +290,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
             }
             else if( !rsc_strnicmp( (*ppStr) + 1, "lg", 2 ) )
             {
-                if( m_aOutputFiles.back().aLangName.getLength() )
+                if( !m_aOutputFiles.back().aLangName.isEmpty() )
                     m_aOutputFiles.push_back( OutputFile() );
                 m_aOutputFiles.back().aLangName = rtl::OString((*ppStr)+3);
             }
@@ -314,7 +314,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
         ::std::list<OutputFile>::iterator it;
         for( it = m_aOutputFiles.begin(); it != m_aOutputFiles.end(); ++it )
         {
-            if( ! it->aOutputRc.getLength() )
+            if( it->aOutputRc.isEmpty() )
                 it->aOutputRc  = ::OutputFile( *aInputList.front(), "rc"  );
         }
         if( ! bOutputSrsIsSet )
@@ -396,7 +396,7 @@ RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont )
     pCL = pLine;
     pTC = pTypCont;
 
-    if( pCL->aOutputLst.getLength() )
+    if( !pCL->aOutputLst.isEmpty() )
     {
         if ( NULL == (fListing = fopen( pCL->aOutputLst.getStr(), "w" )) )
             pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputLst.getStr() );
@@ -418,13 +418,13 @@ RscCompiler::~RscCompiler()
 
     if( fExitFile )
         fclose( fExitFile );
-    if( aTmpOutputHxx.getLength() )
+    if( !aTmpOutputHxx.isEmpty() )
         unlink( aTmpOutputHxx.getStr() );
-    if( aTmpOutputCxx.getLength() )
+    if( !aTmpOutputCxx.isEmpty() )
         unlink( aTmpOutputCxx.getStr() );
-    if( aTmpOutputRcCtor.getLength() )
+    if( !aTmpOutputRcCtor.isEmpty() )
         unlink( aTmpOutputRcCtor.getStr() );
-    if( aTmpOutputSrc.getLength() )
+    if( !aTmpOutputSrc.isEmpty() )
         unlink( aTmpOutputSrc.getStr() );
 }
 
@@ -512,7 +512,7 @@ ERRTYPE RscCompiler::Start()
 *************************************************************************/
 void RscCompiler::EndCompile()
 {
-    if( pCL->aOutputSrs.getLength() && (pCL->nCommands & NOLINK_FLAG) )
+    if( !pCL->aOutputSrs.isEmpty() && (pCL->nCommands & NOLINK_FLAG) )
     {
         pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
         pTC->pEH->StdOut( pCL->aOutputSrs.getStr(), RscVerbosityVerbose );
@@ -546,7 +546,7 @@ void RscCompiler::EndCompile()
         };
     }
 
-    if ( aTmpOutputHxx.getLength() )
+    if ( !aTmpOutputHxx.isEmpty() )
     {
         pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
         pTC->pEH->StdOut( pCL->aOutputHxx.getStr(), RscVerbosityVerbose );
@@ -559,7 +559,7 @@ void RscCompiler::EndCompile()
         aTmpOutputHxx = rtl::OString();
     }
 
-    if( aTmpOutputCxx.getLength() )
+    if( !aTmpOutputCxx.isEmpty() )
     {
         pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
         pTC->pEH->StdOut( pCL->aOutputCxx.getStr(), RscVerbosityVerbose );
@@ -572,7 +572,7 @@ void RscCompiler::EndCompile()
         aTmpOutputCxx = rtl::OString();
     }
 
-    if( aTmpOutputRcCtor.getLength() )
+    if( !aTmpOutputRcCtor.isEmpty() )
     {
         pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
         pTC->pEH->StdOut( pCL->aOutputRcCtor.getStr(), RscVerbosityVerbose );
@@ -585,7 +585,7 @@ void RscCompiler::EndCompile()
         aTmpOutputRcCtor = rtl::OString();
     }
 
-    if( aTmpOutputSrc.getLength() )
+    if( !aTmpOutputSrc.isEmpty() )
     {
         // kopiere von TMP auf richtigen Namen
         unlink( pCL->aOutputSrc.getStr() );   // Zieldatei loeschen
@@ -594,7 +594,7 @@ void RscCompiler::EndCompile()
         aTmpOutputSrc = rtl::OString();
     }
 
-    if( pCL->aTouchFile.getLength() )
+    if( !pCL->aTouchFile.isEmpty() )
     {
         FILE* fp = fopen( pCL->aTouchFile.getStr(), "w" );
         if( fp )
@@ -823,7 +823,7 @@ ERRTYPE RscCompiler::Link()
                 OSL_TRACE("temporary rc file: %s", aRcTmp.getStr());
 
                 OUString sOilDirUrl;
-                if(pCL->aILDir.getLength())
+                if(!pCL->aILDir.isEmpty())
                     sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir);
                 else
                     sOilDirUrl = sTempDirUrl;
@@ -884,7 +884,7 @@ ERRTYPE RscCompiler::Link()
             aContext.pCmdLine = pCL;
 
             // create empty sys list
-            if( aContext.aOutputSysList.getLength() )
+            if( !aContext.aOutputSysList.isEmpty() )
             {
                 FILE* pSysListFile = fopen( aContext.aOutputSysList.getStr(), "wb" );
 
@@ -955,7 +955,7 @@ ERRTYPE RscCompiler::Link()
     }
 
     // hxx-Datei schreiben
-    if( pCL->aOutputHxx.getLength() && aError.IsOk() )
+    if( !pCL->aOutputHxx.isEmpty() && aError.IsOk() )
     {
         aTmpOutputHxx = ::GetTmpFileName();
         if ( NULL == (fExitFile = foutput = fopen( aTmpOutputHxx.getStr(), "w" )) )
@@ -971,7 +971,7 @@ ERRTYPE RscCompiler::Link()
     }
 
     // cxx-Datei schreiben
-    if( pCL->aOutputCxx.getLength() && aError.IsOk() )
+    if( !pCL->aOutputCxx.isEmpty() && aError.IsOk() )
     {
         aTmpOutputCxx = ::GetTmpFileName();
         if ( NULL == (fExitFile = foutput = fopen( aTmpOutputCxx.getStr(), "w" )) )
@@ -980,7 +980,7 @@ ERRTYPE RscCompiler::Link()
         pTC->pEH->StdOut( "Generating .cxx file\n" );
 
         rtl::OString aHxx = pCL->aOutputHxx;
-        if( !aHxx.getLength() )
+        if( aHxx.isEmpty() )
         {
             UniString aUniOutputCxx( pCL->aOutputCxx, RTL_TEXTENCODING_ASCII_US );
             aHxx = rtl::OStringBuffer(rtl::OUStringToOString(DirEntry(aUniOutputCxx).GetBase(),
@@ -995,7 +995,7 @@ ERRTYPE RscCompiler::Link()
     }
 
     // RcCtor-Datei schreiben
-    if( pCL->aOutputRcCtor.getLength() && aError.IsOk() )
+    if( !pCL->aOutputRcCtor.isEmpty() && aError.IsOk() )
     {
         aTmpOutputRcCtor = ::GetTmpFileName();
         if ( NULL == (fExitFile = foutput = fopen( aTmpOutputRcCtor.getStr(), "w" )) )
@@ -1011,7 +1011,7 @@ ERRTYPE RscCompiler::Link()
     }
 
     // src-Datei schreiben
-    if( pCL->aOutputSrc.getLength() && aError.IsOk() )
+    if( !pCL->aOutputSrc.isEmpty() && aError.IsOk() )
     {
         aTmpOutputSrc = ::GetTmpFileName();
         if ( NULL == (fExitFile = foutput = fopen( aTmpOutputSrc.getStr(), "w" )) )
@@ -1145,7 +1145,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
     SvFileStream                aIStm( rSrsInPath.GetFull(), STREAM_READ );
     SvFileStream                aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
     ::std::vector< rtl::OString > aMissingImages;
-    FILE*                       pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
+    FILE*                       pSysListFile = rContext.aOutputSysList.isEmpty() ? NULL : fopen( rContext.aOutputSysList.getStr(), "ab" );
 
     if( !aIStm.GetError() && !aOStm.GetError() )
     {
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index d0b79a91493e..1aaf0e48be67 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -135,7 +135,7 @@
     rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
     rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
 
-    if (base.getLength() > 0)
+    if (!base.isEmpty())
         osl_systemPathEnsureSeparator(&base.pData);
 
     base += rel;
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 949121f3e8aa..ffeb885c37a3 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -199,8 +199,8 @@ namespace /* private */
             return osl_File_E_INVAL;
 
         file_path = rtl::OUString(pImpl->m_ustrFilePath);
-        OSL_ASSERT(file_path.getLength() > 0);
-        if (file_path.getLength() <= 0)
+        OSL_ASSERT(!file_path.isEmpty());
+        if (file_path.isEmpty())
             return osl_File_E_INVAL;
 
         pStat->uValidFields = 0;
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 6be4eb1a0471..7addb8e00d24 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -151,7 +151,7 @@ namespace {
 oslFileError getSystemPathFromFileUrl(
     rtl::OUString const & url, rtl::OUString * path, bool homeAbbreviation)
 {
-    OSL_ASSERT(path != 0 && path->getLength() == 0);
+    OSL_ASSERT(path != 0 && path->isEmpty());
 
     sal_Unicode const * p = url.getStr();
     sal_Unicode const * end = p + url.getLength();
@@ -677,7 +677,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
 
         rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
 
-        if (base.getLength() > 0)
+        if (!base.isEmpty())
         {
             resolved_path += rtl::OUString( UNICHAR_SLASH );
             resolved_path += base;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index bb1939c2bb42..02ca76f165c7 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -953,7 +953,7 @@ namespace osl_FileBase
         // sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
         // printf("UTF8: %s\n", sStr.getStr() );
 
-        if (_sAssumeResultStr.getLength() > 0)
+        if (!_sAssumeResultStr.isEmpty())
         {
             sal_Bool bStrAreEqual = _sAssumeResultStr.equals(sStr);
             CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong",
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 38f813022166..fd04ae5b17b8 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -193,7 +193,7 @@ namespace osl_Security
             bRes = aSec.getUserName( strGetName );
 
             sal_Int32 nPos = -1;
-            if (strName.getLength() > 0)
+            if (!strName.isEmpty())
             {
                 nPos = strGetName.indexOf(strName);
             }
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index a5b5ae305b72..646a22211639 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -181,7 +181,7 @@ namespace rtl_DoubleLocking
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Gregorian::get() failed, wrong value expected.",
-                    aStr.getLength() != 0
+                    !aStr.isEmpty()
                     );
             }
 
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 9792bfb5c0af..4c3034c0655a 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -275,7 +275,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
 #endif /* OSL_DEBUG_LEVEL > 1 */
 
     oslFileHandle handle;
-    if (_iniName.getLength() &&
+    if (!_iniName.isEmpty() &&
         osl_File_E_None == osl_openFile(_iniName.pData, &handle, osl_File_OpenFlag_Read))
     {
         rtl::ByteSequence seq;
@@ -379,9 +379,9 @@ Bootstrap_Impl * BootstrapMap::getIni(
 }
 
 void BootstrapMap::setBaseIniUri(rtl::OUString const & uri) {
-    OSL_ASSERT(uri.getLength() != 0);
+    OSL_ASSERT(!uri.isEmpty());
     osl::MutexGuard g(mutex_);
-    OSL_ASSERT(baseIniUri_.getLength() == 0 && baseIni_ == 0);
+    OSL_ASSERT(baseIniUri_.isEmpty() && baseIni_ == 0);
     baseIniUri_ = uri;
 }
 
@@ -389,7 +389,7 @@ Bootstrap_Impl * BootstrapMap::getBaseIni() {
     osl::MutexGuard g(mutex_);
     if (baseIni_ == 0) {
         rtl::OUString uri;
-        if (baseIniUri_.getLength() == 0) {
+        if (baseIniUri_.isEmpty()) {
             if (CommandLineParameters::get().get(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")),
                     &uri))
@@ -779,7 +779,7 @@ rtl::OUString expandMacros(
                 for (int j = 0; j < n; ++j) {
                     seg[j] = expandMacros(file, seg[j], mode, requestStack);
                 }
-                if (n == 3 && seg[1].getLength() == 0) {
+                if (n == 3 && seg[1].isEmpty()) {
                     // For backward compatibility, treat ${file::key} the same
                     // as just ${file:key}:
                     seg[1] = seg[2];