summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2011-12-20 19:01:12 -0200
committerC├ędric Bosdonnat <cedric.bosdonnat@free.fr>2011-12-21 09:52:48 +0100
commit1835d0599e3d8984c7dfa2bbef2be5747596716a (patch)
treef8b20cd5bcc94ad70e4bca8050b6c885fef29875
parent1623b021cf580d3f84d562b638cb034847792401 (diff)
Fix for fdo43460 Part XIII getLength() to isEmpty()
Part XIII Module desktop
-rw-r--r--desktop/source/app/app.cxx32
-rw-r--r--desktop/source/app/appinit.cxx6
-rw-r--r--desktop/source/app/cmdlineargs.cxx4
-rw-r--r--desktop/source/app/dispatchwatcher.cxx10
-rw-r--r--desktop/source/app/langselect.cxx18
-rw-r--r--desktop/source/app/officeipcthread.cxx16
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx12
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx20
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx14
-rw-r--r--desktop/source/deployment/manager/dp_activepackages.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx10
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx28
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx12
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx8
-rw-r--r--desktop/source/deployment/misc/dp_resource.cxx8
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx10
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx34
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx12
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx4
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx4
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx15
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx4
-rw-r--r--desktop/source/deployment/registry/inc/dp_backend.h2
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx37
-rw-r--r--desktop/source/deployment/registry/script/dp_lib_container.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx14
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx8
-rw-r--r--desktop/source/migration/migration.cxx36
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx4
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx4
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx6
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx4
-rw-r--r--desktop/source/splash/splash.cxx20
40 files changed, 219 insertions, 221 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 49d86b068977..50dc7599cb95 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -205,7 +205,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
else
aDiagnosticMessage.appendAscii( "The program cannot be started." );
- if ( aInternalErrMsg.getLength() > 0 )
+ if ( !aInternalErrMsg.isEmpty() )
{
aDiagnosticMessage.appendAscii( "\n\n" );
if ( pResMgr )
@@ -231,7 +231,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
void FatalError(const ::rtl::OUString& sMessage)
{
::rtl::OUString sProductKey = ::utl::Bootstrap::getProductKey();
- if ( ! sProductKey.getLength())
+ if ( sProductKey.isEmpty())
{
osl_getExecutableFile( &sProductKey.pData );
@@ -798,7 +798,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
aProductKey = aProductKey.copy( lastIndex+1 );
aTemp = ::utl::Bootstrap::getProductKey( aProductKey );
- if ( aTemp.getLength() > 0 )
+ if ( !aTemp.isEmpty() )
aProductKey = aTemp;
OUString aMessage;
@@ -1242,7 +1242,7 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
}
sal_Bool bRet = sal_False;
- if ( aURL.Complete.getLength() > 0 )
+ if ( !aURL.Complete.isEmpty() )
{
xURLParser->parseStrict(aURL);
@@ -2603,14 +2603,14 @@ void Desktop::OpenClients()
rArgs.GetConversionOut( aRequest.aConversionOut );
rArgs.GetInFilter( aRequest.aInFilter );
- if ( aRequest.aOpenList.getLength() > 0 ||
- aRequest.aViewList.getLength() > 0 ||
- aRequest.aStartList.getLength() > 0 ||
- aRequest.aPrintList.getLength() > 0 ||
- aRequest.aForceOpenList.getLength() > 0 ||
- aRequest.aForceNewList.getLength() > 0 ||
- ( aRequest.aPrintToList.getLength() > 0 && aRequest.aPrinterName.getLength() > 0 ) ||
- aRequest.aConversionList.getLength() > 0 )
+ if ( !aRequest.aOpenList.isEmpty() ||
+ !aRequest.aViewList.isEmpty() ||
+ !aRequest.aStartList.isEmpty() ||
+ !aRequest.aPrintList.isEmpty() ||
+ !aRequest.aForceOpenList.isEmpty() ||
+ !aRequest.aForceNewList.isEmpty() ||
+ ( !aRequest.aPrintToList.isEmpty() && !aRequest.aPrinterName.isEmpty() ) ||
+ !aRequest.aConversionList.isEmpty() )
{
bLoaded = sal_True;
@@ -2630,7 +2630,7 @@ void Desktop::OpenClients()
}
// check for printing disabled
- if( ( aRequest.aPrintList.getLength() || aRequest.aPrintToList.getLength() )
+ if( ( !(aRequest.aPrintList.isEmpty() && aRequest.aPrintToList.isEmpty()) )
&& Application::GetSettings().GetMiscSettings().GetDisablePrinting() )
{
aRequest.aPrintList = rtl::OUString();
@@ -2699,7 +2699,7 @@ void Desktop::OpenDefault()
aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITERWEB );
}
- if ( !aName.getLength() )
+ if ( aName.isEmpty() )
{
// Old way to create a default document
if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
@@ -2927,7 +2927,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
aCommand.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:OptionsTreeDialog" ) );
else if( rAppEvent.GetData() == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABOUT")) )
aCommand.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:About" ) );
- if( aCommand.Complete.getLength() )
+ if( !aCommand.Complete.isEmpty() )
{
xParser->parseStrict(aCommand);
@@ -2986,7 +2986,7 @@ void Desktop::OpenSplashScreen()
// Which splash to use
OUString aSplashService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.SplashScreen" ));
- if ( rCmdLine.GetStringParam( CommandLineArgs::CMD_STRINGPARAM_SPLASHPIPE ).getLength() )
+ if ( !rCmdLine.GetStringParam( CommandLineArgs::CMD_STRINGPARAM_SPLASHPIPE ).isEmpty() )
aSplashService = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.PipeSplashScreen"));
bVisible = sal_True;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index e4a4230547aa..3c0522956d22 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -108,7 +108,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
osl::Security().getUserIdent(aPipe);
rtl::OUStringBuffer aPortal;
- if (rPortalConnect.getLength() != 0)
+ if (!rPortalConnect.isEmpty())
{
aPortal.append(sal_Unicode(','));
aPortal.append(rPortalConnect);
@@ -238,7 +238,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
if ( bHeadlessMode )
Application::EnableHeadlessMode(false);
- if ( conDcp.getLength() > 0 )
+ if ( !conDcp.isEmpty() )
{
// accept incoming connections (scripting and one rvp)
RTL_LOGFILE_CONTEXT( aLog, "desktop (lo119109) desktop::Desktop::createAcceptor()" );
@@ -425,7 +425,7 @@ void Desktop::CreateTemporaryDirectory()
::utl::LocalFileHelper::ConvertURLToPhysicalName( aTempBaseURL, aRet );
::osl::FileBase::getFileURLFromSystemPath( aRet, aTempPath );
aTempPath = ::utl::TempFile::SetTempNameBaseDirectory( aTempPath );
- if ( !aTempPath.getLength() )
+ if ( aTempPath.isEmpty() )
{
::osl::File::getTempDirURL( aTempBaseURL );
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index af772c288d3e..e217e17e81a9 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -174,11 +174,11 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
xTranslator.is())
{
OUString tmp(xTranslator->translateToInternal(aArg));
- if (tmp.getLength() > 0)
+ if (!tmp.isEmpty())
aArg = tmp;
}
- if ( aArg.getLength() > 0 )
+ if ( !aArg.isEmpty() )
{
m_eArgumentCount = m_eArgumentCount == NONE ? ONE : MANY;
::rtl::OUString oArg;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 96b2ee5ba1e5..fa8c8a59bbb6 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -184,7 +184,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
// create parameter array
sal_Int32 nCount = 4;
- if ( aDispatchRequest.aPreselectedFactory.getLength() )
+ if ( !aDispatchRequest.aPreselectedFactory.isEmpty() )
nCount++;
// Set Input Filter
@@ -237,7 +237,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
aArgs[3].Value <<= nUpdateDoc;
}
- if ( aDispatchRequest.aPreselectedFactory.getLength() )
+ if ( !aDispatchRequest.aPreselectedFactory.isEmpty() )
{
aArgs[nCount-1].Name = ::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE();
aArgs[nCount-1].Value <<= aDispatchRequest.aPreselectedFactory;
@@ -510,12 +510,12 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
FileBase::getSystemPathFromFileURL( aOutFile, aTempName );
rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 );
printf("print %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(),
- aPrinterName.getLength() ?
- ::rtl::OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() : "<default_printer>");
+ aPrinterName.isEmpty() ?
+ "<default_printer>" : ::rtl::OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() );
// create the custom printer, if given
Sequence < PropertyValue > aPrinterArgs( 1 );
- if( aPrinterName.getLength() )
+ if( !aPrinterName.isEmpty() )
{
aPrinterArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
aPrinterArgs[0].Value <<= aPrinterName;
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index f502cc82a2ad..7dbc4f2e35c1 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -79,7 +79,7 @@ static sal_Bool existsURL( OUString const& sURL )
using namespace osl;
DirectoryItem aDirItem;
- if (sURL.getLength() != 0)
+ if (!sURL.isEmpty())
return ( DirectoryItem::get( sURL, aDirItem ) == DirectoryItem::E_None );
return sal_False;
@@ -142,7 +142,7 @@ bool LanguageSelection::prepareLanguage()
Any aWin16SysLocale = xProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("SystemLocale")));
::rtl::OUString sWin16SysLocale;
aWin16SysLocale >>= sWin16SysLocale;
- if( sWin16SysLocale.getLength())
+ if( !sWin16SysLocale.isEmpty())
setDefaultLanguage(sWin16SysLocale);
}
catch(const Exception&)
@@ -169,7 +169,7 @@ bool LanguageSelection::prepareLanguage()
bool bIniLanguage( false );
OUString aLocaleString = getUserUILanguage();
- if ( aLocaleString.getLength() == 0 )
+ if ( aLocaleString.isEmpty() )
{
OUString aEmpty;
@@ -203,10 +203,10 @@ bool LanguageSelection::prepareLanguage()
}
// user further fallbacks for the UI language
- if ( aLocaleString.getLength() == 0 )
+ if ( aLocaleString.isEmpty() )
aLocaleString = getLanguageString();
- if ( aLocaleString.getLength() > 0 )
+ if ( !aLocaleString.isEmpty() )
{
try
{
@@ -236,7 +236,7 @@ bool LanguageSelection::prepareLanguage()
OUString sLocale;
xProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale"))) >>= sLocale;
- if ( sLocale.getLength() )
+ if ( !sLocale.isEmpty() )
{
loc = LanguageSelection::IsoStringToLocale(sLocale);
MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) );
@@ -292,7 +292,7 @@ OUString LanguageSelection::getUserUILanguage()
{
// check whether the user has selected a specific language
OUString aUserLanguage = getUserLanguage();
- if (aUserLanguage.getLength() > 0 )
+ if (!aUserLanguage.isEmpty() )
{
if (isInstalledLanguage(aUserLanguage))
{
@@ -319,12 +319,12 @@ OUString LanguageSelection::getLanguageString()
// check whether the user has selected a specific language
OUString aUserLanguage = getUserUILanguage();
- if (aUserLanguage.getLength() > 0 )
+ if (!aUserLanguage.isEmpty() )
return aUserLanguage ;
// try to use system default
aUserLanguage = getSystemLanguage();
- if (aUserLanguage.getLength() > 0 )
+ if (!aUserLanguage.isEmpty() )
{
if (isInstalledLanguage(aUserLanguage, sal_False))
{
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 2b03f5822718..df3306d45407 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -491,7 +491,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
// Check result to create a hash code from the user install path
- if ( aUserInstallPathHashCode.getLength() == 0 )
+ if ( aUserInstallPathHashCode.isEmpty() )
return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code!
pThread->maPipeIdent = pThread->maPipeIdent + aUserInstallPathHashCode;
@@ -790,7 +790,7 @@ void SAL_CALL OfficeIPCThread::run()
else if ( aCmdLineArgs->IsWeb() )
eFactory = SvtModuleOptions::E_WRITERWEB;
- if ( pRequest->aOpenList.getLength() )
+ if ( !pRequest->aOpenList.isEmpty() )
pRequest->aModule = aOpt.GetFactoryName( eFactory );
else
AddURLToStringList( aOpt.GetFactoryEmptyDocumentURL( eFactory ), pRequest->aOpenList );
@@ -907,13 +907,13 @@ static void AddToDispatchList(
const OUString& aParam,
const OUString& aFactory )
{
- if ( aRequestList.getLength() > 0 )
+ if ( !aRequestList.isEmpty() )
{
sal_Int32 nIndex = 0;
do
{
OUString aToken = aRequestList.getToken( 0, '\n', nIndex );
- if ( aToken.getLength() > 0 )
+ if ( !aToken.isEmpty() )
rDispatchList.push_back(
DispatchWatcher::DispatchRequest( nType, aToken, cwdUrl, aParam, aFactory ));
}
@@ -933,7 +933,7 @@ static void AddConversionsToDispatchList(
DispatchWatcher::RequestType nType;
OUString aParam( rParam );
- if( rParam.getLength() )
+ if( !rParam.isEmpty() )
{
nType = DispatchWatcher::REQUEST_CONVERSION;
aParam = rParam;
@@ -951,7 +951,7 @@ static void AddConversionsToDispatchList(
if( !::osl::FileBase::getAbsoluteFileURL( aPWD, rParamOut, aOutDir ) )
::osl::FileBase::getSystemPathFromFileURL( aOutDir, aOutDir );
- if( rParamOut.trim().getLength() )
+ if( !rParamOut.trim().isEmpty() )
{
aParam += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
aParam += aOutDir;
@@ -962,13 +962,13 @@ static void AddConversionsToDispatchList(
aParam += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";" )) + aPWD;
}
- if ( rRequestList.getLength() > 0 )
+ if ( !rRequestList.isEmpty() )
{
sal_Int32 nIndex = 0;
do
{
OUString aToken = rRequestList.getToken( 0, '\n', nIndex );
- if ( aToken.getLength() > 0 )
+ if ( !aToken.isEmpty() )
rDispatchList.push_back(
DispatchWatcher::DispatchRequest( nType, aToken, cwdUrl, aParam, rFactory ));
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 58e719af09f9..a8c4455b7da2 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -626,7 +626,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::
//------------------------------------------------------------------------------
void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle ) const
{
- if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty
+ if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty
return;
try
@@ -948,7 +948,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
{
uno::Reference< deployment::XPackageTypeInfo > const & xPackageType = packageTypes[ pos ];
const OUString filter( xPackageType->getFileFilter() );
- if (filter.getLength() > 0)
+ if (!filter.isEmpty())
{
const OUString title( xPackageType->getShortDescription() );
const ::std::pair< t_string2string::iterator, bool > insertion(
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index dfce37cb20a7..53a179403e3d 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -116,7 +116,7 @@ namespace {
OUString getVersion( OUString const & sVersion )
{
- return ( sVersion.getLength() == 0 ) ? OUString( RTL_CONSTASCII_USTRINGPARAM( "0" ) ) : sVersion;
+ return ( sVersion.isEmpty() ) ? OUString( RTL_CONSTASCII_USTRINGPARAM( "0" ) ) : sVersion;
}
OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
@@ -597,7 +597,7 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
{
if ( rStatus.getValueTypeClass() == uno::TypeClass_EXCEPTION )
text = static_cast< uno::Exception const *>( rStatus.getValue() )->Message;
- if ( text.getLength() == 0 )
+ if ( text.isEmpty() )
text = ::comphelper::anyToString( rStatus ); // fallback
const SolarMutexGuard aGuard;
@@ -648,7 +648,7 @@ void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionU
const ::rtl::OUString &rRepository,
const bool bWarnUser )
{
- if ( rExtensionURL.getLength() )
+ if ( !rExtensionURL.isEmpty() )
{
TExtensionCmd pEntry( new ExtensionCmd( ExtensionCmd::ADD, rExtensionURL, rRepository, bWarnUser ) );
_insert( pEntry );
@@ -839,7 +839,7 @@ void ExtensionCmdQueue::Thread::execute()
// notify error cause only:
msg = reinterpret_cast< uno::Exception const * >( dpExc.Cause.getValue() )->Message;
}
- if (msg.getLength() == 0) // fallback for debugging purposes
+ if (msg.isEmpty()) // fallback for debugging purposes
msg = ::comphelper::anyToString(exc);
const SolarMutexGuard guard;
@@ -969,7 +969,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
for ( cit i = vData.begin(); i < vData.end(); ++i )
{
- if ( i->sWebsiteURL.getLength() > 0 )
+ if ( !i->sWebsiteURL.isEmpty() )
countWebsiteDownload ++;
else
dataDownload.push_back( *i );
@@ -989,7 +989,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
{
for ( cit i = vData.begin(); i < vData.end(); ++i )
{
- if ( m_pDialogHelper && ( i->sWebsiteURL.getLength() > 0 ) )
+ if ( m_pDialogHelper && ( !i->sWebsiteURL.isEmpty() ) )
m_pDialogHelper->openWebBrowser( i->sWebsiteURL, m_pDialogHelper->getWindow()->GetText() );
}
}
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index ed2757c2e9db..96c5b1c0bfb2 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -372,7 +372,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
aSize.Height() = 10000;
rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText );
- if ( aText.getLength() )
+ if ( !aText.isEmpty() )
aText += OUSTR("\n");
aText += m_vEntries[ nPos ]->m_sDescription;
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 1e98df481455..c0ab4600b61e 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -269,7 +269,7 @@ void ServiceImpl::startExecuteModal(
m_parent ? *m_parent : Reference<awt::XWindow>(),
m_extensionURL ? *m_extensionURL : OUString() ) );
myExtMgr->createDialog( false );
- if (m_initialTitle.getLength() > 0) {
+ if (!m_initialTitle.isEmpty()) {
myExtMgr->SetText( m_initialTitle );
m_initialTitle = OUString();
}
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 322e9e847048..77267134e60a 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -237,7 +237,7 @@ bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bPare
//------------------------------------------------------------------------------
bool TheExtensionManager::installPackage( const OUString &rPackageURL, bool bWarnUser )
{
- if ( rPackageURL.getLength() == 0 )
+ if ( rPackageURL.isEmpty() )
return false;
createDialog( false );
@@ -500,7 +500,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
if ( s_ExtMgr.is() )
{
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
- if ( extensionURL.getLength() )
+ if ( !extensionURL.isEmpty() )
s_ExtMgr->installPackage( extensionURL, true );
return s_ExtMgr;
}
@@ -518,7 +518,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
s_ExtMgr = that;
}
- if ( extensionURL.getLength() )
+ if ( !extensionURL.isEmpty() )
s_ExtMgr->installPackage( extensionURL, true );
return s_ExtMgr;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index b8dabbb63493..0445ed701ba2 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -437,12 +437,12 @@ void UpdateDialog::Thread::handleSpecificError(
b.append(m_dialog.m_version);
}
b.append(static_cast< sal_Unicode >(' '));
- if (version.getLength())
+ if (!version.isEmpty())
b.append(version);
else
b.append(data.updateVersion);
- if (data.sWebsiteURL.getLength())
+ if (!data.sWebsiteURL.isEmpty())
{
b.append(static_cast< sal_Unicode >(' '));
{
@@ -464,7 +464,7 @@ void UpdateDialog::Thread::prepareUpdateData(
if (!updateInfo.is())
return;
dp_misc::DescriptionInfoset infoset(m_context, updateInfo);
- OSL_ASSERT(infoset.getVersion().getLength() != 0);
+ OSL_ASSERT(!infoset.getVersion().isEmpty());
uno::Sequence< uno::Reference< xml::dom::XElement > > ds(
dp_misc::Dependencies::check(infoset));
@@ -1025,12 +1025,12 @@ bool UpdateDialog::showDescription(std::pair< rtl::OUString, rtl::OUString > con
rtl::OUString sPub = pairPublisher.first;
rtl::OUString sURL = pairPublisher.second;
- if ( sPub.getLength() == 0 && sURL.getLength() == 0 && sReleaseNotes.getLength() == 0 )
+ if ( sPub.isEmpty() && sURL.isEmpty() && sReleaseNotes.isEmpty() )
// nothing to show
return false;
bool bPublisher = false;
- if ( sPub.getLength() > 0 )
+ if ( !sPub.isEmpty() )
{
m_PublisherLabel.Show();
m_PublisherLink.Show();
@@ -1039,7 +1039,7 @@ bool UpdateDialog::showDescription(std::pair< rtl::OUString, rtl::OUString > con
bPublisher = true;
}
- if ( sReleaseNotes.getLength() > 0 )
+ if ( !sReleaseNotes.isEmpty() )
{
if ( !bPublisher )
{
@@ -1170,7 +1170,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
{
if ( (*i)->sExtensionID == aExtensionID )
{
- if ( ( (*i)->sVersion.getLength() == 0 ) || ( (*i)->sVersion == aVersion ) )
+ if ( ( !(*i)->sVersion.isEmpty() ) || ( (*i)->sVersion == aVersion ) )
{
bIsIgnored = true;
index->m_bIgnored = true;
@@ -1211,7 +1211,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore,
aVersion = aInfoset.getVersion();
}
- if ( aExtensionID.getLength() )
+ if ( !aExtensionID.isEmpty() )
{
bool bFound = false;
for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
@@ -1318,7 +1318,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
UpdateDialog::SpecificError & data = m_specificErrors[ pos ];
b.append(m_failure);
b.append(LF);
- b.append( data.message.getLength() == 0 ? m_unknownError : data.message );
+ b.append( data.message.isEmpty() ? m_unknownError : data.message );
break;
}
default:
@@ -1414,7 +1414,7 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
::rtl::OUString sURL;
if ( pHyperlink )
sURL = ::rtl::OUString( pHyperlink->GetURL() );
- if ( sURL.getLength() == 0 )
+ if ( sURL.isEmpty() )
return 0;
try
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 6df09e0317e9..35dc8f3f5ba1 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -322,7 +322,7 @@ void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sE
m_mle_info.InsertText(OUSTR("\n"));
m_mle_info.InsertText(sError);
//Insert more information about the error
- if (exceptionMessage.getLength())
+ if (!exceptionMessage.isEmpty())
m_mle_info.InsertText(m_sThisErrorOccurred + exceptionMessage + OUSTR("\n"));
m_mle_info.InsertText(m_sNoInstall);
@@ -383,7 +383,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
continue;
//We assume that m_aVecUpdateData contains only information about extensions which
//can be downloaded directly.
- OSL_ASSERT(curData.sWebsiteURL.getLength() == 0);
+ OSL_ASSERT(curData.sWebsiteURL.isEmpty());
//update the name of the extension which is to be downloaded
{
@@ -405,9 +405,9 @@ void UpdateInstallDialog::Thread::downloadExtensions()
{
try
{
- OSL_ENSURE(seqDownloadURLs[j].getLength() > 0, "Download URL is empty!");
+ OSL_ENSURE(!seqDownloadURLs[j].isEmpty(), "Download URL is empty!");
download(seqDownloadURLs[j], curData);
- if (curData.sLocalURL.getLength() > 0)
+ if (!curData.sLocalURL.isEmpty())
break;
}
catch ( cssu::Exception & e )
@@ -425,7 +425,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
if (m_stop) {
return;
}
- if (curData.sLocalURL.getLength() == 0)
+ if (curData.sLocalURL.isEmpty())
{
//Construct a string of all messages contained in the exceptions plus the respective download URLs
::rtl::OUStringBuffer buf(256);
@@ -501,7 +501,7 @@ void UpdateInstallDialog::Thread::installExtensions()
}
m_abort = xAbortChannel;
}
- if (!curData.aUpdateSource.is() && curData.sLocalURL.getLength())
+ if (!curData.aUpdateSource.is() && !curData.sLocalURL.isEmpty())
{
css::beans::NamedValue prop(OUSTR("EXTENSION_UPDATE"), css::uno::makeAny(OUSTR("1")));
if (!curData.bIsShared)
@@ -581,7 +581,7 @@ void UpdateInstallDialog::Thread::installExtensions()
void UpdateInstallDialog::Thread::removeTempDownloads()
{
- if (m_sDownloadFolder.getLength())
+ if (!m_sDownloadFolder.isEmpty())
{
dp_misc::erase_path(m_sDownloadFolder,
cssu::Reference<css::ucb::XCommandEnvironment>(),false /* no throw: ignore errors */ );
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 3ff4b320cba8..47a86c5008b2 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -162,7 +162,7 @@ ActivePackages::Entries ActivePackages::getEntries() const {
for (::dp_misc::t_string2string_map::const_iterator i(m.begin());
i != m.end(); ++i)
{
- if (i->first.getLength() > 0 && i->first[0] == separator) {
+ if (!i->first.isEmpty() && i->first[0] == separator) {
es.push_back(
::std::make_pair(
::rtl::OUString(
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index a5082dafdab9..4f0331aa2df4 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1233,7 +1233,7 @@ void ExtensionManager::reinstallDeployedExtensions(
{
const OUString id = dp_misc::getIdentifier(extensions[ pos ]);
const OUString fileName = extensions[ pos ]->getName();
- OSL_ASSERT(id.getLength());
+ OSL_ASSERT(!id.isEmpty());
activateExtension(id, fileName, false, true, xAbortChannel, xCmdEnv );
}
catch (const lang::DisposedException &)
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index c3f53edd3c72..dc879d1e4d4d 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -155,15 +155,15 @@ PackageInformationProvider::getPackageLocation( const rtl::OUString& _sExtension
{
rtl::OUString aLocationURL = getPackageLocation( UNISTRING("user"), _sExtensionId );
- if ( aLocationURL.getLength() == 0 )
+ if ( aLocationURL.isEmpty() )
{
aLocationURL = getPackageLocation( UNISTRING("shared"), _sExtensionId );
}
- if ( aLocationURL.getLength() == 0 )
+ if ( aLocationURL.isEmpty() )
{
aLocationURL = getPackageLocation( UNISTRING("bundled"), _sExtensionId );
}
- if ( aLocationURL.getLength() )
+ if ( !aLocationURL.isEmpty() )
{
::ucbhelper::Content aContent( aLocationURL, NULL );
aLocationURL = aContent.getURL();
@@ -189,7 +189,7 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI
}
std::vector<std::pair<uno::Reference<deployment::XPackage>, uno::Any > > errors;
dp_misc::UpdateInfoMap updateInfoMap;
- if (_sExtensionId.getLength())
+ if (!_sExtensionId.isEmpty())
{
std::vector<uno::Reference<deployment::XPackage> > vecExtensions;
uno::Reference<deployment::XPackage> extension;
@@ -268,7 +268,7 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI
updateVersion = updateVersionUser;
else
updateVersion = updateVersionShared;
- if (updateVersion.getLength())
+ if (!updateVersion.isEmpty())
{
rtl::OUString aNewEntry[2];
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 63720c5de74c..d2a6550cf2b5 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -125,9 +125,9 @@ OUString getExtensionFolder(OUString const & parentFolder,
void PackageManagerImpl::initActivationLayer(
Reference<XCommandEnvironment> const & xCmdEnv )
{
- if (m_activePackages.getLength() == 0)
+ if (m_activePackages.isEmpty())
{
- OSL_ASSERT( m_registryCache.getLength() == 0 );
+ OSL_ASSERT( m_registryCache.isEmpty() );
// documents temp activation:
m_activePackagesDB.reset( new ActivePackages );
::ucbhelper::Content ucbContent;
@@ -161,7 +161,7 @@ void PackageManagerImpl::initActivationLayer(
OUString mediaType( detectMediaType( sourceContent,
false /* no throw */) );
- if (mediaType.getLength() >0)
+ if (!mediaType.isEmpty())
{
ActivePackages::Data dbData;
insertToActivationLayer(
@@ -180,7 +180,7 @@ void PackageManagerImpl::initActivationLayer(
else
{
// user|share:
- OSL_ASSERT( m_activePackages.getLength() > 0 );
+ OSL_ASSERT( !m_activePackages.isEmpty() );
m_activePackages_expanded = expandUnoRcUrl( m_activePackages );
m_registrationData_expanded = expandUnoRcUrl(m_registrationData);
if (!m_readOnly)
@@ -304,7 +304,7 @@ void PackageManagerImpl::initActivationLayer(
//______________________________________________________________________________
void PackageManagerImpl::initRegistryBackends()
{
- if (m_registryCache.getLength() > 0)
+ if (!m_registryCache.isEmpty())
create_folder( 0, m_registryCache,
Reference<XCommandEnvironment>(), false);
m_xRegistry.set( ::dp_registry::create(
@@ -408,7 +408,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
try {
//There is no stampURL for the bundled folder
- if (stampURL.getLength() > 0)
+ if (!stampURL.isEmpty())
{
#define CURRENT_STAMP "1"
try {
@@ -441,7 +441,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
}
}
- if (!that->m_readOnly && logFile.getLength() > 0)
+ if (!that->m_readOnly && !logFile.isEmpty())
{
const Any any_logFile(logFile);
that->m_xLogFile.set(
@@ -601,9 +601,9 @@ OUString PackageManagerImpl::detectMediaType(
}
catch (const beans::UnknownPropertyException &) {
}
- OSL_ENSURE( mediaType.getLength() > 0, "### no media-type?!" );
+ OSL_ENSURE( !mediaType.isEmpty(), "### no media-type?!" );
}
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
{
try {
Reference<deployment::XPackage> xPackage(
@@ -781,14 +781,14 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
OUString destFolder;
OUString mediaType(mediaType_);
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
mediaType = detectMediaType( sourceContent );
Reference<deployment::XPackage> xPackage;
// copy file:
progressUpdate(
getResourceString(RID_STR_COPYING_PACKAGE) + title, xCmdEnv );
- if (m_activePackages.getLength() == 0)
+ if (m_activePackages.isEmpty())
{
::ucbhelper::Content docFolderContent;
create_folder( &docFolderContent, m_context, xCmdEnv );
@@ -940,7 +940,7 @@ void PackageManagerImpl::removePackage(
{
ActivePackages::Data val;
m_activePackagesDB->get( & val, id, fileName);
- OSL_ASSERT(val.temporaryName.getLength());
+ OSL_ASSERT(!val.temporaryName.isEmpty());
OUString url(makeURL(m_activePackages_expanded,
val.temporaryName + OUSTR("removed")));
::ucbhelper::Content contentRemoved(url, xCmdEnv );
@@ -1217,7 +1217,7 @@ void PackageManagerImpl::reinstallDeployedPackages(
try_dispose( m_xRegistry );
m_xRegistry.clear();
- if (m_registryCache.getLength() > 0)
+ if (!m_registryCache.isEmpty())
erase_path( m_registryCache, xCmdEnv );
initRegistryBackends();
Reference<util::XUpdatable> xUpdatable( m_xRegistry, UNO_QUERY );
@@ -1430,7 +1430,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
dbData.fileName = title;
dbData.mediaType = xPackage->getPackageType()->getMediaType();
dbData.version = xPackage->getVersion();
- OSL_ENSURE(dbData.version.getLength() > 0,
+ OSL_ENSURE(!dbData.version.isEmpty(),
"Extension Manager: bundled and shared extensions must have "
"an identifier and a version");
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index ec774ad0511d..286a16c1fc42 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -441,7 +441,7 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getSupportedPlaforms()
{
::rtl::OUString aToken = value.getToken( 0, ',', nIndex );
aToken = aToken.trim();
- if (aToken.getLength())
+ if (!aToken.isEmpty())
vec.push_back(aToken);
}
@@ -487,10 +487,10 @@ DescriptionInfoset::getUpdateDownloadUrls() const
css::uno::Sequence< ::rtl::OUString > aStrListHC = getUrls( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "desc:icon/desc:high-contrast/@xlink:href")));
- if ( bHighContrast && aStrListHC.hasElements() && aStrListHC[0].getLength() )
+ if ( bHighContrast && aStrListHC.hasElements() && !aStrListHC[0].isEmpty() )
return aStrListHC[0];
- if ( aStrList.hasElements() && aStrList[0].getLength() )
+ if ( aStrList.hasElements() && !aStrList[0].isEmpty() )
return aStrList[0];
return ::rtl::OUString();
@@ -503,7 +503,7 @@ DescriptionInfoset::getUpdateDownloadUrls() const
const ::rtl::OUString sURL (getLocalizedHREFAttrFromChild(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/desc:description/desc:update-website")), &bParentExists ));
- if (sURL.getLength() > 0)
+ if (!sURL.isEmpty())
return ::boost::optional< ::rtl::OUString >(sURL);
else
return bParentExists ? ::boost::optional< ::rtl::OUString >(::rtl::OUString()) :
@@ -663,7 +663,7 @@ DescriptionInfoset::getSimpleLicenseAttributes() const
css::uno::Reference< css::xml::dom::XNode >
DescriptionInfoset::getLocalizedChild( const ::rtl::OUString & sParent) const
{
- if ( ! m_element.is() || !sParent.getLength())
+ if ( ! m_element.is() || sParent.isEmpty())
return css::uno::Reference< css::xml::dom::XNode > ();
css::uno::Reference< css::xml::dom::XNode > xParent;
@@ -719,7 +719,7 @@ DescriptionInfoset::matchCountryAndLanguage(
OSL_ASSERT(xParent.is());
css::uno::Reference<css::xml::dom::XNode> nodeMatch;
- if (officeLocale.Country.getLength())
+ if (!officeLocale.Country.isEmpty())
{
const ::rtl::OUString sLangCountry(officeLocale.Language +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")) +
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 75686187cb1e..467bc990362a 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -134,7 +134,7 @@ const OUString OfficePipeId::operator () ()
bool existsOfficePipe()
{
OUString const & pipeId = OfficePipeId::get();
- if (pipeId.getLength() == 0)
+ if (pipeId.isEmpty())
return false;
::osl::Security sec;
::osl::Pipe pipe( pipeId, osl_Pipe_OPEN, sec );
@@ -284,9 +284,9 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ )
else
buf.append( baseURL );
OUString relPath(relPath_);
- if (relPath.getLength() > 0 && relPath[ 0 ] == '/')
+ if (!relPath.isEmpty() && relPath[ 0 ] == '/')
relPath = relPath.copy( 1 );
- if (relPath.getLength() > 0)
+ if (!relPath.isEmpty())
{
buf.append( static_cast<sal_Unicode>('/') );
if (baseURL.matchAsciiL(
@@ -599,7 +599,7 @@ void syncRepositories(Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
OUString sDisable;
::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() );
- if (sDisable.getLength() > 0)
+ if (!sDisable.isEmpty())
return;
Reference<deployment::XExtensionManager> xExtensionManager;
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 4f112573efa0..04609e7603be 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -49,7 +49,7 @@ struct OfficeLocale :
OUString slang(utl::ConfigManager::getLocale());
//fallback, the locale is currently only set when the user starts the
//office for the first time.
- if (slang.getLength() == 0)
+ if (slang.isEmpty())
slang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
return slang;
}
@@ -180,7 +180,7 @@ void checkThirdSubtag(::rtl::OUString const & tag)
checkPrimarySubtag(lang);
locale.Language = lang;
OUString country = _sLang.getToken( 0, '-', nIndex );
- if (country.getLength() > 0)
+ if (!country.isEmpty())
{
bool bIsCountry = false;
checkSecondSubtag(country, bIsCountry);
@@ -193,10 +193,10 @@ void checkThirdSubtag(::rtl::OUString const & tag)
locale.Variant = country;
}
}
- if (locale.Variant.getLength() == 0)
+ if (locale.Variant.isEmpty())
{
OUString variant = _sLang.getToken( 0, '-', nIndex );
- if (variant.getLength() > 0)
+ if (!variant.isEmpty())
{
checkThirdSubtag(variant);
locale.Variant = variant;
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 4995453ebec2..6ae4bf296912 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -146,7 +146,7 @@ void getDefaultUpdateInfos(
std::vector<std::pair<Reference<deployment::XPackage>, uno::Any> > & out_errors)
{
const rtl::OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL());
- OSL_ASSERT(sDefaultURL.getLength());
+ OSL_ASSERT(!sDefaultURL.isEmpty());
Any anyError;
Sequence< Reference< xml::dom::XElement > >
@@ -248,7 +248,7 @@ UPDATE_SOURCE isUpdateUserExtension(
UPDATE_SOURCE retVal = UPDATE_SOURCE_NONE;
if (bReadOnlyShared)
{
- if (userVersion.getLength())
+ if (!userVersion.isEmpty())
{
int index = determineHighestVersion(
userVersion, sharedVersion, bundledVersion, onlineVersion);
@@ -259,7 +259,7 @@ UPDATE_SOURCE isUpdateUserExtension(
else if (index == 3)
retVal = UPDATE_SOURCE_ONLINE;
}
- else if (sharedVersion.getLength())
+ else if (!sharedVersion.isEmpty())
{
int index = determineHighestVersion(
OUString(), sharedVersion, bundledVersion, onlineVersion);
@@ -272,7 +272,7 @@ UPDATE_SOURCE isUpdateUserExtension(
}
else
{
- if (userVersion.getLength())
+ if (!userVersion.isEmpty())
{
int index = determineHighestVersion(
userVersion, sharedVersion, bundledVersion, onlineVersion);
@@ -298,7 +298,7 @@ UPDATE_SOURCE isUpdateSharedExtension(
return UPDATE_SOURCE_NONE;
UPDATE_SOURCE retVal = UPDATE_SOURCE_NONE;
- if (sharedVersion.getLength())
+ if (!sharedVersion.isEmpty())
{
int index = determineHighestVersion(
OUString(), sharedVersion, bundledVersion, onlineVersion);
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 2ed0f18df3ce..a6e2504f2bd6 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -492,7 +492,7 @@ void BackendImpl::initServiceRdbFiles()
::ucbhelper::Content cacheDir( getCachePath(), xCmdEnv );
::ucbhelper::Content oldRDB;
// switch common rdb:
- if (m_commonRDB_RO.getLength() > 0)
+ if (!m_commonRDB_RO.isEmpty())
{
create_ucb_content(
&oldRDB, makeURL( getCachePath(), m_commonRDB_RO),
@@ -514,7 +514,7 @@ void BackendImpl::initServiceRdbFiles()
oldRDB = ::ucbhelper::Content();
}
// switch native rdb:
- if (m_nativeRDB_RO.getLength() > 0)
+ if (!m_nativeRDB_RO.isEmpty())
{
create_ucb_content(
&oldRDB, makeURL(getCachePath(), m_nativeRDB_RO),
@@ -538,7 +538,7 @@ void BackendImpl::initServiceRdbFiles()
// common rdb for java, native rdb for shared lib components
- if (m_commonRDB.getLength() > 0) {
+ if (!m_commonRDB.isEmpty()) {
m_xCommonRDB.set(
m_xComponentContext->getServiceManager()
->createInstanceWithContext(
@@ -548,7 +548,7 @@ void BackendImpl::initServiceRdbFiles()
makeURL( expandUnoRcUrl(getCachePath()), m_commonRDB ),
false, true);
}
- if (m_nativeRDB.getLength() > 0) {
+ if (!m_nativeRDB.isEmpty()) {
m_xNativeRDB.set(
m_xComponentContext->getServiceManager()
->createInstanceWithContext(
@@ -565,7 +565,7 @@ void BackendImpl::initServiceRdbFiles_RO()
const Reference<XCommandEnvironment> xCmdEnv;
// common rdb for java, native rdb for shared lib components
- if (m_commonRDB_RO.getLength() > 0)
+ if (!m_commonRDB_RO.isEmpty())
{
m_xCommonRDB_RO.set(
m_xComponentContext->getServiceManager()
@@ -577,7 +577,7 @@ void BackendImpl::initServiceRdbFiles_RO()
sal_True, //read-only
sal_True); // create data source if necessary
}
- if (m_nativeRDB_RO.getLength() > 0)
+ if (!m_nativeRDB_RO.isEmpty())
{
m_xNativeRDB_RO.set(
m_xComponentContext->getServiceManager()
@@ -729,7 +729,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
Reference<XCommandEnvironment> const & xCmdEnv )
{
OUString mediaType(mediaType_);
- if (mediaType.getLength() == 0 ||
+ if (mediaType.isEmpty() ||
mediaType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM(
"application/vnd.sun.star.uno-component") ) ||
@@ -756,7 +756,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
url, OUSTR("RegistrationClassName"), xCmdEnv ))
mediaType = OUSTR(
"application/vnd.sun.star.uno-component;type=Java");
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
mediaType = OUSTR(
"application/vnd.sun.star.uno-typelibrary;type=Java");
}
@@ -769,7 +769,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
mediaType =
OUSTR("application/vnd.sun.star.uno-typelibrary;type=RDB");
}
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
@@ -898,7 +898,7 @@ void BackendImpl::unorc_verify_init(
sal_Int32 index = sizeof ("UNO_JAVA_CLASSPATH=") - 1;
do {
OUString token( line.getToken( 0, ' ', index ).trim() );
- if (token.getLength() > 0)
+ if (!token.isEmpty())
{
if (create_ucb_content(
0, expandUnoRcTerm(token), xCmdEnv,
@@ -919,7 +919,7 @@ void BackendImpl::unorc_verify_init(
sal_Int32 index = sizeof ("UNO_TYPES=") - 1;
do {
OUString token( line.getToken( 0, ' ', index ).trim() );
- if (token.getLength() > 0)
+ if (!token.isEmpty())
{
if (token[ 0 ] == '?')
token = token.copy( 1 );
@@ -953,7 +953,7 @@ void BackendImpl::unorc_verify_init(
i >= 0;)
{
rtl::OUString token(line.getToken(0, ' ', i));
- if (token.getLength() != 0)
+ if (!token.isEmpty())
{
if (state == 1 &&
token.matchAsciiL(
@@ -1054,22 +1054,22 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
// If we duplicated the common or native rdb then we must use those urls
//otherwise we use those of the original files. That is, m_commonRDB_RO and
//m_nativeRDB_RO;
- OUString sCommonRDB(m_commonRDB.getLength() > 0 ? m_commonRDB : m_commonRDB_RO);
- OUString sNativeRDB(m_nativeRDB.getLength() > 0 ? m_nativeRDB : m_nativeRDB_RO);
+ OUString sCommonRDB(m_commonRDB.isEmpty() ? m_commonRDB_RO : m_commonRDB );
+ OUString sNativeRDB(m_nativeRDB.isEmpty() ? m_nativeRDB_RO : m_nativeRDB );
- if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0 ||
+ if (!sCommonRDB.isEmpty() || !sNativeRDB.isEmpty() ||
!m_components.empty())
{
buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=") );
bool space = false;
- if (sCommonRDB.getLength() > 0)
+ if (!sCommonRDB.isEmpty())
{
buf.append( RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/") );
buf.append( ::rtl::OUStringToOString(
sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
space = true;
}
- if (sNativeRDB.getLength() > 0)
+ if (!sNativeRDB.isEmpty())
{
if (space)
{
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 05c27301c4d2..85f404c44012 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -311,7 +311,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
Reference<XCommandEnvironment> const & xCmdEnv )
{
OUString mediaType( mediaType_ );
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
{
// detect media-type:
::ucbhelper::Content ucbContent;
@@ -330,7 +330,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
"vnd.sun.star.configuration-schema");
}
}
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
@@ -396,7 +396,7 @@ void BackendImpl::configmgrini_verify_init(
sal_Int32 index = RTL_CONSTASCII_LENGTH("SCHEMA=");
do {
OUString token( line.getToken( 0, ' ', index ).trim() );
- if (token.getLength() > 0) {
+ if (!token.isEmpty()) {
//The file may not exist anymore if a shared or bundled
//extension was removed, but it can still be in the configmgrini.
//After running XExtensionManager::synchronize, the configmgrini is
@@ -411,7 +411,7 @@ void BackendImpl::configmgrini_verify_init(
sal_Int32 index = RTL_CONSTASCII_LENGTH("DATA=");
do {
OUString token( line.getToken( 0, ' ', index ).trim() );
- if (token.getLength() > 0)
+ if (!token.isEmpty())
{
if (token[ 0 ] == '?')
token = token.copy( 1 );
@@ -660,7 +660,7 @@ OUString replaceOrigin(
RTL_CONSTASCII_STRINGPARAM("origin%"),
RTL_CONSTASCII_LENGTH("origin%")) == 0)
{
- if (origin.getLength() == 0) {
+ if (origin.isEmpty()) {
// encode only once
origin = ::rtl::OUStringToOString(
encodeForXml( url.copy( 0, url.lastIndexOf( '/' ) ) ),
@@ -683,7 +683,7 @@ OUString replaceOrigin(
if (write_pos < filtered.getLength())
filtered.realloc( write_pos );
rtl::OUString newUrl(url);
- if (destFolder.getLength())
+ if (!destFolder.isEmpty())
{
//get the file name of the xcu and add it to the url of the temporary folder
sal_Int32 i = url.lastIndexOf('/');
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 559b1cce3169..cbb1bec2a7f6 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -162,7 +162,7 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
Reference<deployment::XPackage> xPackage( iFind->second );
if (xPackage.is())
{
- if (mediaType.getLength() &&
+ if (!mediaType.isEmpty() &&
mediaType != xPackage->getPackageType()->getMediaType())
throw lang::IllegalArgumentException
(OUSTR("XPackageRegistry::bindPackage: media type does not match"),
@@ -247,7 +247,7 @@ OUString PackageRegistryBackend::createFolder(
void PackageRegistryBackend::deleteTempFolder(
OUString const & folderUrl)
{
- if (folderUrl.getLength())
+ if (!folderUrl.isEmpty())
{
erase_path( folderUrl, Reference<XCommandEnvironment>(),
false /* no throw: ignore errors */ );
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index ab7e61ccbafd..85d07f8414e8 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -299,7 +299,7 @@ void BackendDb::writeVectorOfPair(
if (vecPairs.size() == 0)
return;
const OUString sNameSpace = getDbNSName();
- OSL_ASSERT(sNameSpace.getLength());
+ OSL_ASSERT(!sNameSpace.isEmpty());
const OUString sPrefix(getNSPrefix() + OUSTR(":"));
const Reference<css::xml::dom::XDocument> doc = getDocument();
const Reference<css::xml::dom::XNode> root = doc->getFirstChild();
@@ -457,7 +457,7 @@ void BackendDb::writeSimpleElement(
{
try
{
- if (value.getLength() == 0)
+ if (value.isEmpty())
return;
const OUString sPrefix = getNSPrefix();
const Reference<css::xml::dom::XDocument> doc = getDocument();
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() );
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 70a598b83d05..15a9b09cd4f1 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -171,7 +171,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
{
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
{
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 9d96328f93be..73f4601f6fae 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -183,7 +183,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
Reference<XCommandEnvironment> const & xCmdEnv )
{
// we don't support auto detection:
- if (mediaType_.getLength() == 0)
+ if (mediaType_.isEmpty())
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
@@ -572,7 +572,7 @@ void BackendImpl::implProcessHelp(
aErrMsg = aErrMsg.copy( 0, nCopy );
}
aErrStr += aErrMsg;
- if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
+ if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() )
{
aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " in " ));
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 8c8124eb0ff2..e8ddb0bd1ff2 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -368,7 +368,7 @@ public:
getComponentContext() const { return m_xComponentContext; }
inline ::rtl::OUString const & getCachePath() const { return m_cachePath; }
- inline bool transientMode() const { return m_cachePath.getLength() == 0; }
+ inline bool transientMode() const { return m_cachePath.isEmpty(); }
inline ::rtl::OUString getContext() const {return m_context; }
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index c9e5163908ac..0bd33e9fc230 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -385,7 +385,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
{
OUString mediaType( mediaType_ );
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
{
// detect media-type:
::ucbhelper::Content ucbContent;
@@ -418,7 +418,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
OUSTR("application/vnd.sun.star.legacy-package-bundle");
}
}
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
@@ -682,7 +682,7 @@ bool BackendImpl::PackageImpl::checkDependencies(
//If we do not get a localized licence then there is an error in the description.xml
//This should be handled by using a validating parser. Therefore we assume that no
//license is available.
- if (sLic.getLength() == 0)
+ if (sLic.isEmpty())
throw css::deployment::DeploymentException(
OUSTR("Could not obtain path to license. Possible error in description.xml"), 0, Any());
OUString sHref = m_url_expanded + OUSTR("/") + sLic;
@@ -832,7 +832,7 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool
uno::Reference< graphic::XGraphic > xGraphic;
OUString aIconURL = getDescriptionInfoset().getIconURL( bHighContrast );
- if ( aIconURL.getLength() )
+ if ( !aIconURL.isEmpty() )
{
OUString aFullIconURL = m_url_expanded + OUSTR("/") + aIconURL;
@@ -996,7 +996,7 @@ OUString BackendImpl::PackageImpl::getDescription()
const OUString sRelativeURL(getDescriptionInfoset().getLocalizedDescriptionURL());
OUString sDescription;
- if (sRelativeURL.getLength())
+ if (!sRelativeURL.isEmpty())
{
OUString sURL = m_url_expanded + OUSTR("/") + sRelativeURL;
@@ -1010,7 +1010,7 @@ OUString BackendImpl::PackageImpl::getDescription()
}
}
- if (sDescription.getLength())
+ if (!sDescription.isEmpty())
return sDescription;
return m_oldDescription;
}
@@ -1030,7 +1030,7 @@ OUString BackendImpl::PackageImpl::getLicenseText()
{
OUString aLicenseURL = aInfo.getLocalizedLicenseURL();
- if ( aLicenseURL.getLength() )
+ if ( !aLicenseURL.isEmpty() )
{
OUString aFullURL = m_url_expanded + OUSTR("/") + aLicenseURL;
sLicense = getTextFromURL( Reference< ucb::XCommandEnvironment >(), aFullURL);
@@ -1053,7 +1053,7 @@ void BackendImpl::PackageImpl::exportTo(
::ucbhelper::Content sourceContent( m_url_expanded, xCmdEnv );
OUString title(newTitle);
- if (title.getLength() == 0)
+ if (title.isEmpty())
sourceContent.getPropertyValue( StrTitle::get() ) >>= title;
OUString destURL( makeURL( destFolderURL, ::rtl::Uri::encode(
title, rtl_UriCharClassPchar,
@@ -1272,7 +1272,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle(
mediaType = OUSTR("application/vnd.sun.star."
"dialog-library");
- if (mediaType.getLength() > 0) {
+ if (!mediaType.isEmpty()) {
const Reference<deployment::XPackage> xPackage(
bindBundleItem( getURL(), mediaType, false, OUString(),
xCmdEnv ) );
@@ -1362,7 +1362,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle(
inline bool isBundle_( OUString const & mediaType )
{
// xxx todo: additional parsing?
- return mediaType.getLength() > 0 &&
+ return !mediaType.isEmpty() &&
(mediaType.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(
"application/vnd.sun.star.package-bundle") ) ||
@@ -1458,7 +1458,7 @@ void BackendImpl::PackageImpl::scanBundle(
Sequence<beans::PropertyValue> const & attribs = manifestSeq[ pos ];
for ( sal_Int32 i = attribs.getLength(); i--; )
{
- if (fullPath.getLength() > 0 && mediaType.getLength() > 0)
+ if (!(fullPath.isEmpty() || mediaType.isEmpty()))
break;
if (attribs[i].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("FullPath") ))
@@ -1468,7 +1468,7 @@ void BackendImpl::PackageImpl::scanBundle(
attribs[i].Value >>= mediaType;
}
- if (fullPath.getLength() == 0 || mediaType.getLength() == 0 ||
+ if (fullPath.isEmpty() || mediaType.isEmpty() ||
mediaType.equalsAsciiL( // opt: exclude common text/xml
RTL_CONSTASCII_STRINGPARAM("text/xml") ))
continue;
@@ -1492,7 +1492,7 @@ void BackendImpl::PackageImpl::scanBundle(
// check locale:
param = params.find( ByteString("locale") );
if (param == 0) {
- if (descrFile.getLength() == 0)
+ if (descrFile.isEmpty())
descrFile = url;
}
else {
@@ -1531,7 +1531,7 @@ void BackendImpl::PackageImpl::scanBundle(
}
}
- if (descrFile.getLength() > 0)
+ if (!descrFile.isEmpty())
{
::ucbhelper::Content descrFileContent;
if (create_ucb_content( &descrFileContent, descrFile,
@@ -1615,7 +1615,7 @@ void BackendImpl::PackageImpl::scanLegacyBundle(
bundle.push_back( xPackage );
}
- if (mediaType.getLength() == 0 ||
+ if (mediaType.isEmpty() ||
// script.xlb, dialog.xlb can be met everywhere:
mediaType.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(
@@ -1639,7 +1639,7 @@ OUString BackendImpl::PackageImpl::getDisplayName()
throw deployment::ExtensionRemovedException();
OUString sName = getDescriptionInfoset().getLocalizedDisplayName();
- if (sName.getLength() == 0)
+ if (sName.isEmpty())
return m_displayName;
else
return sName;
@@ -1672,10 +1672,9 @@ Reference<deployment::XPackageRegistry> create(
OUString const & context, OUString const & cachePath, bool readOnly,
Reference<XComponentContext> const & xComponentContext )
{
- Sequence<Any> args(
- cachePath.getLength() == 0 ? 1 : 3 );
+ Sequence<Any> args(cachePath.isEmpty() ? 1 : 3 );
args[ 0 ] <<= context;
- if (cachePath.getLength() > 0) {
+ if (!cachePath.isEmpty()) {
args[ 1 ] <<= cachePath;
args[ 2 ] <<= readOnly;
}
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 4e809139ad5f..8240feafc7c3 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -65,7 +65,7 @@ OUString LibraryContainer::get_libname(
::ucbhelper::Content ucb_content( url, xCmdEnv );
xml_parse( ::xmlscript::importLibrary( import ), ucb_content, xContext );
- if (import.aName.getLength() == 0) {
+ if (import.aName.isEmpty()) {
throw Exception( StrCannotDetermineLibName::get(),
Reference<XInterface>() );
}
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index ce79e241e0bf..3b6be7c38502 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -130,17 +130,17 @@ BackendImpl::PackageImpl::PackageImpl(
OUString const & identifier)
: Package( myBackend.get(), url,
OUString(), OUString(), // will be late-initialized
- scriptURL.getLength() > 0 ? myBackend->m_xBasicLibTypeInfo
+ !scriptURL.isEmpty() ? myBackend->m_xBasicLibTypeInfo
: myBackend->m_xDialogLibTypeInfo, bRemoved, identifier),
m_scriptURL( scriptURL ),
m_dialogURL( dialogURL )
{
// name, displayName:
- if (dialogURL.getLength() > 0) {
+ if (!dialogURL.isEmpty()) {
m_dialogName = LibraryContainer::get_libname(
dialogURL, xCmdEnv, myBackend->getComponentContext() );
}
- if (scriptURL.getLength() > 0) {
+ if (!scriptURL.isEmpty()) {
m_name = LibraryContainer::get_libname(
scriptURL, xCmdEnv, myBackend->getComponentContext() );
}
@@ -230,7 +230,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
Reference<XCommandEnvironment> const & xCmdEnv )
{
OUString mediaType( mediaType_ );
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
{
// detect media-type:
::ucbhelper::Content ucbContent;
@@ -248,7 +248,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
xCmdEnv, false /* no throw */ ))
mediaType = OUSTR("application/vnd.sun.star.dialog-library");
}
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
@@ -392,10 +392,10 @@ void BackendImpl::PackageImpl::processPackage_(
Reference< deployment::XPackage > xThisPackage( this );
Reference<XComponentContext> const & xComponentContext = that->getComponentContext();
- bool bScript = (m_scriptURL.getLength() > 0);
+ bool bScript = !m_scriptURL.isEmpty();
Reference<css::script::XLibraryContainer3> xScriptLibs;
- bool bDialog = (m_dialogURL.getLength() > 0);
+ bool bDialog = !m_dialogURL.isEmpty();
Reference<css::script::XLibraryContainer3> xDialogLibs;
bool bRunning = office_is_running();
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 2389c91a5563..41dc730f728e 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -130,7 +130,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
//______________________________________________________________________________
OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
{
- if (m_descr.getLength() == 0)
+ if (m_descr.isEmpty())
return Package::getDescription();
else
return m_descr;
@@ -154,7 +154,7 @@ BackendImpl::PackageImpl::PackageImpl(
initPackageHandler();
sal_Int32 segmEnd = url.getLength();
- if (url.getLength() > 0 && url[ url.getLength() - 1 ] == '/')
+ if (!url.isEmpty() && url[ url.getLength() - 1 ] == '/')
--segmEnd;
sal_Int32 segmStart = (url.lastIndexOf( '/', segmEnd ) + 1);
if (segmStart < 0)
@@ -207,7 +207,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
{
OUString mediaType( mediaType_ );
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
{
// detect media-type:
::ucbhelper::Content ucbContent;
@@ -222,7 +222,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
mediaType = OUSTR("application/vnd.sun.star.framework-script");
}
}
- if (mediaType.getLength() == 0)
+ if (mediaType.isEmpty())
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 7520eb8f58bd..622d2424bf21 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -103,7 +103,7 @@ static const char XDG_CONFIG_PART[] = "/.config";
}
if (xUICommands.is())
{
- if ( sCommand.getLength() > 0 )
+ if ( !sCommand.isEmpty() )
{
rtl::OUString aStr;
::uno::Sequence< beans::PropertyValue > aPropSeq;
@@ -210,7 +210,7 @@ bool MigrationImpl::initializeMigration()
m_vrMigrations = readMigrationSteps(m_vMigrationsAvailable[nIndex].name);
}
- bRet = m_aInfo.userdata.getLength() > 0;
+ bRet = !m_aInfo.userdata.isEmpty();
}
OSL_TRACE( "Migration %s", bRet ? "needed" : "not required" );
@@ -270,7 +270,7 @@ sal_Bool MigrationImpl::doMigration()
for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
{
::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
- if (sModuleIdentifier.getLength()==0)
+ if (sModuleIdentifier.isEmpty())
continue;
uno::Sequence< uno::Any > lArgs(2);
@@ -570,7 +570,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions)
if ( !pXDGCfgHome && aUserInst.endsWithAsciiL( XDG_CONFIG_PART, sizeof( XDG_CONFIG_PART ) - 1 ) )
aUserInst = aUserInst.copy( 0, aUserInst.getLength() - sizeof( XDG_CONFIG_PART ) + 2 ); // remove trailing '.config' ( but leave the terminating '/' )
#endif
- if ( aUserInst.getLength() && aUserInst[ aUserInst.getLength()-1 ] != '/' )
+ if ( !aUserInst.isEmpty() && aUserInst[ aUserInst.getLength()-1 ] != '/' )
aUserInst += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
#if defined UNX && ! defined MACOSX
// tribute to whoever had the "great" idea to use different names on Windows and Unix
@@ -604,7 +604,7 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available
while ( rIter != rAvailableMigrations.end() )
{
install_info aInstallInfo = findInstallation(rIter->supported_versions);
- if (aInstallInfo.productname.getLength() > 0 )
+ if (!aInstallInfo.productname.isEmpty() )
{
m_aInfo = aInstallInfo;
nIndex = i;
@@ -722,7 +722,7 @@ typedef std::map< rtl::OUString, componentParts > Components;
bool getComponent(rtl::OUString const & path, rtl::OUString * component) {
OSL_ASSERT(component != 0);
- if (path.getLength() == 0 || path[0] != '/') {
+ if (path.isEmpty() || path[0] != '/') {
OSL_TRACE(
("configuration migration in/exclude path %s ignored (does not"
" start with slash)"),
@@ -784,7 +784,7 @@ void MigrationImpl::copyConfig() {
rtl::Uri::encode(
seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
RTL_TEXTENCODING_UTF8));
- if (enc.getLength() == 0 && seg.getLength() != 0) {
+ if (enc.isEmpty() && !seg.isEmpty()) {
OSL_TRACE(
("configuration migration component %s ignored (cannot"
" be encoded as file path)"),
@@ -932,7 +932,7 @@ void MigrationImpl::runServices()
migrations_v::const_iterator i_mig = m_vrMigrations->begin();
while (i_mig != m_vrMigrations->end())
{
- if( i_mig->service.getLength() > 0)
+ if( !i_mig->service.isEmpty())
{
try
@@ -1034,13 +1034,13 @@ void MigrationImpl::runServices()
{
::rtl::OUString sExtension(sToolbarName.copy(nIndex));
::rtl::OUString sToolbarResourceName(sToolbarName.copy(0, nIndex));
- if (sToolbarResourceName.getLength()>0 && sExtension.equalsAsciiL(".xml", 4))
+ if (!sToolbarResourceName.isEmpty() && sExtension.equalsAsciiL(".xml", 4))
aModuleInfo.m_vToolbars.push_back(sToolbarResourceName);
}
}
}
- if (aModuleInfo.sModuleShortName.getLength()>0)
+ if (!aModuleInfo.sModuleShortName.isEmpty())
vModulesInfo.push_back(aModuleInfo);
}
}
@@ -1072,7 +1072,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
}
- if (aMigrationItem.m_sCommandURL.getLength())
+ if (!aMigrationItem.m_sCommandURL.isEmpty())
vOldItems.push_back(aMigrationItem);
}
}
@@ -1090,7 +1090,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
}
- if (aMigrationItem.m_sCommandURL.getLength())
+ if (!aMigrationItem.m_sCommandURL.isEmpty())
vNewItems.push_back(aMigrationItem);
}
}
@@ -1104,7 +1104,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
if (pFound != vNewItems.end() && it->m_xPopupMenu.is())
{
::rtl::OUString sName;
- if (sParent.getLength()>0)
+ if (!sParent.isEmpty())
sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
else
sName = it->m_sCommandURL;
@@ -1137,7 +1137,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
if (pFound != vOldItems.end() && it->m_xPopupMenu.is())
{
::rtl::OUString sName;
- if (sParent.getLength()>0)
+ if (!sParent.isEmpty())
sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
else
sName = it->m_sCommandURL;
@@ -1180,7 +1180,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
do
{
::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim();
- if (sToken.getLength()<=0)
+ if (sToken.isEmpty())
break;
sal_Int32 nCount = xTemp->getCount();
@@ -1223,9 +1223,9 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
aPropSeq[2].Name = ITEM_DESCRIPTOR_CONTAINER;
aPropSeq[2].Value <<= it->m_xPopupMenu;
- if (it->m_sPrevSibling.getLength() == 0)
+ if (it->m_sPrevSibling.isEmpty())
xTemp->insertByIndex(0, uno::makeAny(aPropSeq));
- else if (it->m_sPrevSibling.getLength() > 0)
+ else if (!it->m_sPrevSibling.isEmpty())
{
sal_Int32 nCount = xTemp->getCount();
sal_Int32 i = 0;
@@ -1334,7 +1334,7 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
{
::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
- if (sModuleIdentifier.getLength() > 0)
+ if (!sModuleIdentifier.isEmpty())
{
uno::Reference< ui::XUIConfigurationManager > xCfgManager = xModuleCfgSupplier->getUIConfigurationManager(sModuleIdentifier);
m_lCfgManagerSeq[i].Name = vModulesInfo[i].sModuleShortName;
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index f7022ce1e2ec..b2946aff500e 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -323,7 +323,7 @@ css::uno::Any SAL_CALL JavaMigration::execute(
void JavaMigration::migrateJavarc()
{
- if (m_sUserDir.getLength() == 0)
+ if (m_sUserDir.isEmpty())
return;
OUString sValue;
@@ -331,7 +331,7 @@ void JavaMigration::migrateJavarc()
sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue);
OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
"] XJob::execute: Could not get Home entry from java.ini/javarc.");
- if (bSuccess == sal_True && sValue.getLength() > 0)
+ if (bSuccess == sal_True && !sValue.isEmpty())
{
//get the directory
CJavaInfo aInfo;
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 1348a1a7c445..e1b4f2d5a33e 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -282,7 +282,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
}
}
- if ( aExtIdentifier.getLength() > 0 )
+ if ( !aExtIdentifier.isEmpty() )
{
// scan extension identifier and try to match with our black list entries
for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ )
@@ -304,7 +304,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
{
}
- if ( aExtIdentifier.getLength() == 0 )
+ if ( aExtIdentifier.isEmpty() )
{
// Fallback:
// Try to use the folder name to match our black list
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index fa2c4d0ff5d1..7b48403cdb12 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -307,7 +307,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
osl_getCommandArg( nPos, &cmdArg.pData );
++nPos;
cmdArg = cmdArg.trim();
- if (cmdArg.getLength() > 0)
+ if (!cmdArg.isEmpty())
{
if (cmdArg[ 0 ] == '-')
{
@@ -334,7 +334,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
}
}
- if (repository.getLength() == 0)
+ if (repository.isEmpty())
{
if (option_shared)
repository = OUSTR("shared");
@@ -681,7 +681,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
dp_misc::writeConsoleError(
OUSTR("\nERROR: ") + exc.Message + OUSTR("\n"));
- if (cause.getLength())
+ if (!cause.isEmpty())
dp_misc::writeConsoleError(
OUSTR(" Cause: ") + cause + OUSTR("\n"));
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 2b4ba35c5542..b7b57b27e1d4 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -120,7 +120,7 @@ CommandEnvironmentImpl::CommandEnvironmentImpl(
m_option_suppress_license( option_suppressLicense ),
m_xComponentContext(xComponentContext)
{
- if (log_file.getLength() > 0) {
+ if (!log_file.isEmpty()) {
const Any logfile(log_file);
m_xLogFile.set(
xComponentContext->getServiceManager()
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 4491de312592..68745cad067b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -85,7 +85,7 @@ OptionInfo const * getOptionInfo(
for ( ; list->m_name != 0; ++list )
{
OptionInfo const & option_info = *list;
- if (opt.getLength() > 0)
+ if (!opt.isEmpty())
{
if (opt.equalsAsciiL(
option_info.m_name, option_info.m_name_length ) &&
@@ -284,7 +284,7 @@ void printf_package(
if (id.IsPresent)
printf_line( OUSTR("Identifier"), id.Value, level );
OUString version(xPackage->getVersion());
- if (version.getLength() != 0)
+ if (!version.isEmpty())
printf_line( OUSTR("Version"), version, level + 1 );
printf_line( OUSTR("URL"), xPackage->getURL(), level + 1 );
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 23a4296b5b89..c27923ec221f 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -306,7 +306,7 @@ void SplashScreen::loadConfig()
// Determine full screen splash mode
- _bFullScreenSplash = (( sFullScreenSplash.getLength() > 0 ) &&
+ _bFullScreenSplash = (( !sFullScreenSplash.isEmpty() ) &&
( !sFullScreenSplash.equalsAsciiL( "0", 1 )));
// Try to retrieve the relative values for the progress bar. The current
@@ -314,7 +314,7 @@ void SplashScreen::loadConfig()
if ( _bFullScreenSplash )
determineProgressRatioValues( _fXPos, _fYPos, _fWidth, _fHeight );
- if ( sProgressFrameColor.getLength() )
+ if ( !sProgressFrameColor.isEmpty() )
{
sal_uInt8 nRed = 0;
sal_Int32 idx = 0;
@@ -332,7 +332,7 @@ void SplashScreen::loadConfig()
}
}
- if ( sProgressBarColor.getLength() )
+ if ( !sProgressBarColor.isEmpty() )
{
sal_uInt8 nRed = 0;
sal_Int32 idx = 0;
@@ -350,12 +350,12 @@ void SplashScreen::loadConfig()
}
}
- if( sNativeProgress.getLength() )
+ if( !sNativeProgress.isEmpty() )
{
_bNativeProgress = sNativeProgress.toBoolean();
}
- if ( sSize.getLength() )
+ if ( !sSize.isEmpty() )
{
sal_Int32 idx = 0;
sal_Int32 temp = sSize.getToken( 0, ',', idx ).toInt32();
@@ -369,7 +369,7 @@ void SplashScreen::loadConfig()
if ( _barheight >= 10 )
_barspace = 3; // more space between frame and bar
- if ( sPosition.getLength() )
+ if ( !sPosition.isEmpty() )
{
sal_Int32 idx = 0;
sal_Int32 temp = sPosition.getToken( 0, ',', idx ).toInt32();
@@ -400,7 +400,7 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap)
OStringBuffer aStrBuf( 128 );
OStringBuffer aResBuf( 32 );
aStrBuf.append( "intro_" );
- if ( _sAppName.getLength() > 0 )
+ if ( !_sAppName.isEmpty() )
{
aStrBuf.append( OUStringToOString(_sAppName, RTL_TEXTENCODING_UTF8) );
aStrBuf.append( "_" );
@@ -453,7 +453,7 @@ void SplashScreen::determineProgressRatioValues(
OUString sFullScreenProgressRatio = implReadBootstrapKey(
OUString::createFromAscii( szFullScreenProgressRatio ) );
- if ( sFullScreenProgressRatio.getLength() > 0 )
+ if ( !sFullScreenProgressRatio.isEmpty() )
{
double fRatio = sFullScreenProgressRatio.toDouble();
sal_Int32 nRatio = sal_Int32( math::round( fRatio, 2 ) * 100 );
@@ -464,7 +464,7 @@ void SplashScreen::determineProgressRatioValues(
OUString sFullScreenProgressSize = implReadBootstrapKey(
OUString::createFromAscii( szFullScreenProgressSize ) );
- if ( sFullScreenProgressPos.getLength() )
+ if ( !sFullScreenProgressPos.isEmpty() )
{
sal_Int32 idx = 0;
double temp = sFullScreenProgressPos.getToken( 0, ',', idx ).toDouble();
@@ -475,7 +475,7 @@ void SplashScreen::determineProgressRatioValues(
}
}
- if ( sFullScreenProgressSize.getLength() )
+ if ( !sFullScreenProgressSize.isEmpty() )
{
sal_Int32 idx = 0;
double temp = sFullScreenProgressSize.getToken( 0, ',', idx ).toDouble();