diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-26 14:20:50 -0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-12-30 10:56:15 +0100 |
commit | 18692cc1412bd7eca37d80d4345c0ae775d94ac5 (patch) | |
tree | 21d4445a80835fc86826d9adf098dedc76b9ff07 /framework/source/uiconfiguration | |
parent | e220f41cb2486d2ad101d98e48fbbc40c9fd08c3 (diff) |
Fix for fdo43460 Part XX getLength() to isEmpty()
Part XX
Module
framework
Diffstat (limited to 'framework/source/uiconfiguration')
5 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 86c3c979f238..7426360fa27b 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -195,7 +195,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY ); - if ( m_aModuleIdentifier.getLength() > 0 ) + if ( !m_aModuleIdentifier.isEmpty() ) { // If we have a module identifier - use to retrieve the command image name list from it. // Otherwise we will use the global command image list diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 47e2a9b1f6a6..241a3d5874ce 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -227,7 +227,7 @@ throw ( NoSuchElementException, RuntimeException) sShort = ::rtl::OUString(); } - if (!sShort.getLength()) + if (sShort.isEmpty()) throw NoSuchElementException(); PropertyValue aArg; Sequence< Any > aArgs( 2 ); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 7977f8dfd3f8..c4679f55db5d 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -272,7 +272,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); - if (( aUIElementName.getLength() > 0 ) && + if (!aUIElementName.isEmpty() && ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 ))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; @@ -302,7 +302,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType]; Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage; - if ( xElementTypeStorage.is() && aUIElementData.aName.getLength() ) + if ( xElementTypeStorage.is() && !aUIElementData.aName.isEmpty() ) { try { @@ -839,7 +839,7 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR ) aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR(); - if ( aResourceType.getLength() > 0 ) + if ( !aResourceType.isEmpty() ) { m_pStorageHandler[i] = new PresetHandler( m_xServiceManager ); m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES, diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 66369b86ece1..0803ff01dc69 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -215,7 +215,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); - if (( aUIElementName.getLength() > 0 ) && + if (!aUIElementName.isEmpty() && ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 ))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; @@ -240,7 +240,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, UIElementType& rElementTypeData = m_aUIElements[nElementType]; Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage; - if ( xElementTypeStorage.is() && aUIElementData.aName.getLength() ) + if ( xElementTypeStorage.is() && !aUIElementData.aName.isEmpty() ) { try { diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 88e0a3c798d6..1f0974282d3f 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1403,7 +1403,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi } } - if ( aWindowStateFileStr.getLength() > 0 ) + if ( !aWindowStateFileStr.isEmpty() ) { // Create first mapping ModuleIdentifier ==> Window state configuration file m_aModuleToFileHashMap.insert( ModuleToWindowStateFileMap::value_type( aModuleIdentifier, aWindowStateFileStr )); |