diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-20 19:01:12 -0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2011-12-21 09:52:48 +0100 |
| commit | 1835d0599e3d8984c7dfa2bbef2be5747596716a (patch) | |
| tree | f8b20cd5bcc94ad70e4bca8050b6c885fef29875 /desktop/source/deployment/registry/dp_registry.cxx | |
| parent | 1623b021cf580d3f84d562b638cb034847792401 (diff) | |
Fix for fdo43460 Part XIII getLength() to isEmpty()
Part XIII
Module
desktop
Diffstat (limited to 'desktop/source/deployment/registry/dp_registry.cxx')
| -rw-r--r-- | desktop/source/deployment/registry/dp_registry.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 484d557868b1..5f18e41a4a05 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -235,7 +235,7 @@ void PackageRegistryImpl::insertBackend( //The package backend shall also be called to determine the mediatype //(XPackageRegistry.bindPackage) when the URL points to a directory. const bool bExtension = mediaType.equals(OUSTR("application/vnd.sun.star.package-bundle")); - if (fileFilter.getLength() == 0 || + if (fileFilter.isEmpty() || fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*.*") ) || fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ) || bExtension) @@ -249,7 +249,7 @@ void PackageRegistryImpl::insertBackend( OUString token( fileFilter.getToken( 0, ';', nIndex ) ); if (token.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("*.") )) token = token.copy( 1 ); - if (token.getLength() == 0) + if (token.isEmpty()) continue; // mark any further wildcards ambig: bool ambig = (token.indexOf('*') >= 0 || @@ -331,10 +331,9 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( while (xEnum->hasMoreElements()) { Any element( xEnum->nextElement() ); - Sequence<Any> registryArgs( - cachePath.getLength() == 0 ? 1 : 3 ); + Sequence<Any> registryArgs(cachePath.isEmpty() ? 1 : 3 ); registryArgs[ 0 ] <<= context; - if (cachePath.getLength() > 0) + if (!cachePath.isEmpty()) { Reference<lang::XServiceInfo> xServiceInfo( element, UNO_QUERY_THROW ); @@ -443,7 +442,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( types[ pos ]; buf.append( xInfo->getMediaType() ); const OUString filter( xInfo->getFileFilter() ); - if (filter.getLength() > 0) { + if (!filter.isEmpty()) { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" (") ); buf.append( filter ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(")") ); @@ -487,7 +486,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( { check(); OUString mediaType(mediaType_); - if (mediaType.getLength() == 0) + if (mediaType.isEmpty()) { ::ucbhelper::Content ucbContent; if (create_ucb_content( @@ -511,7 +510,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( } } } - if (mediaType.getLength() == 0) + if (mediaType.isEmpty()) { // try ambiguous backends: t_registryset::const_iterator iPos( m_ambiguousBackends.begin() ); |