diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-12 23:01:55 -0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-13 11:57:55 +0400 |
| commit | 00a67c0f9056729695e6004707d64b448756fa6f (patch) | |
| tree | ad780d6c78b55977a00f1ff6b3d418c24bf41d30 /comphelper/source/officeinstdir | |
| parent | d5b25bdd1247363c5745dd5fcbc2ec784063b6bd (diff) | |
Fix for fdo43460 Part VII getLength() to isEmpty()
Part VII
Module
comphelper
Diffstat (limited to 'comphelper/source/officeinstdir')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index e3712e036ddf..ccdd7ba68df7 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -72,7 +72,7 @@ static bool makeCanonicalFileURL( rtl::OUString & rURL ) { aNormalizedURL = aFileStatus.getFileURL(); - if ( aNormalizedURL.getLength() > 0 ) + if ( !aNormalizedURL.isEmpty() ) { if ( aNormalizedURL .getStr()[ aNormalizedURL.getLength() - 1 ] @@ -147,7 +147,7 @@ rtl::OUString SAL_CALL OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL ) throw ( uno::RuntimeException ) { - if ( URL.getLength() > 0 ) + if ( !URL.isEmpty() ) { initDirs(); @@ -183,7 +183,7 @@ rtl::OUString SAL_CALL OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) throw ( uno::RuntimeException ) { - if ( URL.getLength() > 0 ) + if ( !URL.isEmpty() ) { sal_Int32 nIndex = URL.indexOf( m_aOfficeBrandDirMacro ); if ( nIndex != -1 ) @@ -321,7 +321,7 @@ void OfficeInstallationDirectories::initDirs() xExpander->expandMacros( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) ); - OSL_ENSURE( m_pOfficeBrandDir->getLength() > 0, + OSL_ENSURE( !m_pOfficeBrandDir->isEmpty(), "Unable to obtain office brand installation directory!" ); makeCanonicalFileURL( *m_pOfficeBrandDir ); @@ -331,7 +331,7 @@ void OfficeInstallationDirectories::initDirs() rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) ); - OSL_ENSURE( m_pUserDir->getLength() > 0, + OSL_ENSURE( !m_pUserDir->isEmpty(), "Unable to obtain office user data directory!" ); makeCanonicalFileURL( *m_pUserDir ); |