diff options
author | Olivier Hallot <olivier.hallot@documentfoundation.org> | 2012-01-02 15:58:10 -0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-01-02 19:17:17 +0100 |
commit | 85d1ce27ad9ce7a3740bd8bbbaf1d3abe643ba10 (patch) | |
tree | 9c27a22d1d2ccb1bd78658ee4152c30ea4a70137 /sal/rtl/source | |
parent | 829db12d7e3e93b4a44f79b39a0a9f0630439109 (diff) |
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
Diffstat (limited to 'sal/rtl/source')
-rw-r--r-- | sal/rtl/source/bootstrap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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]; |