diff options
106 files changed, 289 insertions, 231 deletions
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 4e0691db989e..4fd5f24f9fa7 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -40,7 +40,7 @@ class RootActionTriggerContainer final : public PropertySetContainer, public css::container::XNamed { public: - RootActionTriggerContainer(const css::uno::Reference<css::awt::XPopupMenu>& rMenu, const OUString* pMenuIdentifier); + RootActionTriggerContainer(css::uno::Reference<css::awt::XPopupMenu> xMenu, const OUString* pMenuIdentifier); virtual ~RootActionTriggerContainer() override; // XInterface diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index d1535509cf67..d57cc406e3b7 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -48,7 +48,7 @@ class TaskCreator final // interface public: - TaskCreator( const css::uno::Reference< css::uno::XComponentContext >& xContext ); + TaskCreator( css::uno::Reference< css::uno::XComponentContext > xContext ); ~TaskCreator( ); css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName, const utl::MediaDescriptor& rDescriptor ); diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 1ceb256498f9..2217afa9c8d7 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -115,7 +115,7 @@ class CloseDispatcher final : public ::cppu::WeakImplHelper< @param sTarget help us to find the right target for this close operation. */ - CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext , + CloseDispatcher(css::uno::Reference< css::uno::XComponentContext > xContext , const css::uno::Reference< css::frame::XFrame >& xFrame , std::u16string_view sTarget); diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index 3f8a689ead85..e5bdeddc1f97 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -43,8 +43,8 @@ class DispatchInformationProvider final : public ::cppu::WeakImplHelper< css::f // interface public: - DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , - const css::uno::Reference< css::frame::XFrame >& xFrame); + DispatchInformationProvider(css::uno::Reference< css::uno::XComponentContext > xContext , + const css::uno::Reference< css::frame::XFrame >& xFrame); virtual ~DispatchInformationProvider() override; diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 4552e0580d2c..3b544807337c 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -80,8 +80,8 @@ class DispatchProvider final : public ::cppu::WeakImplHelper< css::frame::XDispa /* interface */ public: - DispatchProvider( const css::uno::Reference< css::uno::XComponentContext >& xContext , - const css::uno::Reference< css::frame::XFrame >& xFrame ); + DispatchProvider( css::uno::Reference< css::uno::XComponentContext > xContext , + const css::uno::Reference< css::frame::XFrame >& xFrame ); virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , const OUString& sTargetFrameName , diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 7788559c7eff..a1a4cfc0b3e1 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -151,7 +151,7 @@ class InterceptionHelper final : public ::cppu::WeakImplHelper< an outside creates dispatch provider, which has to be used here as lowest slave "interceptor". */ InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner, - const css::uno::Reference< css::frame::XDispatchProvider >& xSlave); + css::uno::Reference< css::frame::XDispatchProvider > xSlave); private: diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index b354cd08353a..d6fe52d93b84 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -57,7 +57,7 @@ class MailToDispatcher final : public ::cppu::WeakImplHelper< public: // ctor/dtor - MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + MailToDispatcher( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~MailToDispatcher( ) override; /* interface XServiceInfo */ diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 85c6312efbf9..09b80ea8caba 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -51,7 +51,7 @@ class Oxt_Handler final : public ::cppu::WeakImplHelper< public: - Oxt_Handler( const css::uno::Reference< css::uno::XComponentContext >& ); + Oxt_Handler( css::uno::Reference< css::uno::XComponentContext > ); virtual ~Oxt_Handler( ) override; /* interface XServiceInfo */ diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 3f38a6c939c8..0d22beb86477 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -64,7 +64,7 @@ class PopupMenuDispatcher final : public ::cppu::WeakImplHelper< public: // constructor / destructor - PopupMenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext ); + PopupMenuDispatcher( css::uno::Reference< css::uno::XComponentContext > xContext ); /* interface XServiceInfo */ virtual OUString SAL_CALL getImplementationName() override; diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 35bb09d5d50d..0b1ee8ab93c7 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -61,7 +61,7 @@ class ServiceHandler final : public ::cppu::WeakImplHelper< public: // ctor/dtor - ServiceHandler( const css::uno::Reference< css::uno::XComponentContext >& ); + ServiceHandler( css::uno::Reference< css::uno::XComponentContext > ); virtual ~ServiceHandler( ) override; /* interface XServiceInfo */ diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 712251b2b7f0..c575004d49ed 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -62,7 +62,7 @@ class StartModuleDispatcher final : public ::cppu::WeakImplHelper< @param xFrame the frame where the corresponding dispatch was started. */ - StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext); + StartModuleDispatcher(css::uno::Reference< css::uno::XComponentContext > xContext); /** @short does nothing real. */ virtual ~StartModuleDispatcher() override; diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 8dd7cc6fef11..67a36b724624 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -59,7 +59,7 @@ class SystemExec final : public ::cppu::WeakImplHelper< public: // ctor/dtor - SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + SystemExec( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~SystemExec( ) override; /* interface XServiceInfo */ diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index e7f4412a4306..7e028d18e446 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -36,6 +36,7 @@ #include <functional> #include <set> +#include <utility> namespace framework { @@ -108,7 +109,7 @@ class LanguageGuessingHelper css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - LanguageGuessingHelper(const css::uno::Reference< css::uno::XComponentContext >& _xContext) : m_xContext(_xContext){} + LanguageGuessingHelper(css::uno::Reference< css::uno::XComponentContext > _xContext) : m_xContext(std::move(_xContext)){} css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetGuesser() const; }; diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index f796a9bdcc06..8d062488fe83 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -72,7 +72,7 @@ class PersistentWindowState final : public ::cppu::WeakImplHelper< public: // ctor/dtor - PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext); + PersistentWindowState(css::uno::Reference< css::uno::XComponentContext > xContext); virtual ~PersistentWindowState( ) override; // XInitialization diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index b3f3984f7a2c..c492a645f5bc 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -170,7 +170,7 @@ class StatusIndicatorFactory final : public ::cppu::WeakImplHelper< // interface public: - StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext); + StatusIndicatorFactory(css::uno::Reference< css::uno::XComponentContext > xContext); virtual OUString SAL_CALL getImplementationName() override { diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index dccfd91dbd62..11aba17dc4a7 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -68,7 +68,7 @@ class TitleBarUpdate final : public ::cppu::WeakImplHelper< public: // ctor/dtor - TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext); + TitleBarUpdate(css::uno::Reference< css::uno::XComponentContext > xContext); virtual ~TitleBarUpdate( ) override; // XInterface, XTypeProvider diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index bd325665f8d7..6afae95650f1 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -59,7 +59,7 @@ class VCLStatusIndicator final : public ::cppu::WeakImplHelper< css::task::XSta public: /// ctor - VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow); + VCLStatusIndicator(css::uno::Reference< css::awt::XWindow > xParentWindow); /// dtor virtual ~VCLStatusIndicator() override; diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 19d9265f952a..2efc22cb8e87 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -72,8 +72,8 @@ class ConfigAccess final void closeImpl(); public: - ConfigAccess( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const OUString& sRoot ); + ConfigAccess( css::uno::Reference< css::uno::XComponentContext > xContext, + OUString sRoot ); ~ConfigAccess(); void open ( EOpenMode eMode ); diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 6df378c726b9..aaaf35492ffe 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -78,7 +78,7 @@ class HelpOnStartup final : public ::cppu::WeakImplHelper< css::lang::XServiceIn reference to the uno service manager, which created this instance. Can be used later to create own needed uno resources on demand. */ - HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext); + HelpOnStartup(css::uno::Reference< css::uno::XComponentContext > xContext); /** @short does nothing real ... diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index 185b201d9a31..8afc1966f657 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -158,9 +158,9 @@ class Job final : public ::cppu::WeakImplHelper< public: Job( const css::uno::Reference< css::uno::XComponentContext >& xContext , - const css::uno::Reference< css::frame::XFrame >& xFrame ); + css::uno::Reference< css::frame::XFrame > xFrame ); Job( const css::uno::Reference< css::uno::XComponentContext >& xContext , - const css::uno::Reference< css::frame::XModel >& xModel ); + css::uno::Reference< css::frame::XModel > xModel ); virtual ~Job( ) override; void setDispatchResultFake( const css::uno::Reference< css::frame::XDispatchResultListener >& xListener , diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 48004d279ab8..fd23a665e2d8 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -25,6 +25,7 @@ #include <rtl/ustring.hxx> #include <string_view> +#include <utility> #include <vector> namespace framework{ @@ -86,10 +87,10 @@ class JobData final OUString m_sJobName; OUString m_sDocEvent; - TJob2DocEventBinding(const OUString& sJobName , - const OUString& sDocEvent) - : m_sJobName (sJobName ) - , m_sDocEvent(sDocEvent) + TJob2DocEventBinding(OUString sJobName , + OUString sDocEvent) + : m_sJobName (std::move(sJobName )) + , m_sDocEvent(std::move(sDocEvent)) {} }; @@ -164,7 +165,7 @@ class JobData final public: - JobData( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + JobData( css::uno::Reference< css::uno::XComponentContext > xContext ); JobData( const JobData& rCopy ); ~JobData( ); diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index d03ee7921dc0..9152da515969 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -54,7 +54,7 @@ class ShellJob final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,cs reference to the uno service manager, which created this instance. Can be used later to create own needed uno resources on demand. */ - ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext); + ShellJob(css::uno::Reference< css::uno::XComponentContext > xContext); /** @short does nothing real ... diff --git a/framework/inc/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx index a076de21b504..9389ed3e3986 100644 --- a/framework/inc/menuconfiguration.hxx +++ b/framework/inc/menuconfiguration.hxx @@ -20,6 +20,7 @@ #pragma once #include <cppuhelper/weakref.hxx> +#include <utility> namespace com::sun::star::container { class XIndexAccess; } namespace com::sun::star::frame { class XDispatchProvider; } @@ -35,16 +36,16 @@ struct MenuAttributes private: oslInterlockedCount refCount; - MenuAttributes(const OUString& rFrame, const OUString& rImageIdStr) + MenuAttributes(OUString sFrame, OUString sImageIdStr) : refCount(0) - , aTargetFrame(rFrame) - , aImageId(rImageIdStr) + , aTargetFrame(std::move(sFrame)) + , aImageId(std::move(sImageIdStr)) { } - MenuAttributes(const css::uno::WeakReference<css::frame::XDispatchProvider>& rDispatchProvider) + MenuAttributes(css::uno::WeakReference<css::frame::XDispatchProvider> _xDispatchProvider) : refCount(0) - , xDispatchProvider(rDispatchProvider) + , xDispatchProvider(std::move(_xDispatchProvider)) { } @@ -76,7 +77,7 @@ class MenuConfiguration final public: MenuConfiguration( // use const when giving a UNO reference by reference - const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + css::uno::Reference< css::uno::XComponentContext > rxContext ); ~MenuConfiguration(); diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 4730ef580b94..feb5fe8ea315 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -27,7 +27,7 @@ namespace framework class GlobalSettings { public: - GlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + GlobalSettings( css::uno::Reference< css::uno::XComponentContext > xContext ); ~GlobalSettings(); enum StateInfo diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index d35b3d7f2c75..759775ef8b65 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -45,9 +45,9 @@ class ButtonToolbarController final : public css::frame::XStatusListener, public ::cppu::OWeakObject { public: - ButtonToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + ButtonToolbarController( css::uno::Reference< css::uno::XComponentContext > xContext, ToolBox* pToolBar, - const OUString& aCommand ); + OUString aCommand ); virtual ~ButtonToolbarController() override; // XInterface diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 710c788f2dcc..61bec0443240 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <unordered_map> +#include <utility> #include <vector> #include <com/sun/star/frame/XFrame.hpp> @@ -130,12 +131,12 @@ class MenuBarManager final : struct MenuItemHandler { MenuItemHandler( sal_uInt16 aItemId, - css::uno::Reference< css::frame::XStatusListener > const & xManager, - css::uno::Reference< css::frame::XDispatch > const & rDispatch ) : + css::uno::Reference< css::frame::XStatusListener > xManager, + css::uno::Reference< css::frame::XDispatch > xDispatch ) : nItemId( aItemId ), bMadeInvisible ( false ), - xSubMenuManager( xManager ), - xMenuItemDispatch( rDispatch ) {} + xSubMenuManager(std::move( xManager )), + xMenuItemDispatch(std::move( xDispatch )) {} sal_uInt16 nItemId; bool bMadeInvisible; diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 66a5716a8f0d..d696ec6c3f38 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -33,8 +33,7 @@ class MenuBarWrapper final : public UIConfigElementWrapperBase, { public: - MenuBarWrapper( - const css::uno::Reference< css::uno::XComponentContext >& xContext ); + MenuBarWrapper( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~MenuBarWrapper() override; // XInterface, XTypeProvider diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx index 44fecd1dff68..b9597bd2ab57 100644 --- a/framework/inc/uielement/statusbaritem.hxx +++ b/framework/inc/uielement/statusbaritem.hxx @@ -37,7 +37,7 @@ public: explicit StatusbarItem( StatusBar *pStatusBar, sal_uInt16 nId, - const OUString& aCommand ); + OUString aCommand ); virtual ~StatusbarItem() override; void disposing(std::unique_lock<std::mutex>&) override; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index ba2dbd9a31c0..c893e4abdc69 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -45,8 +45,8 @@ class StatusBarManager final: public ::cppu::WeakImplHelper< friend class FrameworkStatusBar; public: - StatusBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::frame::XFrame >& rFrame, + StatusBarManager( css::uno::Reference< css::uno::XComponentContext > xContext, + css::uno::Reference< css::frame::XFrame > xFrame, StatusBar* pStatusBar ); virtual ~StatusBarManager() override; diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx index 84b2befb459d..203ae6956a16 100644 --- a/framework/inc/uielement/statusbarwrapper.hxx +++ b/framework/inc/uielement/statusbarwrapper.hxx @@ -31,7 +31,7 @@ class StatusBarWrapper final : public UIConfigElementWrapperBase { public: StatusBarWrapper( - const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~StatusBarWrapper() override; // XComponent diff --git a/framework/inc/uielement/styletoolbarcontroller.hxx b/framework/inc/uielement/styletoolbarcontroller.hxx index b7bbd8a11782..45b1ad7eccce 100644 --- a/framework/inc/uielement/styletoolbarcontroller.hxx +++ b/framework/inc/uielement/styletoolbarcontroller.hxx @@ -34,7 +34,7 @@ class StyleDispatcher final : public cppu::WeakImplHelper< css::frame::XDispatch { public: StyleDispatcher( const css::uno::Reference< css::frame::XFrame >& rFrame, - const css::uno::Reference< css::util::XURLTransformer >& rUrlTransformer, + css::uno::Reference< css::util::XURLTransformer > xUrlTransformer, const css::util::URL& rURL ); // XDispatch diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 3ac9ef15012a..1cfddd99ef45 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -115,11 +115,11 @@ class ToolBarManager final : public ToolbarManager_Base public: ToolBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& rResourceName, + OUString aResourceName, ToolBox* pToolBar ); ToolBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& rResourceName, + OUString aResourceName, weld::Toolbar* pToolBar, weld::Builder* pBuilder ); virtual ~ToolBarManager() override; diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index f236f943082b..8e6f0c7de470 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/awt/Size.hpp> #include <rtl/ustring.hxx> +#include <utility> #include <vcl/toolbox.hxx> namespace framework @@ -65,12 +66,12 @@ struct UIElement m_nStyle( ButtonType::SYMBOLONLY ) {} - UIElement( const OUString& rName, - const OUString& rType, - const css::uno::Reference< css::ui::XUIElement >& rUIElement - ) : m_aType( rType ), - m_aName( rName ), - m_xUIElement( rUIElement ), + UIElement( OUString aName, + OUString aType, + css::uno::Reference< css::ui::XUIElement > xUIElement + ) : m_aType(std::move( aType )), + m_aName(std::move( aName )), + m_xUIElement(std::move( xUIElement )), m_bFloating( false ), m_bVisible( true ), m_bUserActive( false ), diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index 8e2bbf4c4b1a..af0345b496e9 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -39,7 +39,7 @@ namespace framework { class ConfigurationAccess_FactoryManager final : public ::cppu::WeakImplHelper< css::container::XContainerListener> { public: - ConfigurationAccess_FactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const OUString& _sRoot ); + ConfigurationAccess_FactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext, OUString _sRoot ); virtual ~ConfigurationAccess_FactoryManager() override; void readConfigurationData(); diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 9cfed290f3ce..4e5ea6c4b052 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -30,6 +30,7 @@ #include <mutex> #include <string_view> #include <unordered_map> +#include <utility> // Namespace @@ -42,7 +43,7 @@ class ConfigurationAccess_ControllerFactory final : // interfaces public ::cppu::WeakImplHelper< css::container::XContainerListener> { public: - ConfigurationAccess_ControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& _sRoot ); + ConfigurationAccess_ControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& rxContext, OUString _sRoot ); virtual ~ConfigurationAccess_ControllerFactory() override; void readConfigurationData(); @@ -67,7 +68,7 @@ private: { OUString m_aImplementationName; OUString m_aValue; - ControllerInfo(const OUString& _aImplementationName,const OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){} + ControllerInfo(OUString _aImplementationName, OUString _aValue) : m_aImplementationName(std::move(_aImplementationName)),m_aValue(std::move(_aValue)){} ControllerInfo(){} }; class MenuControllerMap : public std::unordered_map< OUString, diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index 9019928182d7..a3ec76daa143 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -37,7 +37,7 @@ typedef ::cppu::WeakImplHelper< class MenuBarFactory : public MenuBarFactory_BASE { public: - MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); + MenuBarFactory( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~MenuBarFactory() override; virtual OUString SAL_CALL getImplementationName() override diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index ce28896b1118..ae5580675b24 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -55,7 +55,7 @@ class AcceleratorConfigurationWriter final used to write the configuration there. */ AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, - const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ); + css::uno::Reference< css::xml::sax::XDocumentHandler > xConfig ); /** @short does nothing real ... */ ~AcceleratorConfigurationWriter(); diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 971b3b935d36..3507314a9a6e 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -476,8 +476,8 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const * *******************************************************************************/ -XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext ) +XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext )) { m_xCfg.set( ::comphelper::ConfigurationHelper::openConfig( m_xContext, "org.openoffice.Office.Accelerators", ::comphelper::EConfigurationModes::AllLocales ), diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 40d8aeaebe3c..7bd487684555 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/util/thePathSettings.hpp> +#include <utility> #include <vcl/svapp.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> @@ -68,8 +69,8 @@ struct SharedStorages: public rtl::Static<TSharedStorages, SharedStorages> {}; } -PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext(xContext) +PresetHandler::PresetHandler(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext(std::move(xContext)) , m_eConfigType(E_GLOBAL) { } diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 9c8ea6415aeb..151322e1e601 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/frame/TaskCreator.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <utility> namespace framework{ @@ -36,8 +37,8 @@ namespace framework{ @param xContext points to the valid uno service manager *//*-*****************************************************************************************************/ -TaskCreator::TaskCreator( const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : m_xContext ( xContext ) +TaskCreator::TaskCreator( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move( xContext )) { } diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index d36a14c6461a..19fe9ffaa69d 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -36,6 +36,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <osl/diagnose.h> +#include <utility> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> @@ -55,10 +56,10 @@ constexpr OUStringLiteral URL_CLOSEDOC = u".uno:CloseDoc"; constexpr OUStringLiteral URL_CLOSEWIN = u".uno:CloseWin"; const char URL_CLOSEFRAME[] = ".uno:CloseFrame"; -CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext , +CloseDispatcher::CloseDispatcher(css::uno::Reference< css::uno::XComponentContext > xContext , const css::uno::Reference< css::frame::XFrame >& xFrame , std::u16string_view sTarget) - : m_xContext (rxContext ) + : m_xContext(std::move(xContext)) , m_aAsyncCallback( new vcl::EventPoster(LINK(this, CloseDispatcher, impl_asyncCallback))) , m_eOperation(E_CLOSE_DOC) diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 8c9cd6d7c0d9..a5a0bd6980e6 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -25,12 +25,13 @@ #include <comphelper/sequence.hxx> #include <unordered_map> +#include <utility> namespace framework{ -DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , +DispatchInformationProvider::DispatchInformationProvider(css::uno::Reference< css::uno::XComponentContext > xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) - : m_xContext (xContext ) + : m_xContext (std::move(xContext )) , m_xFrame (xFrame ) { } diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 1c214ddaa48f..8328e9c422b0 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/util/XCacheInfo.hpp> #include <rtl/ustring.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <sal/log.hxx> #include <framework/dispatchhelper.hxx> @@ -55,9 +56,9 @@ namespace framework{ @param xFrame reference to our owner frame. */ -DispatchProvider::DispatchProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const css::uno::Reference< css::frame::XFrame >& xFrame ) - : m_xContext ( rxContext ) +DispatchProvider::DispatchProvider( css::uno::Reference< css::uno::XComponentContext > xContext , + const css::uno::Reference< css::frame::XFrame >& xFrame ) + : m_xContext (std::move( xContext )) , m_xFrame ( xFrame ) { } diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index ecbace6337fd..57ab28ee4fa1 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/frame/XInterceptorInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <osl/diagnose.h> +#include <utility> #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> @@ -30,9 +31,9 @@ using namespace com::sun::star; namespace framework{ InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner, - const css::uno::Reference< css::frame::XDispatchProvider >& xSlave) + css::uno::Reference< css::frame::XDispatchProvider > xSlave) : m_xOwnerWeak (xOwner ) - , m_xSlave (xSlave ) + , m_xSlave (std::move(xSlave )) { } diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 92c15de422ab..04ea5cf5c0d0 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -22,15 +22,16 @@ #include <sal/log.hxx> #include <com/sun/star/frame/DispatchResultState.hpp> +#include <utility> namespace framework{ LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , - const OUString& sTargetName , + OUString sTargetName , sal_Int32 nSearchFlags) : m_xOwnerFrame (xOwnerFrame ) - , m_sTarget (sTargetName ) + , m_sTarget (std::move(sTargetName )) , m_nSearchFlags(nSearchFlags) , m_aLoader (xContext ) { diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 4c74d1ca7c6a..9149b9b40dc0 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <cppuhelper/supportsservice.hxx> +#include <utility> namespace framework{ @@ -54,8 +55,8 @@ css::uno::Sequence< OUString > SAL_CALL MailToDispatcher::getSupportedServiceNam @param rxContext reference to uno servicemanager for creation of new services */ -MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : m_xContext ( rxContext ) +MailToDispatcher::MailToDispatcher( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move( xContext )) { } diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 35d196ee046f..df956c7eed8a 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/task/XJobExecutor.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/long.hxx> +#include <utility> namespace framework{ @@ -55,8 +56,8 @@ css::uno::Sequence< OUString > SAL_CALL Oxt_Handler::getSupportedServiceNames() @onerror Show an assertion and do nothing else. @threadsafe yes *//*-*************************************************************************************************************/ -Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : m_xContext ( xContext ) +Oxt_Handler::Oxt_Handler( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move( xContext )) { } diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 0333c0698fe6..3220ceece227 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -28,6 +28,7 @@ #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> +#include <utility> #include <vcl/svapp.hxx> namespace framework{ @@ -44,8 +45,8 @@ using namespace ::cppu; using namespace ::osl; PopupMenuDispatcher::PopupMenuDispatcher( - const uno::Reference< XComponentContext >& xContext ) - : m_xContext ( xContext ) + uno::Reference< XComponentContext > xContext ) + : m_xContext (std::move( xContext )) , m_bAlreadyDisposed ( false ) , m_bActivateListener ( false ) { diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index bff05e79f1eb..14dea0603f49 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -26,6 +26,7 @@ #include <tools/diagnose_ex.h> #include <cppuhelper/supportsservice.hxx> +#include <utility> namespace framework{ @@ -56,8 +57,8 @@ css::uno::Sequence< OUString > SAL_CALL ServiceHandler::getSupportedServiceNames @param xFactory reference to uno servicemanager for creation of new services */ -ServiceHandler::ServiceHandler( const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : m_xContext ( xContext ) +ServiceHandler::ServiceHandler( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move( xContext )) { } diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index c6ec312070c0..39ac70ee1479 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/frame/StartModule.hpp> #include <unotools/moduleoptions.hxx> +#include <utility> namespace framework{ @@ -36,8 +37,8 @@ namespace framework{ #error "Who uses \"fpf\" as define. It will overwrite my namespace alias ..." #endif -StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext) - : m_xContext (rxContext ) +StartModuleDispatcher::StartModuleDispatcher(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext )) { } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 72f217e6ccfb..c7b3778427b8 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <cppuhelper/supportsservice.hxx> +#include <utility> namespace framework{ @@ -48,8 +49,8 @@ css::uno::Sequence< OUString > SAL_CALL SystemExec::getSupportedServiceNames() return { SERVICENAME_PROTOCOLHANDLER }; } -SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : m_xContext ( rxContext ) +SystemExec::SystemExec( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move( xContext )) { } diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index d82ace76f304..abad29dc7529 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> +#include <utility> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> @@ -32,9 +33,9 @@ namespace framework{ -WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , +WindowCommandDispatch::WindowCommandDispatch(css::uno::Reference< css::uno::XComponentContext > xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) - : m_xContext (xContext ) + : m_xContext (std::move(xContext )) , m_xFrame (xFrame ) , m_xWindow (xFrame->getContainerWindow()) { diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 868a2632f622..02fa9d2df0d0 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <framework/actiontriggerhelper.hxx> +#include <utility> #include <vcl/svapp.hxx> using namespace cppu; @@ -44,10 +45,10 @@ const css::uno::Sequence<sal_Int8>& RootActionTriggerContainer::getUnoTunnelId() return seqID; } -RootActionTriggerContainer::RootActionTriggerContainer(const css::uno::Reference<css::awt::XPopupMenu>& rMenu, +RootActionTriggerContainer::RootActionTriggerContainer(css::uno::Reference<css::awt::XPopupMenu> xMenu, const OUString* pMenuIdentifier) : m_bContainerCreated(false) - , m_xMenu(rMenu) + , m_xMenu(std::move(xMenu)) , m_pMenuIdentifier(pMenuIdentifier) { } diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 73be5153c37c..d0cf88e6f6f8 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -21,6 +21,7 @@ #include <framework/interaction.hxx> #include <com/sun/star/document/XInteractionFilterSelect.hpp> #include <com/sun/star/document/NoSuchFilterRequest.hpp> +#include <utility> using namespace ::com::sun::star; @@ -191,9 +192,9 @@ class InteractionRequest_Impl : public ::cppu::WeakImplHelper< css::task::XInter uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_lContinuations; public: - InteractionRequest_Impl( const css::uno::Any& aRequest, + InteractionRequest_Impl( css::uno::Any aRequest, const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations ) - : m_aRequest(aRequest), m_lContinuations(lContinuations) + : m_aRequest(std::move(aRequest)), m_lContinuations(lContinuations) { } diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 68b2f547bdd9..aa4e8f0b2010 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -36,6 +36,7 @@ #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> #include <tools/urlobj.hxx> +#include <utility> #include <vcl/svapp.hxx> @@ -45,11 +46,11 @@ using namespace css::frame; namespace framework{ -TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext, +TitleHelper::TitleHelper(css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::uno::XInterface >& xOwner, const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers) : ::cppu::BaseMutex () - , m_xContext (rxContext) + , m_xContext (std::move(xContext)) , m_bExternalTitle (false) , m_nLeasedNumber (css::frame::UntitledNumbersConst::INVALID_NUMBER) , m_aListener (m_aMutex) diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 4b33fdc9f0d6..779fe02e644e 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -41,6 +41,7 @@ #include <mutex> #include <stack> #include <queue> +#include <utility> namespace framework { @@ -145,8 +146,8 @@ namespace framework class UndoManagerRequest : public ::comphelper::AnyEvent { public: - explicit UndoManagerRequest( ::std::function<void ()> const& i_request ) - :m_request( i_request ) + explicit UndoManagerRequest( ::std::function<void ()> i_request ) + :m_request(std::move( i_request )) { m_finishCondition.reset(); } diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index fe6940d42348..d2131c8a8deb 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -20,6 +20,7 @@ #include <menuconfiguration.hxx> #include <addonmenu.hxx> +#include <utility> #include <xml/menudocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -41,9 +42,8 @@ using namespace ::com::sun::star::io; namespace framework { -MenuConfiguration::MenuConfiguration( - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) -: m_xContext( rxContext ) +MenuConfiguration::MenuConfiguration( css::uno::Reference< css::uno::XComponentContext > xContext ) +: m_xContext(std::move( xContext )) { } diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 27f2c3dd9572..fde891293aef 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XChangesBatch.hpp> +#include <utility> #include <tools/diagnose_ex.h> @@ -39,10 +40,10 @@ namespace framework{ @param eMode force opening of the configuration access in readonly or in read/write mode */ -ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& rxContext, - /*IN*/ const OUString& sRoot ) - : m_xContext ( rxContext) - , m_sRoot ( sRoot ) +ConfigAccess::ConfigAccess( /*IN*/ css::uno::Reference< css::uno::XComponentContext > xContext, + /*IN*/ OUString sRoot ) + : m_xContext (std::move( xContext)) + , m_sRoot (std::move( sRoot )) , m_eMode ( E_CLOSED ) { } diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index c9a779a320a4..2f7c9971935b 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -25,6 +25,7 @@ #include <comphelper/lok.hxx> #include <comphelper/configurationhelper.hxx> +#include <utility> #include <vcl/window.hxx> #include <vcl/syswin.hxx> @@ -34,8 +35,8 @@ namespace framework{ -PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext ) +PersistentWindowState::PersistentWindowState(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext )) , m_bWindowStateAlreadySet(false ) { } diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 9d51bab8434e..e9e54df6b65b 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -44,8 +44,8 @@ sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; ///< static counter for constexpr OUStringLiteral PROGRESS_RESOURCE = u"private:resource/progressbar/progressbar"; -StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext ) +StatusIndicatorFactory::StatusIndicatorFactory(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext )) , m_bAllowReschedule (false) , m_bAllowParentShow (false) , m_bDisableReschedule(false) diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index d74439758def..a9f27bd4a6a5 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -30,6 +30,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> +#include <utility> #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> @@ -41,8 +42,8 @@ namespace framework{ const ::sal_Int32 INVALID_ICON_ID = -1; const ::sal_Int32 DEFAULT_ICON_ID = 0; -TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext ) +TitleBarUpdate::TitleBarUpdate(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext )) { } diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index b6729ffc7d08..b493eacc7236 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -20,12 +20,13 @@ #include <helper/vclstatusindicator.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <utility> #include <vcl/svapp.hxx> namespace framework { -VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) - : m_xParentWindow (xParentWindow ) +VCLStatusIndicator::VCLStatusIndicator(css::uno::Reference< css::awt::XWindow > xParentWindow) + : m_xParentWindow (std::move(xParentWindow )) , m_pStatusBar (nullptr ) , m_nRange (0 ) , m_nValue (0 ) diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index c7bdd14e9425..725148ebbc73 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -220,7 +220,7 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper< public: - XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext ); + XCUBasedAcceleratorConfiguration( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~XCUBasedAcceleratorConfiguration( ) override; // uno interface! diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index cca79237a0d5..b0fee38b4347 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -122,7 +122,7 @@ class PresetHandler points to a uno service manager, which is used internally to create own needed uno resources. */ - PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext); + PresetHandler(css::uno::Reference< css::uno::XComponentContext > xContext); /** @short copy ctor */ PresetHandler(const PresetHandler& rCopy); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index ef7b9860f5e5..195a46af82dc 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -79,7 +79,7 @@ class LoadDispatcher final : public ::cppu::WeakImplHelper< css::frame::XNotify */ LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , - const OUString& sTargetName , + OUString sTargetName , sal_Int32 nSearchFlags); /** @short used to free internal resources. diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 0e592eb40a21..4a8a22d81c0b 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -74,8 +74,8 @@ class WindowCommandDispatch final @param xFrame used as for new detected commands. */ - WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , - const css::uno::Reference< css::frame::XFrame >& xFrame); + WindowCommandDispatch(css::uno::Reference< css::uno::XComponentContext > xContext , + const css::uno::Reference< css::frame::XFrame >& xFrame); /** @short used to free internal resources. */ diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index bd1b03a60aa0..351d39b94b4e 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -200,7 +200,7 @@ public: @throw A RuntimeException in case any internal process indicates, that the whole runtime can't be used any longer. */ - LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext); + LoadEnv(css::uno::Reference< css::uno::XComponentContext > xContext); /** @short deinitialize an instance of this class in the right way. */ diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index 3bb94ac1c57b..62a17d2ac828 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -20,6 +20,7 @@ #pragma once #include <com/sun/star/uno/Any.hxx> +#include <utility> namespace framework{ @@ -75,9 +76,9 @@ class LoadEnvException css::uno::Any m_exOriginal; LoadEnvException( - sal_Int32 id, OUString const & message = OUString(), - css::uno::Any const & original = css::uno::Any()): - m_nID(id), m_sMessage(message), m_exOriginal(original) + sal_Int32 id, OUString message = OUString(), + css::uno::Any original = css::uno::Any()): + m_nID(id), m_sMessage(std::move(message)), m_exOriginal(std::move(original)) {} }; diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index de7f787223c0..2795a3f45057 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -27,6 +27,7 @@ // include others #include <comphelper/sequenceashashmap.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/help.hxx> @@ -56,8 +57,8 @@ css::uno::Sequence< OUString > SAL_CALL HelpOnStartup::getSupportedServiceNames( return { SERVICENAME_JOB }; } -HelpOnStartup::HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext) +HelpOnStartup::HelpOnStartup(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext)) { // create some needed uno services and cache it m_xModuleManager = css::frame::ModuleManager::create( m_xContext ); diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index d2d9403e4ab2..726c037cf37e 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -32,6 +32,7 @@ #include <comphelper/sequence.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> +#include <utility> #include <vcl/svapp.hxx> namespace framework{ @@ -50,10 +51,10 @@ namespace framework{ (May be null!) */ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext , - /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame ) + /*IN*/ css::uno::Reference< css::frame::XFrame > xFrame ) : m_aJobCfg (xContext ) , m_xContext (xContext ) - , m_xFrame (xFrame ) + , m_xFrame (std::move(xFrame )) , m_bListenOnDesktop (false ) , m_bListenOnFrame (false ) , m_bListenOnModel (false ) @@ -77,10 +78,10 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont (May be null!) */ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext , - /*IN*/ const css::uno::Reference< css::frame::XModel >& xModel ) + /*IN*/ css::uno::Reference< css::frame::XModel > xModel ) : m_aJobCfg (xContext ) , m_xContext (xContext ) - , m_xModel (xModel ) + , m_xModel (std::move(xModel )) , m_bListenOnDesktop (false ) , m_bListenOnFrame (false ) , m_bListenOnModel (false ) diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index aad2bfcd4118..863bc8c4b4ca 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -32,6 +32,7 @@ #include <tools/wldcrd.hxx> #include <unotools/configpaths.hxx> +#include <utility> #include <vcl/svapp.hxx> namespace framework{ @@ -45,8 +46,8 @@ namespace framework{ @param rxContext reference to the uno service manager */ -JobData::JobData( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : m_xContext (rxContext ) +JobData::JobData( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move(xContext )) { // share code for member initialization with defaults! impl_reset(); diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index e32f65123375..d1e227b9a55a 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -36,6 +36,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> +#include <utility> #include <vcl/svapp.hxx> using namespace framework; @@ -73,7 +74,7 @@ private: public: - explicit JobDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit JobDispatch(css::uno::Reference< css::uno::XComponentContext > xContext); virtual ~JobDispatch() override; void impl_dispatchEvent ( const OUString& sEvent , @@ -132,8 +133,8 @@ public: @param xContext reference to the uno service manager */ -JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : m_xContext (xContext ) +JobDispatch::JobDispatch( /*IN*/ css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext (std::move(xContext )) { } diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 8b8036cf6ea2..0c895db33f71 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> #include <cppuhelper/supportsservice.hxx> +#include <utility> namespace framework{ @@ -55,8 +56,8 @@ css::uno::Sequence< OUString > SAL_CALL ShellJob::getSupportedServiceNames() } -ShellJob::ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext) +ShellJob::ShellJob(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext)) { } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 20cee3f38394..34b2b0899eaf 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -39,6 +39,7 @@ #include <unotools/cmdoptions.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> +#include <utility> #include <vcl/i18nhelp.hxx> #include <vcl/dockingarea.hxx> #include <vcl/settings.hxx> @@ -53,11 +54,11 @@ namespace framework { ToolbarLayoutManager::ToolbarLayoutManager( - const uno::Reference< uno::XComponentContext >& rxContext, - const uno::Reference< ui::XUIElementFactory >& xUIElementFactory, + uno::Reference< uno::XComponentContext > xContext, + uno::Reference< ui::XUIElementFactory > xUIElementFactory, LayoutManager* pParentLayouter ): - m_xContext( rxContext), - m_xUIElementFactoryManager( xUIElementFactory ), + m_xContext(std::move( xContext)), + m_xUIElementFactoryManager(std::move( xUIElementFactory )), m_pParentLayouter( pParentLayouter ), m_aDockingArea(0, 0, 0, 0), m_aDockingAreaOffsets(0, 0, 0, 0), diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index b826b1e8cd34..3e7b631c653d 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -56,8 +56,8 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW PREVIEWFRAME_YES }; - ToolbarLayoutManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::ui::XUIElementFactory >& xUIElementFactory, + ToolbarLayoutManager( css::uno::Reference< css::uno::XComponentContext > xContext, + css::uno::Reference< css::ui::XUIElementFactory > xUIElementFactory, LayoutManager* pParentLayouter ); virtual ~ToolbarLayoutManager() override; diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 005b1a68f932..76116ad98ed7 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -73,6 +73,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable.hpp> +#include <utility> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/syswin.hxx> @@ -130,8 +131,8 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis } -LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext(xContext) +LoadEnv::LoadEnv(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext(std::move(xContext)) , m_nSearchFlags(0) , m_eFeature(LoadEnvFeatures::NONE) , m_eContentType(E_UNSUPPORTED_CONTENT) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index d4b68b11c994..073f7094c577 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -80,6 +80,7 @@ #include <comphelper/multiinterfacecontainer3.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> +#include <utility> #include <vcl/evntpost.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -451,7 +452,7 @@ private: public: - explicit AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit AutoRecovery(css::uno::Reference< css::uno::XComponentContext > xContext); virtual ~AutoRecovery( ) override; virtual OUString SAL_CALL getImplementationName() override @@ -1210,10 +1211,10 @@ void DispatchParams::forget() m_xHoldRefForAsyncOpAlive.clear(); }; -AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext) +AutoRecovery::AutoRecovery(css::uno::Reference< css::uno::XComponentContext > xContext) : AutoRecovery_BASE (m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) - , m_xContext (xContext ) + , m_xContext (std::move(xContext )) , m_bListenForDocEvents (false ) , m_bListenForConfigChanges (false ) , m_nAutoSaveTimeIntervall (0 ) diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 7b9b30214b45..cbc3ce6ebacb 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -51,6 +51,7 @@ #include <comphelper/sequence.hxx> #include <comphelper/lok.hxx> #include <cppuhelper/supportsservice.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <desktop/crashreport.hxx> #include <vcl/scheduler.hxx> @@ -139,14 +140,14 @@ void Desktop::constructorInit() The value must be different from NULL! @onerror We throw an ASSERT in debug version or do nothing in release version. *//*-*************************************************************************************************************/ -Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext ) +Desktop::Desktop( css::uno::Reference< css::uno::XComponentContext > xContext ) : Desktop_BASE ( m_aMutex ) , cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper ) // Init member , m_bIsTerminated(false) , m_bIsShutdown(false) // see dispose() for further information! , m_bSession ( false ) - , m_xContext ( xContext ) + , m_xContext (std::move( xContext )) , m_aListenerContainer ( m_aMutex ) , m_eLoadState ( E_NOTSET ) , m_bSuspendQuickstartVeto( false ) @@ -341,9 +342,9 @@ namespace Desktop* const m_pDesktop; css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher; public: - QuickstartSuppressor(Desktop* const pDesktop, css::uno::Reference< css::frame::XTerminateListener > const & xQuickLauncher) + QuickstartSuppressor(Desktop* const pDesktop, css::uno::Reference< css::frame::XTerminateListener > xQuickLauncher) : m_pDesktop(pDesktop) - , m_xQuickLauncher(xQuickLauncher) + , m_xQuickLauncher(std::move(xQuickLauncher)) { SAL_INFO("fwk.desktop", "temporary removing Quickstarter"); if(m_xQuickLauncher.is()) diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 9c1e23f00041..8f3d77d322ba 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -25,6 +25,7 @@ #include <comphelper/profilezone.hxx> #include <unotools/mediadescriptor.hxx> +#include <utility> #include <vcl/threadex.hxx> #include <cppuhelper/supportsservice.hxx> @@ -51,8 +52,8 @@ css::uno::Sequence<OUString> SAL_CALL DispatchHelper::getSupportedServiceNames() @param xSMGR the global uno service manager, which can be used to create own needed services. */ -DispatchHelper::DispatchHelper(const css::uno::Reference<css::uno::XComponentContext>& xContext) - : m_xContext(xContext) +DispatchHelper::DispatchHelper(css::uno::Reference<css::uno::XComponentContext> xContext) + : m_xContext(std::move(xContext)) , m_aBlockFlag(false) { } diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index e5a862b2db43..d722b5e0b98d 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -113,7 +113,7 @@ class XFrameImpl: { public: - explicit XFrameImpl(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit XFrameImpl(css::uno::Reference< css::uno::XComponentContext > xContext); /// Initialization function after having acquire()'d. void initListeners(); @@ -452,10 +452,10 @@ private: The value must be different from NULL! @onerror ASSERT in debug version or nothing in release version. *//*-*****************************************************************************************************/ -XFrameImpl::XFrameImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext ) +XFrameImpl::XFrameImpl( css::uno::Reference< css::uno::XComponentContext > xContext ) : PartialWeakComponentImplHelper(m_aMutex) // init member - , m_xContext ( xContext ) + , m_xContext (std::move( xContext )) , m_aListenerContainer ( m_aMutex ) , m_eActiveState ( E_INACTIVE ) , m_bIsFrameTop ( true ) // I think we are top without a parent ... and there is no parent yet! diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 3e3f9d46949a..475084c4cd5c 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -36,6 +36,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> +#include <utility> namespace { @@ -60,7 +61,7 @@ private: public: - explicit ModuleManager(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit ModuleManager(css::uno::Reference< css::uno::XComponentContext > xContext); ModuleManager(const ModuleManager&) = delete; ModuleManager& operator=(const ModuleManager&) = delete; @@ -123,8 +124,8 @@ private: OUString implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent); }; -ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext(xContext) +ModuleManager::ModuleManager(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext(std::move(xContext)) { m_xCFG.set( comphelper::ConfigurationHelper::openConfig( m_xContext, "/org.openoffice.Setup/Office/Factories", diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index aedaf3a31d67..9457ad862787 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -166,7 +166,7 @@ public: Attention: It's necessary for right function of this class, that the order of base classes is the right one. Because we transfer information from one base to another during this ctor runs! */ - explicit PathSettings(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit PathSettings(css::uno::Reference< css::uno::XComponentContext > xContext); /** free all used resources ... if it was not already done. */ virtual ~PathSettings() override; @@ -428,10 +428,10 @@ private: css::uno::Reference< css::container::XNameAccess > fa_getCfgNew(); }; -PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentContext >& xContext ) +PathSettings::PathSettings( css::uno::Reference< css::uno::XComponentContext > xContext ) : PathSettings_BASE(m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) - , m_xContext (xContext) + , m_xContext (std::move(xContext)) { } diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 1cc16e57e75a..7ba5c82dee12 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <utility> using namespace css; using namespace com::sun::star::uno; @@ -101,7 +102,7 @@ private: void QuitSessionQuietly(); public: - explicit SessionListener(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit SessionListener(css::uno::Reference< css::uno::XComponentContext > xContext); virtual ~SessionListener() override; @@ -138,8 +139,8 @@ public: virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event) override; }; -SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : m_xContext( rxContext ) +SessionListener::SessionListener(css::uno::Reference< css::uno::XComponentContext > rxContext ) + : m_xContext(std::move( rxContext )) , m_bRestored( false ) , m_bSessionStoreRequested( false ) , m_bAllowUserInteractionOnQuit( false ) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index c484e115d7c6..12e7c2c34846 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -39,6 +39,7 @@ #include <cppuhelper/supportsservice.hxx> #include <svtools/colorcfg.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -61,7 +62,7 @@ private: public: - explicit TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit TaskCreatorService(css::uno::Reference< css::uno::XComponentContext > xContext); virtual OUString SAL_CALL getImplementationName() override { @@ -103,8 +104,8 @@ private: OUString impl_filterNames( const OUString& sName ); }; -TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext (xContext ) +TaskCreatorService::TaskCreatorService(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext (std::move(xContext )) { } diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index b0b6f859c02c..0883cc8af197 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -29,6 +29,7 @@ #include <comphelper/propertysequence.hxx> #include <cppuhelper/implbase.hxx> #include <mutex> +#include <utility> // Defines @@ -48,7 +49,7 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper< css::lang::XEventListener> { public: - explicit GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit GlobalSettings_Access( css::uno::Reference< css::uno::XComponentContext > xContext ); // XComponent virtual void SAL_CALL dispose() override; @@ -78,14 +79,14 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper< } -GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : +GlobalSettings_Access::GlobalSettings_Access( css::uno::Reference< css::uno::XComponentContext > xContext ) : m_bDisposed( false ), m_bConfigRead( false ), m_aNodeRefStates( "States" ), m_aPropStatesEnabled( "StatesEnabled" ), m_aPropLocked( "Locked" ), m_aPropDocked( "Docked" ), - m_xContext( rxContext ) + m_xContext(std::move( xContext )) { } @@ -226,8 +227,8 @@ static GlobalSettings_Access* GetGlobalSettings( const css::uno::Reference< css: return pStaticSettings.get(); } -GlobalSettings::GlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : - m_xContext( rxContext ) +GlobalSettings::GlobalSettings( css::uno::Reference< css::uno::XComponentContext > xContext ) : + m_xContext(std::move( xContext )) { } diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index c60e7d3c1dd2..5211e79b96dc 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -18,6 +18,7 @@ */ #include "imagemanagerimpl.hxx" +#include <utility> #include <xml/imagesconfiguration.hxx> #include <uiconfiguration/imagetype.hxx> #include <uiconfiguration/graphicnameaccess.hxx> @@ -100,10 +101,10 @@ static GlobalImageList* getGlobalImageList( const uno::Reference< uno::XComponen return pGlobalImageList; } -CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) : +CmdImageList::CmdImageList( uno::Reference< uno::XComponentContext > rxContext, OUString aModuleIdentifier ) : m_bInitialized(false), - m_aModuleIdentifier( aModuleIdentifier ), - m_xContext( rxContext ) + m_aModuleIdentifier(std::move( aModuleIdentifier )), + m_xContext(std::move( rxContext )) { } @@ -473,8 +474,8 @@ CmdImageList* ImageManagerImpl::implts_getDefaultImageList() return m_pDefaultImageList.get(); } -ImageManagerImpl::ImageManagerImpl( const uno::Reference< uno::XComponentContext >& rxContext,::cppu::OWeakObject* pOwner,bool _bUseGlobal ) : - m_xContext( rxContext ) +ImageManagerImpl::ImageManagerImpl( uno::Reference< uno::XComponentContext > xContext, ::cppu::OWeakObject* pOwner, bool _bUseGlobal ) : + m_xContext(std::move( xContext )) , m_pOwner(pOwner) , m_aResourceString( "private:resource/images/moduleimages" ) , m_bUseGlobal(_bUseGlobal) diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 88f4a8349398..f36c9fff74c7 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -44,7 +44,7 @@ namespace framework class CmdImageList { public: - CmdImageList(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier); + CmdImageList(css::uno::Reference< css::uno::XComponentContext > xContext, OUString aModuleIdentifier); virtual ~CmdImageList(); virtual Image getImageFromCommandURL(vcl::ImageType nImageType, const OUString& rCommandURL); @@ -76,7 +76,7 @@ namespace framework class ImageManagerImpl { public: - ImageManagerImpl(const css::uno::Reference< css::uno::XComponentContext >& rxContext + ImageManagerImpl(css::uno::Reference< css::uno::XComponentContext > xContext ,::cppu::OWeakObject *pOwner ,bool _bUseGlobal); ~ImageManagerImpl(); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 8e1e4dbb2660..93058358d04a 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -52,6 +52,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <sal/log.hxx> #include <comphelper/interfacecontainer4.hxx> @@ -155,8 +156,8 @@ private: struct UIElementInfo { - UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) : - aResourceURL( rResourceURL), aUIName( rUIName ) {} + UIElementInfo( OUString _aResourceURL, OUString _aUIName ) : + aResourceURL(std::move( _aResourceURL)), aUIName(std::move( _aUIName )) {} OUString aResourceURL; OUString aUIName; }; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 3e7cbd74b44f..42f6269bf3ce 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -51,6 +51,7 @@ #include <comphelper/interfacecontainer4.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <sal/log.hxx> #include <o3tl/string_view.hxx> @@ -90,7 +91,7 @@ public: return {"com.sun.star.ui.UIConfigurationManager"}; } - explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); + explicit UIConfigurationManager( css::uno::Reference< css::uno::XComponentContext > xContext ); // XComponent virtual void SAL_CALL dispose() override; @@ -136,8 +137,8 @@ private: struct UIElementInfo { - UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) : - aResourceURL( rResourceURL), aUIName( rUIName ) {} + UIElementInfo( OUString _aResourceURL, OUString _aUIName ) : + aResourceURL(std::move( _aResourceURL)), aUIName(std::move( _aUIName )) {} OUString aResourceURL; OUString aUIName; }; @@ -670,12 +671,12 @@ void UIConfigurationManager::impl_Initialize() } } -UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : +UIConfigurationManager::UIConfigurationManager( css::uno::Reference< css::uno::XComponentContext > xContext ) : m_bReadOnly( true ) , m_bModified( false ) , m_bDisposed( false ) , m_aPropUIName( "UIName" ) - , m_xContext( rxContext ) + , m_xContext(std::move( xContext )) { // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 2c869acd8cab..4972b6da7667 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -28,6 +28,7 @@ #include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> @@ -43,13 +44,13 @@ namespace framework { ButtonToolbarController::ButtonToolbarController( - const uno::Reference< uno::XComponentContext >& rxContext, + uno::Reference< uno::XComponentContext > xContext, ToolBox* pToolBar, - const OUString& aCommand ) : + OUString aCommand ) : m_bInitialized( false ), m_bDisposed( false ), - m_aCommandURL( aCommand ), - m_xContext( rxContext ), + m_aCommandURL(std::move( aCommand )), + m_xContext(std::move( xContext )), m_pToolbar( pToolBar ) { } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 690b54240436..c7efdb92053d 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -48,6 +48,7 @@ #include <uno/current_context.hxx> #include <unotools/cmdoptions.hxx> #include <toolkit/awt/vclxmenu.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> #include <vcl/menu.hxx> @@ -526,9 +527,8 @@ class QuietInteractionContext: { public: explicit QuietInteractionContext( - css::uno::Reference< css::uno::XCurrentContext > - const & context): - context_(context) {} + css::uno::Reference< css::uno::XCurrentContext > context): + context_(std::move(context)) {} QuietInteractionContext(const QuietInteractionContext&) = delete; QuietInteractionContext& operator=(const QuietInteractionContext&) = delete; diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 928e45f1e285..3bbd71ed785e 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -29,6 +29,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <toolkit/awt/vclxmenu.hxx> +#include <utility> #include <vcl/svapp.hxx> using namespace com::sun::star; @@ -107,11 +108,11 @@ css::uno::Sequence< css::uno::Type > SAL_CALL MenuBarWrapper::getTypes() } MenuBarWrapper::MenuBarWrapper( - const css::uno::Reference< css::uno::XComponentContext >& rxContext + css::uno::Reference< css::uno::XComponentContext > xContext ) : UIConfigElementWrapperBase( UIElementType::MENUBAR ), m_bRefreshPopupControllerCache( true ), - m_xContext( rxContext ) + m_xContext(std::move( xContext )) { } diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 0d49dc5dd7ee..6cf02e5e4f80 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -29,6 +29,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> +#include <utility> #include <vcl/commandinfoprovider.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> @@ -70,7 +71,7 @@ public: protected: PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const OUString &rPopupCommand = OUString() ); + OUString aPopupCommand = OUString() ); virtual void functionExecuted( const OUString &rCommand ); virtual ToolBoxItemBits getDropDownStyle() const; void createPopupMenuController(); @@ -87,11 +88,11 @@ private: PopupMenuToolbarController::PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const OUString &rPopupCommand ) + OUString aPopupCommand ) : ToolBarBase( xContext, css::uno::Reference< css::frame::XFrame >(), /*aCommandURL*/OUString() ) , m_bHasController( false ) , m_bResourceURL( false ) - , m_aPopupCommand( rPopupCommand ) + , m_aPopupCommand(std::move( aPopupCommand )) { } diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 27985791ae86..baf321fd61c8 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -18,6 +18,7 @@ */ #include <uielement/statusbaritem.hxx> +#include <utility> #include <vcl/status.hxx> #include <vcl/svapp.hxx> @@ -61,11 +62,11 @@ sal_uInt16 impl_convertItemBitsToItemStyle( StatusBarItemBits nItemBits ) StatusbarItem::StatusbarItem( StatusBar *pStatusBar, sal_uInt16 nId, - const OUString& aCommand ) + OUString aCommand ) : m_pStatusBar( pStatusBar ) , m_nId( nId ) , m_nStyle( 0 ) - , m_aCommand( aCommand ) + , m_aCommand(std::move( aCommand )) { if ( m_pStatusBar ) m_nStyle = impl_convertItemBitsToItemStyle( diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index b54f57ff098f..dbc305c696fa 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -39,6 +39,7 @@ #include <svtools/statusbarcontroller.hxx> #include <tools/debug.hxx> +#include <utility> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/status.hxx> @@ -120,15 +121,15 @@ StatusBarItemBits impl_convertItemStyleToItemBits( sal_Int16 nStyle ) } StatusBarManager::StatusBarManager( - const uno::Reference< uno::XComponentContext >& rxContext, - const uno::Reference< frame::XFrame >& rFrame, + uno::Reference< uno::XComponentContext > xContext, + uno::Reference< frame::XFrame > rFrame, StatusBar* pStatusBar ) : m_bDisposed( false ), m_bFrameActionRegistered( false ), m_bUpdateControllers( false ), m_pStatusBar( pStatusBar ), - m_xFrame( rFrame ), - m_xContext( rxContext ) + m_xFrame(std::move( rFrame )), + m_xContext(std::move( xContext )) { m_xStatusbarControllerFactory = frame::theStatusbarControllerFactory::get( diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 957fd4401480..7627b2f0a110 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -26,6 +26,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/solar.h> +#include <utility> #include <vcl/svapp.hxx> using namespace com::sun::star::uno; @@ -40,10 +41,10 @@ namespace framework { StatusBarWrapper::StatusBarWrapper( - const css::uno::Reference< css::uno::XComponentContext >& rxContext + css::uno::Reference< css::uno::XComponentContext > xContext ) : UIConfigElementWrapperBase( UIElementType::STATUSBAR ), - m_xContext( rxContext ) + m_xContext(std::move( xContext )) { } diff --git a/framework/source/uielement/styletoolbarcontroller.cxx b/framework/source/uielement/styletoolbarcontroller.cxx index f9f2b7b3108b..31aed5336f10 100644 --- a/framework/source/uielement/styletoolbarcontroller.cxx +++ b/framework/source/uielement/styletoolbarcontroller.cxx @@ -10,6 +10,7 @@ #include <uielement/styletoolbarcontroller.hxx> #include <tools/urlobj.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <sal/log.hxx> @@ -80,10 +81,10 @@ OUString GetDisplayFromInternalName( const css::uno::Reference< css::frame::XFra namespace framework { StyleDispatcher::StyleDispatcher( const css::uno::Reference< css::frame::XFrame >& rFrame, - const css::uno::Reference< css::util::XURLTransformer >& rUrlTransformer, + css::uno::Reference< css::util::XURLTransformer > xUrlTransformer, const css::util::URL& rURL ) : m_aCommand( rURL.Complete ) - , m_xUrlTransformer( rUrlTransformer ) + , m_xUrlTransformer(std::move( xUrlTransformer )) , m_xFrame( rFrame, css::uno::UNO_QUERY ) { SAL_WARN_IF( !m_aCommand.startsWith( ".uno:StyleApply?" ), "fwk.uielement", "Wrong dispatcher!" ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f12cbc62fd26..4d56884ffbb2 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -62,6 +62,7 @@ #include <comphelper/sequence.hxx> #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> +#include <utility> #include <vcl/event.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> @@ -138,7 +139,7 @@ class VclToolBarManager : public ToolBarManagerImpl public: VclToolBarManager(VclPtr<ToolBox> pToolbar) - : m_pToolBar(pToolbar) + : m_pToolBar(std::move(pToolbar)) , m_bAddedToTaskPaneList(true) , m_pManager(nullptr) {} @@ -565,7 +566,7 @@ IMPL_LINK(WeldToolBarManager, ToggleMenuHdl, const OString&, rCommand, void) ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, - const OUString& rResourceName, + OUString aResourceName, ToolBox* pToolBar ) : m_bDisposed( false ), m_bFrameActionRegistered( false ), @@ -573,7 +574,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, m_eSymbolSize(SvtMiscOptions().GetCurrentSymbolsSize()), m_pImpl( new VclToolBarManager( pToolBar ) ), m_pToolBar( pToolBar ), - m_aResourceName( rResourceName ), + m_aResourceName(std::move( aResourceName )), m_xFrame( rFrame ), m_xContext( rxContext ), m_aAsyncUpdateControllersTimer( "framework::ToolBarManager m_aAsyncUpdateControllersTimer" ), @@ -584,7 +585,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, - const OUString& rResourceName, + OUString aResourceName, weld::Toolbar* pToolBar, weld::Builder* pBuilder ) : m_bDisposed( false ), @@ -593,7 +594,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, m_eSymbolSize( SvtMiscOptions().GetCurrentSymbolsSize() ), m_pImpl( new WeldToolBarManager( pToolBar, pBuilder ) ), m_pToolBar( nullptr ), - m_aResourceName( rResourceName ), + m_aResourceName(std::move( aResourceName )), m_xFrame( rFrame ), m_xContext( rxContext ), m_aAsyncUpdateControllersTimer( "framework::ToolBarManager m_aAsyncUpdateControllersTimer" ), diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index a5fe31a7557b..047a6b6edb68 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/container/XContainer.hpp> #include <comphelper/propertysequence.hxx> +#include <utility> // Defines @@ -53,12 +54,12 @@ static OUString getHashKeyFromStrings( // XInterface, XTypeProvider -ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const OUString& _sRoot ) : +ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, OUString _sRoot ) : m_aPropCommand( "Command" ), m_aPropModule( "Module" ), m_aPropController( "Controller" ), m_aPropValue( "Value" ), - m_sRoot(_sRoot), + m_sRoot(std::move(_sRoot)), m_bConfigAccessInitialized( false ) { m_xConfigProvider = configuration::theDefaultProvider::get( rxContext ); diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 95c62a71afc5..febc33066852 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <utility> #include <vcl/svapp.hxx> using namespace com::sun::star::uno; @@ -41,8 +42,8 @@ using namespace ::com::sun::star::ui; namespace framework { -MenuBarFactory::MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : m_xContext( xContext ) +MenuBarFactory::MenuBarFactory( css::uno::Reference< css::uno::XComponentContext > xContext ) + : m_xContext(std::move( xContext )) { } diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index f1cdea2e98ea..b8a8ea46ed9b 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -44,6 +44,7 @@ #include <comphelper/propertyvalue.hxx> #include <comphelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> +#include <utility> using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,12 +64,12 @@ static OUString getHashKeyFromStrings( std::u16string_view aType, std::u16string return OUString::Concat(aType) + "^" + aName + "^" + aModuleName; } -ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, const OUString& _sRoot ) : +ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, OUString _sRoot ) : m_aPropType( "Type" ), m_aPropName( "Name" ), m_aPropModule( "Module" ), m_aPropFactory( "FactoryImplementation" ), - m_sRoot(_sRoot), + m_sRoot(std::move(_sRoot)), m_bConfigAccessInitialized( false ) { m_xConfigProvider = theDefaultProvider::get( rxContext ); diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index ed8b61527675..da52775ccfea 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -34,6 +34,7 @@ #include <comphelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> +#include <utility> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; @@ -48,7 +49,7 @@ typedef comphelper::WeakComponentImplHelper< class WindowContentFactoryManager : public WindowContentFactoryManager_BASE { public: - explicit WindowContentFactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext ); + explicit WindowContentFactoryManager( css::uno::Reference< css::uno::XComponentContext> xContext ); virtual OUString SAL_CALL getImplementationName() override { @@ -77,8 +78,8 @@ private: rtl::Reference<ConfigurationAccess_FactoryManager> m_pConfigAccess; }; -WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< uno::XComponentContext >& rxContext ) : - m_xContext( rxContext ), +WindowContentFactoryManager::WindowContentFactoryManager( uno::Reference< uno::XComponentContext > xContext ) : + m_xContext(std::move( xContext )), m_bConfigRead( false ), m_pConfigAccess( new ConfigurationAccess_FactoryManager( diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 19d09ce97993..04e50f5ae6a7 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <accelerators/keymapping.hxx> +#include <utility> #include <xml/acceleratorconfigurationwriter.hxx> #include <acceleratorconst.h> @@ -33,8 +34,8 @@ namespace framework{ AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, - const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) - : m_xConfig (xConfig ) + css::uno::Reference< css::xml::sax::XDocumentHandler > xConfig ) + : m_xConfig (std::move(xConfig )) , m_rContainer (rContainer ) { } diff --git a/include/framework/desktop.hxx b/include/framework/desktop.hxx index bd094ee90298..3d525eb54938 100644 --- a/include/framework/desktop.hxx +++ b/include/framework/desktop.hxx @@ -110,7 +110,7 @@ class FWK_DLLPUBLIC Desktop final : private cppu::BaseMutex, public: // constructor / destructor - Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext ); + Desktop( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~Desktop( ) override; void constructorInit(); diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx index 7c89a2d79aac..399d3f0ecb02 100644 --- a/include/framework/dispatchhelper.hxx +++ b/include/framework/dispatchhelper.hxx @@ -77,7 +77,7 @@ class UNLESS_MERGELIBS(FWK_DLLPUBLIC) DispatchHelper final public: // ctor/dtor - DispatchHelper(const css::uno::Reference<css::uno::XComponentContext>& xContext); + DispatchHelper(css::uno::Reference<css::uno::XComponentContext> xContext); virtual ~DispatchHelper() override; // XServiceInfo diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index d1eb175c88fc..2b6e251d34f8 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -75,7 +75,7 @@ class FWK_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex @param xNumbers provides the right string and number for an untitled component. */ - TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + TitleHelper(css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::uno::XInterface >& xOwner, const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers); |