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/osl/unx | |
| 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/osl/unx')
| -rw-r--r-- | sal/osl/unx/file_path_helper.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/file_stat.cxx | 4 | ||||
| -rw-r--r-- | sal/osl/unx/file_url.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
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; |