From ba0a57702cdef7a0389c06841711d7e3079d471c Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 29 Jun 2013 21:24:12 +0200 Subject: remove OUString wrap for string literals For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- .../accelerators/moduleacceleratorconfiguration.cxx | 4 ++-- .../source/fwe/classes/actiontriggercontainer.cxx | 2 +- .../source/fwe/classes/rootactiontriggercontainer.cxx | 2 +- framework/source/fwe/helper/actiontriggerhelper.cxx | 18 +++++++++--------- framework/source/fwe/helper/undomanagerhelper.cxx | 2 +- framework/source/fwe/xml/toolboxdocumenthandler.cxx | 4 ++-- framework/source/fwi/uielement/constitemcontainer.cxx | 2 +- framework/source/fwi/uielement/rootitemcontainer.cxx | 2 +- framework/source/helper/oframes.cxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 6 +++--- .../source/layoutmanager/toolbarlayoutmanager.cxx | 4 ++-- framework/source/services/autorecovery.cxx | 4 ++-- framework/source/services/license.cxx | 4 ++-- framework/source/services/taskcreatorsrv.cxx | 2 +- framework/source/uiconfiguration/imagemanagerimpl.cxx | 2 +- .../uiconfiguration/moduleuiconfigurationmanager.cxx | 6 +++--- .../source/uiconfiguration/uiconfigurationmanager.cxx | 2 +- framework/source/uielement/headermenucontroller.cxx | 2 +- framework/source/uielement/statusbarmanager.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 10 +++++----- framework/source/uielement/toolbarsmenucontroller.cxx | 8 ++++---- 21 files changed, 45 insertions(+), 45 deletions(-) (limited to 'framework/source') diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 8717e9144692..6af193dfc383 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -102,8 +102,8 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc } else { ::comphelper::SequenceAsHashMap lArgs(lArguments); - m_sModule = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString()); - m_sLocale = lArgs.getUnpackedValueOrDefault(OUString("Locale") , OUString("x-default")); + m_sModule = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString()); + m_sLocale = lArgs.getUnpackedValueOrDefault("Locale", OUString("x-default")); } if (m_sModule.isEmpty()) diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 974a8d1b7207..a4f58f7ba78c 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -81,7 +81,7 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException) else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR )) return (OWeakObject *)( new ActionTriggerSeparatorPropertySet()); else - throw com::sun::star::uno::RuntimeException( OUString( "Unknown service specifier!" ), (OWeakObject *)this ); + throw com::sun::star::uno::RuntimeException("Unknown service specifier!", (OWeakObject *)this ); } diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 3996d6d87374..6f67b8a14e03 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -102,7 +102,7 @@ throw ( Exception, RuntimeException ) else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR )) return (OWeakObject *)( new ActionTriggerSeparatorPropertySet()); else - throw com::sun::star::uno::RuntimeException( OUString( "Unknown service specifier!" ), (OWeakObject *)this ); + throw com::sun::star::uno::RuntimeException("Unknown service specifier!", (OWeakObject *)this ); } Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 96149e4338d2..782eb2447f4a 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -74,13 +74,13 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet, try { // mandatory properties - a = xActionTriggerPropertySet->getPropertyValue( OUString( "Text" ) ); + a = xActionTriggerPropertySet->getPropertyValue("Text"); a >>= aMenuLabel; - a = xActionTriggerPropertySet->getPropertyValue( OUString( "CommandURL" ) ); + a = xActionTriggerPropertySet->getPropertyValue("CommandURL"); a >>= aCommandURL; - a = xActionTriggerPropertySet->getPropertyValue( OUString( "Image" ) ); + a = xActionTriggerPropertySet->getPropertyValue("Image"); a >>= xBitmap; - a = xActionTriggerPropertySet->getPropertyValue( OUString( "SubContainer" ) ); + a = xActionTriggerPropertySet->getPropertyValue("SubContainer"); a >>= xSubContainer; } catch (const Exception&) @@ -90,7 +90,7 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet, // optional properties try { - a = xActionTriggerPropertySet->getPropertyValue( OUString( "HelpURL" ) ); + a = xActionTriggerPropertySet->getPropertyValue("HelpURL"); a >>= aHelpURL; } catch (const Exception&) @@ -260,7 +260,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p // Retrieve the menu attributes and set them in our PropertySet OUString aLabel = pMenu->GetItemText( nItemId ); a <<= aLabel; - xPropSet->setPropertyValue( OUString( "Text" ), a ); + xPropSet->setPropertyValue("Text", a ); OUString aCommandURL = pMenu->GetItemCommand( nItemId ); @@ -271,7 +271,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p } a <<= aCommandURL; - xPropSet->setPropertyValue( OUString( "CommandURL" ), a ); + xPropSet->setPropertyValue("CommandURL", a ); Image aImage = pMenu->GetItemImage( nItemId ); if ( !!aImage ) @@ -279,7 +279,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p // We use our own optimized XBitmap implementation Reference< XBitmap > xBitmap( static_cast< cppu::OWeakObject* >( new ImageWrapper( aImage )), UNO_QUERY ); a <<= xBitmap; - xPropSet->setPropertyValue( OUString( "Image" ), a ); + xPropSet->setPropertyValue("Image", a ); } } catch (const Exception&) @@ -351,7 +351,7 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon Reference< XIndexContainer > xSubContainer = CreateActionTriggerContainer( rActionTriggerContainer ); a <<= xSubContainer; - xPropSet->setPropertyValue( OUString( "SubContainer" ), a ); + xPropSet->setPropertyValue("SubContainer", a ); FillActionTriggerContainerWithMenu( pPopupMenu, xSubContainer ); } } diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index e3c1de422067..40d09c187181 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -673,7 +673,7 @@ namespace framework ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) : rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ); if ( nElements == 0 ) - throw EmptyUndoStackException( OUString( "stack is empty" ), getXUndoManager() ); + throw EmptyUndoStackException("stack is empty", getXUndoManager() ); aGuard.clear(); // <--- SYNCHRONIZED diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 97ec8ce35ca2..8ffd7a20587b 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -262,7 +262,7 @@ throw( SAXException, RuntimeException ) { try { - xPropSet->setPropertyValue( OUString( "UIName" ), makeAny( aUIName ) ); + xPropSet->setPropertyValue("UIName", makeAny( aUIName ) ); } catch ( const UnknownPropertyException& ) { @@ -699,7 +699,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw { try { - xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName; + xPropSet->getPropertyValue("UIName") >>= aUIName; } catch ( const UnknownPropertyException& ) { diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index da7085f63aeb..e3a2defc1dda 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -154,7 +154,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource Reference< XPropertySet > xPropSet( rSourceContainer, UNO_QUERY ); if ( xPropSet.is() ) { - xPropSet->getPropertyValue( OUString( "UIName" )) >>= m_aUIName; + xPropSet->getPropertyValue("UIName") >>= m_aUIName; } } catch ( const Exception& ) diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 9063fbee5b3e..047abd88bc29 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -94,7 +94,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo Reference< XPropertySet > xPropSet( rSourceContainer, UNO_QUERY ); if ( xPropSet.is() ) { - xPropSet->getPropertyValue( OUString( "UIName" )) >>= m_aUIName; + xPropSet->getPropertyValue("UIName") >>= m_aUIName; } } catch ( const Exception& ) diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 64421ce7b377..af078dc26b9f 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -262,7 +262,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce sal_uInt32 nCount = m_pFrameContainer->getCount(); if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount )) - throw IndexOutOfBoundsException( OUString("OFrames::getByIndex - Index out of bounds"), + throw IndexOutOfBoundsException("OFrames::getByIndex - Index out of bounds", (OWeakObject *)this ); // Set default return value. diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index bb04155f389d..e9fa7cb0e89c 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -195,7 +195,7 @@ void LayoutManager::impl_clearUpMenuBar() { try { - xPropSet->getPropertyValue( OUString( "XMenuBar" )) >>= xMenuBar; + xPropSet->getPropertyValue("XMenuBar") >>= xMenuBar; } catch (const beans::UnknownPropertyException&) { @@ -640,7 +640,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI try { // Check persistent flag of the user interface element - xPropSet->getPropertyValue( OUString( "Persistent" )) >>= bPersistent; + xPropSet->getPropertyValue("Persistent") >>= bPersistent; } catch (const beans::UnknownPropertyException&) { @@ -1495,7 +1495,7 @@ throw (RuntimeException) { try { - xPropSet->getPropertyValue( OUString( "XMenuBar" )) >>= xMenuBar; + xPropSet->getPropertyValue("XMenuBar") >>= xMenuBar; } catch (const beans::UnknownPropertyException&) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 4491671f34a5..670c2a4f2f0b 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1596,7 +1596,7 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen try { // Check persistent flag of the user interface element - xPropSet->getPropertyValue( OUString( "Persistent" )) >>= bPersistent; + xPropSet->getPropertyValue("Persistent") >>= bPersistent; } catch (const beans::UnknownPropertyException&) { @@ -3888,7 +3888,7 @@ throw (uno::RuntimeException) xPropSet = uno::Reference< beans::XPropertySet >( xCfgMgr->getSettings( rEvent.ResourceURL, sal_False ), uno::UNO_QUERY ); if ( xPropSet.is() ) - xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName; + xPropSet->getPropertyValue("UIName") >>= aUIName; } catch (const container::NoSuchElementException&) { diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9af8eb7d3aa6..24096470b5f0 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -715,7 +715,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.addInterface(aURL.Complete, xListener); @@ -750,7 +750,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.removeInterface(aURL.Complete, xListener); } diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 9600598ae2dc..514f9dd11217 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -255,7 +255,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // if we find a date there, compare it to baseinstall license date OUString aAcceptDate; - if (pset->getPropertyValue(OUString("ooLicenseAcceptDate")) >>= aAcceptDate) + if (pset->getPropertyValue("ooLicenseAcceptDate") >>= aAcceptDate) { // get LicenseFileDate from base install OUString aLicenseURL = aLicensePath; @@ -290,7 +290,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // write org.openoffice.Setup/ooLicenseAcceptDate aAcceptDate = _getCurrentDateString(); - pset->setPropertyValue(OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate)); + pset->setPropertyValue("ooLicenseAcceptDate", makeAny(aAcceptDate)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); // enable quickstarter diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index cc748de85248..4889ff281b84 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -247,7 +247,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai css::uno::Reference< css::awt::XWindowPeer > xPeer = xToolkit->createWindow( aDescriptor ); css::uno::Reference< css::awt::XWindow > xWindow ( xPeer, css::uno::UNO_QUERY ); if ( ! xWindow.is()) - throw css::uno::Exception(OUString("TaskCreator service was not able to create suitable frame window."), + throw css::uno::Exception("TaskCreator service was not able to create suitable frame window.", static_cast< ::cppu::OWeakObject* >(this)); if (bTopWindow) xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index fd7a4eb759cd..fa3bf1a31a03 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -773,7 +773,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments ) if ( xPropSet.is() ) { long nOpenMode = 0; - if ( xPropSet->getPropertyValue( OUString( "OpenMode" )) >>= nOpenMode ) + if ( xPropSet->getPropertyValue("OpenMode") >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 270473c05fca..dfadbe57429a 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -810,8 +810,8 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); - m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString()); - m_aModuleShortName = lArgs.getUnpackedValueOrDefault(OUString("ModuleShortName"), OUString()); + m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString()); + m_aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString()); for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) { @@ -847,7 +847,7 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a if ( xPropSet.is() ) { long nOpenMode = 0; - Any a = xPropSet->getPropertyValue( OUString( "OpenMode" )); + Any a = xPropSet->getPropertyValue("OpenMode"); if ( a >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 29d9d88229e6..82367ab6957c 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1137,7 +1137,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S try { long nOpenMode = 0; - Any a = xPropSet->getPropertyValue( OUString( "OpenMode" )); + Any a = xPropSet->getPropertyValue("OpenMode"); if ( a >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 2d8d036b97d4..0e97c0fcd3fe 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -104,7 +104,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra try { Reference< XNameContainer > xNameContainer; - if ( xStyleFamilies->getByName( OUString( "PageStyles" )) >>= xNameContainer ) + if ( xStyleFamilies->getByName("PageStyles") >>= xNameContainer ) { Sequence< OUString > aSeqNames = xNameContainer->getElementNames(); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 6cdf841bdd34..12a56d083f13 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -605,7 +605,7 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt ) css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY ); if ( xPropSet.is() ) - xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager; if ( xLayoutManager.is() ) { aGuard.unlock(); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5bd44ee752e7..5f1637b516d0 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -163,7 +163,7 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager { try { - xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager; } catch (const RuntimeException&) { @@ -443,7 +443,7 @@ void ToolBarManager::UpdateControllers() Reference< XLayoutManager > xLayoutManager; Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY ); if ( xFramePropSet.is() ) - a = xFramePropSet->getPropertyValue( OUString( "LayoutManager" )); + a = xFramePropSet->getPropertyValue("LayoutManager"); a >>= xLayoutManager; Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY ); if ( xLayoutManager.is() && xDockable.is() ) @@ -1095,7 +1095,7 @@ void ToolBarManager::CreateControllers() try { sal_Bool bSupportVisible = sal_True; - Any a( xPropSet->getPropertyValue( OUString( "SupportsVisible" )) ); + Any a( xPropSet->getPropertyValue("SupportsVisible") ); a >>= bSupportVisible; if (bSupportVisible) { @@ -1463,7 +1463,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine try { OUString aUIName; - xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName; + xPropSet->getPropertyValue("UIName") >>= aUIName; if ( !aUIName.isEmpty() ) m_pToolBar->SetText( aUIName ); } @@ -1987,7 +1987,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) if ( xPropSet.is() ) { Reference< XUIConfigurationPersistence > xUICfgMgr; - if (( xPropSet->getPropertyValue( OUString( "ConfigurationSource" )) >>= xUICfgMgr ) && ( xUICfgMgr.is() )) + if (( xPropSet->getPropertyValue("ConfigurationSource") >>= xUICfgMgr ) && ( xUICfgMgr.is() )) xUICfgMgr->store(); } } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 39cfd555bccb..56bf0f14ab08 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -113,7 +113,7 @@ Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame > try { - xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager; } catch ( const UnknownPropertyException& ) { @@ -296,8 +296,8 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl { OUString aResName; sal_Int16 nType( -1 ); - xPropSet->getPropertyValue( OUString( "Type" )) >>= nType; - xPropSet->getPropertyValue( OUString( "ResourceURL" )) >>= aResName; + xPropSet->getPropertyValue("Type") >>= nType; + xPropSet->getPropertyValue("ResourceURL") >>= aResName; if (( nType == ::com::sun::star::ui::UIElementType::TOOLBAR ) && !aResName.isEmpty() ) @@ -677,7 +677,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r { try { - xPropSet->setPropertyValue( OUString( "RefreshContextToolbarVisibility" ), makeAny( sal_True )); + xPropSet->setPropertyValue("RefreshContextToolbarVisibility", makeAny( sal_True )); } catch ( const RuntimeException& ) { -- cgit