Fix for fdo43460 Part X getLength() to isEmpty()
Part X Module cppu cppuhelper cpputools
This commit is contained in:
committed by
Ivan Timofeev
parent
f26635c386
commit
1b99d8800e
@@ -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;
|
||||
|
@@ -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") );
|
||||
|
@@ -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())
|
||||
|
Reference in New Issue
Block a user