diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-15 17:29:53 -0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-17 17:15:53 +0400 |
| commit | 1b99d8800e399f45404ab62827163a873d2a1aec (patch) | |
| tree | 647c91cd0af1e671e490d369bba8d8a2efde46da /cppu/source | |
| parent | f26635c3869a85ae03dba3dfb833276f13ffc478 (diff) | |
Fix for fdo43460 Part X getLength() to isEmpty()
Part X
Module
cppu
cppuhelper
cpputools
Diffstat (limited to 'cppu/source')
| -rw-r--r-- | cppu/source/uno/EnvStack.cxx | 2 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index d1ff2922233a..954244088450 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -203,7 +203,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un res = 1; } - if (nextPurpose.getLength()) + if (!nextPurpose.isEmpty()) { rtl::OUString next_envDcp(s_uno_envDcp); next_envDcp += nextPurpose; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 08e70357e610..ba3465ca9a99 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1031,7 +1031,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( iPos != aName2EnvMap.end(); ++iPos ) { uno_Environment * pWeak = iPos->second; - if (!rEnvDcp.getLength() || + if (rEnvDcp.isEmpty() || rEnvDcp.equals( pWeak->pTypeName )) { ppFound[nSize] = 0; @@ -1116,7 +1116,7 @@ static uno_Environment * initDefaultEnvironment( that->releaseInterface = unoenv_releaseInterface; OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp); - if (envPurpose.getLength()) + if (!envPurpose.isEmpty()) { rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1); libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") ); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index ec56c053d48d..84e2cc79b14b 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -312,7 +312,7 @@ static inline OUString getBridgeName( SAL_THROW( () ) { OUStringBuffer aBridgeName( 16 ); - if (rAddPurpose.getLength()) + if (!rAddPurpose.isEmpty()) { aBridgeName.append( rAddPurpose ); aBridgeName.append( (sal_Unicode)'_' ); @@ -469,7 +469,7 @@ static Mapping getMediateMapping( } // connect to uno - if (rAddPurpose.getLength()) // insert purpose mapping between new ano_uno <-> uno + if (!rAddPurpose.isEmpty()) // insert purpose mapping between new ano_uno <-> uno { // create anonymous uno env Environment aAnUno; @@ -540,7 +540,7 @@ void SAL_CALL uno_getMapping( } // See if an identity mapping does fit. - if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength()) + if (!aRet.is() && pFrom == pTo && aAddPurpose.isEmpty()) aRet = createIdentityMapping(pFrom); if (!aRet.is()) |