diff options
Diffstat (limited to 'sfx2/source/sidebar')
-rw-r--r-- | sfx2/source/sidebar/AsynchronousCall.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/Context.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/sidebar/DeckLayouter.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/DeckTitleBar.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/FocusManager.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/Panel.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarPanelBase.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/sidebar/UnoDeck.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/sidebar/UnoDecks.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/UnoPanel.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/sidebar/UnoPanels.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/UnoSidebar.cxx | 5 |
13 files changed, 48 insertions, 35 deletions
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index 5a3ce8db240d..fdb76d63d1ef 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -18,12 +18,13 @@ */ #include <sfx2/sidebar/AsynchronousCall.hxx> +#include <utility> #include <vcl/svapp.hxx> namespace sfx2::sidebar { -AsynchronousCall::AsynchronousCall (const Action& rAction) - : maAction(rAction), +AsynchronousCall::AsynchronousCall (Action aAction) + : maAction(std::move(aAction)), mnCallId(nullptr) { } diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx index 2065fbd0473b..5666c4cb574e 100644 --- a/sfx2/source/sidebar/Context.cxx +++ b/sfx2/source/sidebar/Context.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <sfx2/sidebar/Context.hxx> +#include <utility> constexpr OUStringLiteral AnyApplicationName = u"any"; @@ -36,10 +37,10 @@ Context::Context() } Context::Context ( - const OUString& rsApplication, - const OUString& rsContext) - : msApplication(rsApplication), - msContext(rsContext) + OUString sApplication, + OUString sContext) + : msApplication(std::move(sApplication)), + msContext(std::move(sContext)) { } diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index c24c93a511f9..5473aa95f001 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/ui/XSidebarPanel.hpp> +#include <utility> #include <vcl/jsdialog/executor.hxx> using namespace css; @@ -61,8 +62,8 @@ namespace { sal_Int32 mnWeight; bool mbShowTitleBar; - LayoutItem(const std::shared_ptr<Panel>& pPanel) - : mpPanel(pPanel) + LayoutItem(std::shared_ptr<Panel> pPanel) + : mpPanel(std::move(pPanel)) , maLayoutSize(0, 0, 0) , mnDistributedHeight(0) , mnWeight(0) diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 2a9bbb287261..44b9387dc14d 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -20,6 +20,7 @@ #include <sidebar/DeckTitleBar.hxx> #include <sfx2/sidebar/Theme.hxx> +#include <utility> #include <vcl/bitmapex.hxx> #include <vcl/customweld.hxx> #include <vcl/outdev.hxx> @@ -60,12 +61,12 @@ public: DeckTitleBar::DeckTitleBar (const OUString& rsTitle, weld::Builder& rBuilder, - const std::function<void()>& rCloserAction) + std::function<void()> aCloserAction) : TitleBar(rBuilder, Theme::Color_DeckTitleBarBackground) , mxGripWidget(new GripWidget) , mxGripWeld(new weld::CustomWeld(rBuilder, "grip", *mxGripWidget)) , mxLabel(rBuilder.weld_label("label")) - , maCloserAction(rCloserAction) + , maCloserAction(std::move(aCloserAction)) , mbIsCloserVisible(false) { mxLabel->set_label(rsTitle); diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 0b8755810c42..d0c38461b9ae 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -24,6 +24,7 @@ #include <sidebar/DeckTitleBar.hxx> #include <sidebar/PanelTitleBar.hxx> #include <sidebar/TitleBar.hxx> +#include <utility> #include <vcl/event.hxx> #include <vcl/weld.hxx> @@ -35,9 +36,9 @@ FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent, con { } -FocusManager::FocusManager(const std::function<void(const Panel&)>& rShowPanelFunctor) +FocusManager::FocusManager(std::function<void(const Panel&)> aShowPanelFunctor) : mpDeckTitleBar(nullptr), - maShowPanelFunctor(rShowPanelFunctor) + maShowPanelFunctor(std::move(aShowPanelFunctor)) { } diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 3f85c8ae522a..5998cb2ee94c 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/ui/XSidebarPanel.hpp> #include <com/sun/star/ui/XUIElement.hpp> +#include <utility> #include <vcl/weldutils.hxx> using namespace css; @@ -47,7 +48,7 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor, weld::Widget* pParentWindow, const bool bIsInitiallyExpanded, Deck* pDeck, - const std::function<Context()>& rContextAccess, + std::function<Context()> aContextAccess, const css::uno::Reference<css::frame::XFrame>& rxFrame) : mxBuilder(Application::CreateBuilder(pParentWindow, "sfx/ui/panel.ui", false, reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))) , msPanelId(rPanelDescriptor.msId) @@ -56,7 +57,7 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor, , mbWantsAWT(rPanelDescriptor.mbWantsAWT) , mbIsExpanded(bIsInitiallyExpanded) , mbLurking(false) - , maContextAccess(rContextAccess) + , maContextAccess(std::move(aContextAccess)) , mxFrame(rxFrame) , mpParentWindow(pParentWindow) , mxDeck(pDeck) diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 5f72192f13f6..a662dffa5174 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> +#include <utility> #include <vcl/EnumContext.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> @@ -49,13 +50,13 @@ Reference<ui::XUIElement> SidebarPanelBase::Create ( } SidebarPanelBase::SidebarPanelBase ( - const OUString& rsResourceURL, - const css::uno::Reference<css::frame::XFrame>& rxFrame, + OUString sResourceURL, + css::uno::Reference<css::frame::XFrame> xFrame, std::unique_ptr<PanelLayout> xControl, const css::ui::LayoutSize& rLayoutSize) - : mxFrame(rxFrame), + : mxFrame(std::move(xFrame)), mxControl(std::move(xControl)), - msResourceURL(rsResourceURL), + msResourceURL(std::move(sResourceURL)), maLayoutSize(rLayoutSize) { if (mxFrame.is()) diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 59649ec152d3..218a6de74ade 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -27,6 +27,7 @@ #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <o3tl/safeint.hxx> +#include <utility> #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/event.hxx> @@ -43,8 +44,8 @@ namespace sfx2::sidebar { TabBar::TabBar(vcl::Window* pParentWindow, const Reference<frame::XFrame>& rxFrame, - const std::function<void (const OUString&)>& rDeckActivationFunctor, - const PopupMenuProvider& rPopupMenuProvider, + std::function<void (const OUString&)> aDeckActivationFunctor, + PopupMenuProvider aPopupMenuProvider, SidebarController* rParentSidebarController ) : InterimItemWindow(pParentWindow, "sfx/ui/tabbar.ui", "TabBar") @@ -56,8 +57,8 @@ TabBar::TabBar(vcl::Window* pParentWindow, , mxMainMenu(mxAuxBuilder->weld_menu("mainmenu")) , mxSubMenu(mxAuxBuilder->weld_menu("submenu")) , mxMeasureBox(mxAuxBuilder->weld_widget("measure")) - , maDeckActivationFunctor(rDeckActivationFunctor) - , maPopupMenuProvider(rPopupMenuProvider) + , maDeckActivationFunctor(std::move(aDeckActivationFunctor)) + , maPopupMenuProvider(std::move(aPopupMenuProvider)) , pParentSidebarController(rParentSidebarController) { InitControlBase(mxMenuButton.get()); diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx index deb4552b4cdf..a7c9ff00d8fd 100644 --- a/sfx2/source/sidebar/UnoDeck.cxx +++ b/sfx2/source/sidebar/UnoDeck.cxx @@ -18,14 +18,15 @@ #include <sfx2/sidebar/Deck.hxx> #include <sidebar/DeckDescriptor.hxx> +#include <utility> #include <vcl/svapp.hxx> using namespace css; using namespace ::sfx2::sidebar; -SfxUnoDeck::SfxUnoDeck(const uno::Reference<frame::XFrame>& rFrame, const OUString& deckId): -xFrame(rFrame), -mDeckId(deckId) +SfxUnoDeck::SfxUnoDeck(uno::Reference<frame::XFrame> _xFrame, OUString deckId): +xFrame(std::move(_xFrame)), +mDeckId(std::move(deckId)) { } diff --git a/sfx2/source/sidebar/UnoDecks.cxx b/sfx2/source/sidebar/UnoDecks.cxx index 2d07ea1a7a5b..6ae5e6948582 100644 --- a/sfx2/source/sidebar/UnoDecks.cxx +++ b/sfx2/source/sidebar/UnoDecks.cxx @@ -17,6 +17,7 @@ #include <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/SidebarController.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <algorithm> @@ -24,8 +25,8 @@ using namespace css; using namespace ::sfx2::sidebar; -SfxUnoDecks::SfxUnoDecks(const uno::Reference<frame::XFrame>& rFrame): -xFrame(rFrame) +SfxUnoDecks::SfxUnoDecks(uno::Reference<frame::XFrame> _xFrame): +xFrame(std::move(_xFrame)) { } diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx index 4af0b0b89264..275672f04e73 100644 --- a/sfx2/source/sidebar/UnoPanel.cxx +++ b/sfx2/source/sidebar/UnoPanel.cxx @@ -19,15 +19,16 @@ #include <sfx2/sidebar/Deck.hxx> #include <sidebar/DeckDescriptor.hxx> +#include <utility> #include <vcl/svapp.hxx> using namespace css; using namespace ::sfx2::sidebar; -SfxUnoPanel::SfxUnoPanel(const uno::Reference<frame::XFrame>& rFrame, const OUString& panelId, const OUString& deckId): -xFrame(rFrame), -mPanelId(panelId), -mDeckId(deckId) +SfxUnoPanel::SfxUnoPanel(uno::Reference<frame::XFrame> _xFrame, OUString panelId, OUString deckId): +xFrame(std::move(_xFrame)), +mPanelId(std::move(panelId)), +mDeckId(std::move(deckId)) { SidebarController* pSidebarController = getSidebarController(); diff --git a/sfx2/source/sidebar/UnoPanels.cxx b/sfx2/source/sidebar/UnoPanels.cxx index 4ef48eb5c587..de1823d00cc2 100644 --- a/sfx2/source/sidebar/UnoPanels.cxx +++ b/sfx2/source/sidebar/UnoPanels.cxx @@ -17,6 +17,7 @@ #include <com/sun/star/ui/XPanel.hpp> #include <sidebar/UnoPanel.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <algorithm> @@ -24,8 +25,8 @@ using namespace css; using namespace ::sfx2::sidebar; -SfxUnoPanels::SfxUnoPanels(const uno::Reference<frame::XFrame>& rFrame, const OUString& deckId): -xFrame(rFrame), +SfxUnoPanels::SfxUnoPanels(uno::Reference<frame::XFrame> _xFrame, const OUString& deckId): +xFrame(std::move(_xFrame)), mDeckId(deckId) { } diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx index b39a8519b343..5142d8a4fc50 100644 --- a/sfx2/source/sidebar/UnoSidebar.cxx +++ b/sfx2/source/sidebar/UnoSidebar.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/frame/XDispatch.hpp> +#include <utility> #include <vcl/svapp.hxx> using namespace css; @@ -23,8 +24,8 @@ using namespace ::sfx2::sidebar; using ::com::sun::star::uno::RuntimeException; -SfxUnoSidebar::SfxUnoSidebar(const uno::Reference<frame::XFrame>& rFrame) - : xFrame(rFrame) +SfxUnoSidebar::SfxUnoSidebar(uno::Reference<frame::XFrame> _xFrame) + : xFrame(std::move(_xFrame)) { } |