diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index cdc74298f937..8876093fc4f6 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -897,16 +897,15 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::u SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me"); } -void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) +void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aReceivedEvents) { SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::changesOccurred()" ); css::uno::Reference< css::container::XHierarchicalNameAccess > xHAccess; - aEvent.Base >>= xHAccess; + aReceivedEvents.Base >>= xHAccess; if (! xHAccess.is ()) return; - css::util::ChangesEvent aReceivedEvents( aEvent ); const sal_Int32 c = aReceivedEvents.Changes.getLength(); for (sal_Int32 i=0; igetByName(sKey) >>= xKey; xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 6cef699bfb14..95937439ca61 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -231,7 +231,7 @@ void StorageHolder::closePath(const OUString& rPath) pIt2 != lFolders.rend(); ++pIt2 ) { - OUString sPath = *pIt2; + const OUString& sPath = *pIt2; TPath2StorageInfo::iterator pPath = m_lStorages.find(sPath); if (pPath == m_lStorages.end()) continue; // ??? diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index a5a0bd6980e6..b9aeac9524d4 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -51,7 +51,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport for (i1=0; i1 xProvider = lProvider[i1]; + const css::uno::Reference< css::frame::XDispatchInformationProvider >& xProvider = lProvider[i1]; if (!xProvider.is()) continue; @@ -84,7 +84,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati try { // ignore controller, which doesn't implement the right interface - css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider = lProvider[i1]; + const css::uno::Reference< css::frame::XDispatchInformationProvider >& xProvider = lProvider[i1]; if (!xProvider.is()) continue; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 608da2216a5c..db24a0bd1003 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1662,7 +1662,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI) { try { - css::uno::Reference< css::frame::XFrame > xFrame = lFrames[i]; + const css::uno::Reference< css::frame::XFrame >& xFrame = lFrames[i]; // XController.suspend() will show a UI ... // Use it in case it was allowed from outside only. diff --git a/framework/source/uiconfiguration/CommandImageResolver.cxx b/framework/source/uiconfiguration/CommandImageResolver.cxx index e6c0c8ba850d..10e3ae4c85b9 100644 --- a/framework/source/uiconfiguration/CommandImageResolver.cxx +++ b/framework/source/uiconfiguration/CommandImageResolver.cxx @@ -79,7 +79,7 @@ void CommandImageResolver::registerCommands(const Sequence& aCommandSe for (sal_Int32 i = 0; i < nSequenceSize; ++i) { - OUString aCommandName(aCommandSequence[i]); + const OUString& aCommandName(aCommandSequence[i]); OUString aImageName; m_aImageCommandNameVector[i] = aCommandName; @@ -129,7 +129,7 @@ ImageList* CommandImageResolver::getImageList(ImageType nImageType) if (!m_pImageList[nImageType]) { - OUString sIconPath = ImageType_Prefixes[nImageType]; + const OUString& sIconPath = ImageType_Prefixes[nImageType]; m_pImageList[nImageType].reset( new ImageList(m_aImageNameVector, sIconPath) ); } diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 6adc07f0c07b..5105f3661740 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -114,7 +114,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >& bool bFirstItemInserted( false ); for ( sal_Int32 n = 0; n < aSeqNames.getLength(); n++ ) { - OUString aName = aSeqNames[n]; + const OUString& aName = aSeqNames[n]; Reference< XPropertySet > xPropSet( xNameContainer->getByName( aName ), UNO_QUERY ); if ( xPropSet.is() ) { diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index eebf61aa7383..dfdebdc7919a 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -104,7 +104,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( do { ++nLevel; - OUString aCmd( rReferencePath[i] ); + const OUString& aCmd( rReferencePath[i] ); if ( i == nCount-1 ) { @@ -350,7 +350,7 @@ bool MenuBarMerger::ProcessFallbackOperation( } else { - const OUString aCmd( rReferencePath[nLevel] ); + const OUString& aCmd( rReferencePath[nLevel] ); VclPtr pPopupMenu = VclPtr::Create(); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d6bde87bc940..914a0b1b2671 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1691,7 +1691,7 @@ void ToolBarManager::notifyRegisteredControllers( const OUString& aUIElementName { try { - Reference< XSubToolbarController > xController = aNotifyVector[i]; + const Reference< XSubToolbarController >& xController = aNotifyVector[i]; if ( xController.is() ) xController->functionSelected( aCommand ); } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 387eef47590b..6c0c09549dce 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -545,7 +545,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r { try { - OUString aElementName = aElementNames[i]; + const OUString& aElementName = aElementNames[i]; Sequence< PropertyValue > aWindowState; if ( xPersistentWindowState->getByName( aElementName ) >>= aWindowState )