summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-08-10 10:41:16 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-08-11 09:25:39 +0200
commit7b5aa0704734da79c0c9a89479d2c1d9e19ef20a (patch)
treef8400a17588af146b9d9109a3ca7b05fa2982ba4 /sd/source
parent2de74491a5a7b2183cce977f8ffaf81d0df11d75 (diff)
clang-tidy modernize-pass-by-value in sd
Change-Id: Ic1e641b1a9373e3ae8da09436b0e8e7b852bede7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138082 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx9
-rw-r--r--sd/source/core/stlfamily.cxx5
-rw-r--r--sd/source/filter/eppt/eppt.cxx5
-rw-r--r--sd/source/filter/eppt/eppt.hxx7
-rw-r--r--sd/source/filter/eppt/pptexanimations.hxx7
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx5
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.hxx2
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx5
-rw-r--r--sd/source/filter/html/htmlex.cxx5
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx5
-rw-r--r--sd/source/ui/accessibility/AccessiblePageShape.cxx5
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx11
-rw-r--r--sd/source/ui/animations/STLPropertySet.hxx3
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx5
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx29
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx7
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx5
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.hxx2
-rw-r--r--sd/source/ui/dlg/TemplateScanner.cxx5
-rw-r--r--sd/source/ui/dlg/diactrl.cxx5
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx5
-rw-r--r--sd/source/ui/dlg/navigatr.cxx5
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx5
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx5
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx9
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx4
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx9
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx7
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx25
-rw-r--r--sd/source/ui/func/smarttag.cxx9
-rw-r--r--sd/source/ui/func/undoheaderfooter.cxx5
-rw-r--r--sd/source/ui/func/undolayer.cxx17
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx2
-rw-r--r--sd/source/ui/inc/AccessiblePageShape.hxx2
-rw-r--r--sd/source/ui/inc/OutlinerIteratorImpl.hxx2
-rw-r--r--sd/source/ui/inc/RemoteServer.hxx5
-rw-r--r--sd/source/ui/inc/TemplateScanner.hxx7
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx5
-rw-r--r--sd/source/ui/inc/ViewShellManager.hxx5
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx2
-rw-r--r--sd/source/ui/inc/diactrl.hxx2
-rw-r--r--sd/source/ui/inc/dlgfield.hxx2
-rw-r--r--sd/source/ui/inc/navigatr.hxx2
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx2
-rw-r--r--sd/source/ui/inc/smarttag.hxx5
-rw-r--r--sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx2
-rw-r--r--sd/source/ui/inc/undoheaderfooter.hxx2
-rw-r--r--sd/source/ui/inc/undolayer.hxx4
-rw-r--r--sd/source/ui/inc/unmodpg.hxx4
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx7
-rw-r--r--sd/source/ui/remotecontrol/ImagePreparer.cxx5
-rw-r--r--sd/source/ui/remotecontrol/ImagePreparer.hxx5
-rw-r--r--sd/source/ui/remotecontrol/Listener.cxx5
-rw-r--r--sd/source/ui/remotecontrol/Listener.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx5
-rw-r--r--sd/source/ui/remotecontrol/ZeroconfService.hxx5
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx5
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.cxx9
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx9
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.cxx29
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.hxx14
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx8
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx7
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx5
-rw-r--r--sd/source/ui/sidebar/SlideBackground.hxx2
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.cxx5
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx3
-rw-r--r--sd/source/ui/slideshow/showwin.cxx5
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx7
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx7
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx13
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx9
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx5
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx13
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx5
-rw-r--r--sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx5
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx2
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx12
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx5
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayouter.cxx7
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx5
-rw-r--r--sd/source/ui/uitest/uiobject.cxx7
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx5
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx5
-rw-r--r--sd/source/ui/view/OutlinerIterator.cxx5
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx19
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx5
-rw-r--r--sd/source/ui/view/unmodpg.cxx9
98 files changed, 331 insertions, 272 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index e645bbca09d5..7c9bb0abc93b 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -77,6 +77,7 @@
#include <CustomAnimationEffect.hxx>
#include <CustomAnimationPreset.hxx>
#include <animations.hxx>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1636,8 +1637,8 @@ EffectSequenceHelper::EffectSequenceHelper()
{
}
-EffectSequenceHelper::EffectSequenceHelper( const css::uno::Reference< css::animations::XTimeContainer >& xSequenceRoot )
-: mxSequenceRoot( xSequenceRoot ), mnSequenceType( EffectNodeType::DEFAULT )
+EffectSequenceHelper::EffectSequenceHelper( css::uno::Reference< css::animations::XTimeContainer > xSequenceRoot )
+: mxSequenceRoot(std::move( xSequenceRoot )), mnSequenceType( EffectNodeType::DEFAULT )
{
Reference< XAnimationNode > xNode( mxSequenceRoot, UNO_QUERY_THROW );
create( xNode );
@@ -3539,8 +3540,8 @@ void InteractiveSequence::implRebuild()
EffectSequenceHelper::implRebuild();
}
-MainSequenceRebuildGuard::MainSequenceRebuildGuard( const MainSequencePtr& pMainSequence )
-: mpMainSequence( pMainSequence )
+MainSequenceRebuildGuard::MainSequenceRebuildGuard( MainSequencePtr pMainSequence )
+: mpMainSequence(std::move( pMainSequence ))
{
if( mpMainSequence )
mpMainSequence->lockRebuilds();
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index a396bd1701ba..02594ea9fada 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <svl/style.hxx>
@@ -95,9 +96,9 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets()
return maStyleSheets;
}
-SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, SfxStyleFamily nFamily )
+SdStyleFamily::SdStyleFamily( rtl::Reference< SfxStyleSheetPool > xPool, SfxStyleFamily nFamily )
: mnFamily( nFamily )
-, mxPool( xPool )
+, mxPool(std::move( xPool ))
{
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 6f58d919eee2..d243496946a2 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -51,6 +51,7 @@
#include <oox/export/utils.hxx>
#include <oox/ole/olehelper.hxx>
#include <memory>
+#include <utility>
class SfxObjectShell;
// complete SfxObjectShell for SaveVBA under -fsanitize=function
@@ -63,7 +64,7 @@ using ::com::sun::star::beans::XPropertySet;
//============================ PPTWriter ==================================
-PPTWriter::PPTWriter( tools::SvRef<SotStorage> const & rSvStorage,
+PPTWriter::PPTWriter( tools::SvRef<SotStorage> xSvStorage,
css::uno::Reference< css::frame::XModel > const & rXModel,
css::uno::Reference< css::task::XStatusIndicator > const & rXStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
@@ -75,7 +76,7 @@ PPTWriter::PPTWriter( tools::SvRef<SotStorage> const & rSvStorage,
mnTextStyle( 0 ),
mbFontIndependentLineSpacing( false ),
mnTextSize( 0 ),
- mrStg ( rSvStorage ),
+ mrStg (std::move( xSvStorage )),
mnVBAOleOfs ( 0 ),
mpVBA ( pVBA ),
mnExEmbed ( 0 ),
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index eec83929002f..ee2219ddd316 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -19,6 +19,7 @@
#pragma once
#include <memory>
+#include <utility>
#include <vector>
#include "escherex.hxx"
#include <sal/types.h>
@@ -69,8 +70,8 @@ struct EPPTHyperlink
// bit 8-23: index
// bit 31 : hyperlink is attached to a shape
- EPPTHyperlink( const OUString& rURL, sal_uInt32 nT ) :
- aURL ( rURL ),
+ EPPTHyperlink( OUString _aURL, sal_uInt32 nT ) :
+ aURL (std::move( _aURL )),
nType ( nT ){};
};
@@ -216,7 +217,7 @@ class PPTWriter final : public PPTWriterBase, public PPTExBulletProvider
virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, css::uno::Reference< css::beans::XPropertySet > const & aXBackgroundPropSet ) override;
public:
- PPTWriter( tools::SvRef<SotStorage> const & rSvStorage,
+ PPTWriter( tools::SvRef<SotStorage> xSvStorage,
css::uno::Reference< css::frame::XModel > const & rModel,
css::uno::Reference< css::task::XStatusIndicator > const & rStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags );
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index daa54d85b8c5..aa05ec60b904 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/uno/Reference.h>
#include <memory>
+#include <utility>
#include <vector>
namespace com::sun::star::animations { class XAnimate; }
@@ -48,9 +49,9 @@ namespace ppt
css::uno::Reference< css::animations::XAnimationNode > mxNode;
css::uno::Reference< css::animations::XAnimationNode > mxMaster;
- AfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode,
- const css::uno::Reference< css::animations::XAnimationNode >& xMaster )
- : mxNode( xNode ), mxMaster( xMaster ) {}
+ AfterEffectNode( css::uno::Reference< css::animations::XAnimationNode > xNode,
+ css::uno::Reference< css::animations::XAnimationNode > xMaster )
+ : mxNode(std::move( xNode )), mxMaster(std::move( xMaster )) {}
};
typedef std::shared_ptr< AfterEffectNode > AfterEffectNodePtr;
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index c4770e6442e9..65c537a6f469 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -25,13 +25,14 @@
#include <ucbhelper/content.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
+#include <utility>
namespace ppt
{
-ExSoundEntry::ExSoundEntry(const OUString& rString)
+ExSoundEntry::ExSoundEntry(OUString aString)
: nFileSize(0)
- , aSoundURL(rString)
+ , aSoundURL(std::move(aString))
{
try
{
diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx
index d81bb8118202..5a45464298d0 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.hxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.hxx
@@ -44,7 +44,7 @@ class ExSoundEntry
bool IsSameURL(std::u16string_view rURL) const;
sal_uInt32 GetFileSize( ) const { return nFileSize; };
- ExSoundEntry(const OUString& rSoundURL);
+ ExSoundEntry(OUString aSoundURL);
/// @return size of a complete SoundContainer.
sal_uInt32 GetSize( sal_uInt32 nId ) const;
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 46ed24f3b412..71f9221ab055 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/drawing/GraphicExportFilter.hpp>
+#include <utility>
#include <vcl/errinf.hxx>
#include <vcl/weld.hxx>
#include <sfx2/sfxsids.hrc>
@@ -68,8 +69,8 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper< css::task:
public:
- explicit SdGRFFilter_ImplInteractionHdl( css::uno::Reference< css::task::XInteractionHandler > const & xInteraction ) :
- m_xInter( xInteraction ),
+ explicit SdGRFFilter_ImplInteractionHdl( css::uno::Reference< css::task::XInteractionHandler > xInteraction ) :
+ m_xInter(std::move( xInteraction )),
nFilterError( ERRCODE_NONE )
{}
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index a277f976bf41..dbc5070cad97 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <sfx2/frmhtmlw.hxx>
#include <sfx2/progress.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svx/svditer.hxx>
@@ -342,11 +343,11 @@ constexpr OUStringLiteral gaHTMLExtension = u"" STR_HTMLEXP_DEFAULT_EXTENSION;
// constructor for the html export helper classes
HtmlExport::HtmlExport(
- const OUString& aPath,
+ OUString aPath,
const Sequence< PropertyValue >& rParams,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell )
- : maPath( aPath ),
+ : maPath(std::move( aPath )),
mpDoc(pExpDoc),
mpDocSh( pDocShell ),
meMode( PUBLISH_SINGLE_DOCUMENT ),
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 5f6f06e49b27..0464e9bf4d6f 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -223,7 +223,7 @@ class HtmlExport final
SdrOutliner* pOutliner, const Color& rBackgroundColor);
public:
- HtmlExport(const OUString& aPath,
+ HtmlExport(OUString aPath,
const css::uno::Sequence<css::beans::PropertyValue>& rParams,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell);
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index c297184fa635..f4809fa31353 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -48,6 +48,7 @@
#include <sdpage.hxx>
#include <DrawViewShell.hxx>
#include <PresentationViewShell.hxx>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -59,13 +60,13 @@ namespace accessibility {
AccessibleDocumentViewBase::AccessibleDocumentViewBase (
::sd::Window* pSdWindow,
::sd::ViewShell* pViewShell,
- const uno::Reference<frame::XController>& rxController,
+ uno::Reference<frame::XController> xController,
const uno::Reference<XAccessible>& rxParent)
: AccessibleContextBase (rxParent,
pViewShell->GetDoc()->GetDocumentType() == DocumentType::Impress ?
AccessibleRole::DOCUMENT_PRESENTATION :
AccessibleRole::DOCUMENT),
- mxController (rxController),
+ mxController (std::move(xController)),
maViewForwarder (
static_cast<SdrPaintView*>(pViewShell->GetView()),
*pSdWindow->GetOutDev())
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 517d3fb09a7a..83198561af3e 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XMasterPageTarget.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -38,11 +39,11 @@ namespace accessibility {
//===== internal ============================================================
AccessiblePageShape::AccessiblePageShape (
- const uno::Reference<drawing::XDrawPage>& rxPage,
+ uno::Reference<drawing::XDrawPage> xPage,
const uno::Reference<XAccessible>& rxParent,
const AccessibleShapeTreeInfo& rShapeTreeInfo)
: AccessibleShape (AccessibleShapeInfo (nullptr, rxParent), rShapeTreeInfo),
- mxPage (rxPage)
+ mxPage (std::move(xPage))
{
// The main part of the initialization is done in the init method which
// has to be called from this constructor's caller.
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 993d3dc8ff40..a5c1d567f46c 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -31,6 +31,7 @@
#include <comphelper/scopeguard.hxx>
#include <CustomAnimationList.hxx>
#include <CustomAnimationPreset.hxx>
+#include <utility>
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
#include <vcl/image.hxx>
@@ -227,8 +228,8 @@ static OUString getDescription( const Any& rTarget, bool bWithText )
class CustomAnimationListEntryItem
{
public:
- CustomAnimationListEntryItem(const OUString& aDescription,
- const CustomAnimationEffectPtr& pEffect);
+ CustomAnimationListEntryItem(OUString aDescription,
+ CustomAnimationEffectPtr pEffect);
const CustomAnimationEffectPtr& getEffect() const { return mpEffect; }
Size GetSize(const vcl::RenderContext& rRenderContext);
@@ -246,9 +247,9 @@ public:
static const ::tools::Long nItemMinHeight = 38;
};
-CustomAnimationListEntryItem::CustomAnimationListEntryItem(const OUString& aDescription, const CustomAnimationEffectPtr& pEffect)
- : msDescription(aDescription)
- , mpEffect(pEffect)
+CustomAnimationListEntryItem::CustomAnimationListEntryItem(OUString aDescription, CustomAnimationEffectPtr pEffect)
+ : msDescription(std::move(aDescription))
+ , mpEffect(std::move(pEffect))
{
if (!mpEffect)
return;
diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx
index 3096e7c7832e..e2e088cd5a62 100644
--- a/sd/source/ui/animations/STLPropertySet.hxx
+++ b/sd/source/ui/animations/STLPropertySet.hxx
@@ -21,6 +21,7 @@
#include <map>
#include <com/sun/star/uno/Any.hxx>
+#include <utility>
namespace sd
{
@@ -39,7 +40,7 @@ struct STLPropertyMapEntry
STLPropertyMapEntry()
: mnState( STLPropertyState::Ambiguous ) {}
explicit STLPropertyMapEntry(css::uno::Any aValue)
- : maValue( aValue ), mnState( STLPropertyState::Default ) {}
+ : maValue(std::move( aValue )), mnState( STLPropertyState::Default ) {}
};
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 846f21c34cd3..4e49dd8aaa5d 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -36,6 +36,7 @@
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <svx/gallery.hxx>
+#include <utility>
#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -253,8 +254,8 @@ void lcl_CreateUndoForPages(
struct lcl_EqualsSoundFileName
{
- explicit lcl_EqualsSoundFileName( const OUString & rStr ) :
- maStr( rStr )
+ explicit lcl_EqualsSoundFileName( OUString aStr ) :
+ maStr(std::move( aStr ))
{}
bool operator() ( const OUString & rStr ) const
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index ced68539517b..ce279d8fc1de 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -53,6 +53,7 @@
#include <svx/sdr/contact/viewcontact.hxx>
#include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
+#include <utility>
using sdr::PolyPolygonEditor;
using namespace ::com::sun::star;
@@ -79,17 +80,17 @@ protected:
public:
PathDragMove(SdrDragView& rNewView,
- const rtl::Reference <MotionPathTag >& xTag,
- const basegfx::B2DPolyPolygon& rPathPolyPolygon)
+ rtl::Reference <MotionPathTag > xTag,
+ basegfx::B2DPolyPolygon aPathPolyPolygon)
: SdrDragMove(rNewView),
- maPathPolyPolygon(rPathPolyPolygon),
- mxTag( xTag )
+ maPathPolyPolygon(std::move(aPathPolyPolygon)),
+ mxTag(std::move( xTag ))
{}
PathDragMove(SdrDragView& rNewView,
- const rtl::Reference <MotionPathTag >& xTag)
+ rtl::Reference <MotionPathTag > xTag)
: SdrDragMove(rNewView),
- mxTag( xTag )
+ mxTag(std::move( xTag ))
{}
virtual bool BeginSdrDrag() override;
@@ -145,17 +146,17 @@ protected:
public:
PathDragResize(SdrDragView& rNewView,
- const rtl::Reference <MotionPathTag >& xTag,
- const basegfx::B2DPolyPolygon& rPathPolyPolygon)
+ rtl::Reference <MotionPathTag > xTag,
+ basegfx::B2DPolyPolygon aPathPolyPolygon)
: SdrDragResize(rNewView),
- maPathPolyPolygon(rPathPolyPolygon),
- mxTag( xTag )
+ maPathPolyPolygon(std::move(aPathPolyPolygon)),
+ mxTag(std::move( xTag ))
{}
PathDragResize(SdrDragView& rNewView,
- const rtl::Reference <MotionPathTag >& xTag)
+ rtl::Reference <MotionPathTag > xTag)
: SdrDragResize(rNewView),
- mxTag( xTag )
+ mxTag(std::move( xTag ))
{}
virtual bool EndSdrDrag(bool bCopy) override;
@@ -207,9 +208,9 @@ protected:
public:
PathDragObjOwn(SdrDragView& rNewView,
- const basegfx::B2DPolyPolygon& rPathPolyPolygon)
+ basegfx::B2DPolyPolygon aPathPolyPolygon)
: SdrDragObjOwn(rNewView),
- maPathPolyPolygon(rPathPolyPolygon)
+ maPathPolyPolygon(std::move(aPathPolyPolygon))
{}
explicit PathDragObjOwn(SdrDragView& rNewView)
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 12fed3e43208..7afe26ee54b0 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -22,6 +22,7 @@
#include <rtl/ustrbuf.hxx>
+#include <utility>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -96,7 +97,7 @@ namespace {
class AnnotationDragMove : public SdrDragMove
{
public:
- AnnotationDragMove(SdrDragView& rNewView, const rtl::Reference <AnnotationTag >& xTag);
+ AnnotationDragMove(SdrDragView& rNewView, rtl::Reference <AnnotationTag > xTag);
virtual bool BeginSdrDrag() override;
virtual bool EndSdrDrag(bool bCopy) override;
virtual void MoveSdrDrag(const Point& rNoSnapPnt) override;
@@ -109,9 +110,9 @@ private:
}
-AnnotationDragMove::AnnotationDragMove(SdrDragView& rNewView, const rtl::Reference <AnnotationTag >& xTag)
+AnnotationDragMove::AnnotationDragMove(SdrDragView& rNewView, rtl::Reference <AnnotationTag > xTag)
: SdrDragMove(rNewView)
-, mxTag( xTag )
+, mxTag(std::move( xTag ))
{
}
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 2371c4fb8256..3d5979c4317d 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <utility>
#include <vector>
#include "RemoteDialogClientBox.hxx"
@@ -29,14 +30,14 @@ namespace sd {
// struct ClientBoxEntry
ClientBoxEntry::ClientBoxEntry(ClientBox* pClientBox,
- const std::shared_ptr<ClientInfo>& pClientInfo)
+ std::shared_ptr<ClientInfo> pClientInfo)
: m_xBuilder(Application::CreateBuilder(pClientBox->GetContainer(), "modules/simpress/ui/clientboxfragment.ui"))
, m_xContainer(m_xBuilder->weld_container("ClientboxFragment"))
, m_xDeviceName(m_xBuilder->weld_label("name"))
, m_xPinLabel(m_xBuilder->weld_label("pinlabel"))
, m_xPinBox(m_xBuilder->weld_entry("pin"))
, m_xDeauthoriseButton(m_xBuilder->weld_button("button"))
- , m_xClientInfo(pClientInfo)
+ , m_xClientInfo(std::move(pClientInfo))
, m_pClientBox(pClientBox)
{
m_xDeviceName->set_label(m_xClientInfo->mName);
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index c7a916dc934a..e11d5af95063 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -54,7 +54,7 @@ struct ClientBoxEntry
DECL_LINK(DeauthoriseHdl, weld::Button&, void);
DECL_LINK(FocusHdl, weld::Widget&, void);
- ClientBoxEntry(ClientBox* pClientBox, const std::shared_ptr<ClientInfo>& pClientInfo);
+ ClientBoxEntry(ClientBox* pClientBox, std::shared_ptr<ClientInfo> pClientInfo);
~ClientBoxEntry();
};
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index afd23ff855ee..4b6f3e92ee57 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <set>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -43,10 +44,10 @@ class FolderDescriptor
public:
FolderDescriptor (
int nPriority,
- const OUString& rsContentIdentifier,
+ OUString sContentIdentifier,
const Reference<css::ucb::XCommandEnvironment>& rxFolderEnvironment)
: mnPriority(nPriority),
- msContentIdentifier(rsContentIdentifier),
+ msContentIdentifier(std::move(sContentIdentifier)),
mxFolderEnvironment(rxFolderEnvironment)
{ }
int mnPriority;
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 2335508091b6..d2dea8ad769b 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <comphelper/propertyvalue.hxx>
+#include <utility>
#include <vcl/fieldvalues.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -51,10 +52,10 @@ namespace
// SdPagesField
SdPagesField::SdPagesField( vcl::Window* pParent,
- const uno::Reference< frame::XFrame >& rFrame )
+ uno::Reference< frame::XFrame > xFrame )
: InterimItemWindow(pParent, "modules/simpress/ui/pagesfieldbox.ui", "PagesFieldBox")
, m_xWidget(m_xBuilder->weld_spin_button("pagesfield"))
- , m_xFrame(rFrame)
+ , m_xFrame(std::move(xFrame))
{
InitControlBase(m_xWidget.get());
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 75263a17c8a4..cf698b10f5dd 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -31,13 +31,14 @@
#include <sdmod.hxx>
#include <dlgfield.hxx>
#include <DrawDocShell.hxx>
+#include <utility>
/**
* dialog to edit field commands
*/
-SdModifyFieldDlg::SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet)
+SdModifyFieldDlg::SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, SfxItemSet aSet)
: GenericDialogController(pWindow, "modules/simpress/ui/dlgfield.ui", "EditFieldsDialog")
- , m_aInputSet(rSet)
+ , m_aInputSet(std::move(aSet))
, m_pField(pInField)
, m_xRbtFix(m_xBuilder->weld_radio_button("fixedRB"))
, m_xRbtVar(m_xBuilder->weld_radio_button("varRB"))
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 4cec75753505..ea9e74c687cc 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -45,6 +45,7 @@
#include <Window.hxx>
#include <DrawViewShell.hxx>
+#include <utility>
/**
* SdNavigatorWin - FloatingWindow
@@ -642,10 +643,10 @@ SdNavigatorControllerItem::SdNavigatorControllerItem(
sal_uInt16 _nId,
SdNavigatorWin* pNavWin,
SfxBindings* _pBindings,
- const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest)
+ SdNavigatorWin::UpdateRequestFunctor aUpdateRequest)
: SfxControllerItem( _nId, *_pBindings ),
pNavigatorWin( pNavWin ),
- maUpdateRequest(rUpdateRequest)
+ maUpdateRequest(std::move(aUpdateRequest))
{
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index cd50e97c2682..f0664dff110e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -20,6 +20,7 @@
#include <sal/log.hxx>
#include <sal/types.h>
#include <sot/formats.hxx>
+#include <utility>
#include <vcl/weld.hxx>
#include <svx/svditer.hxx>
#include <sfx2/docfile.hxx>
@@ -65,11 +66,11 @@ bool SdPageObjsTLV::IsInDrag()
SotClipboardFormatId SdPageObjsTLV::SdPageObjsTransferable::mnListBoxDropFormatId = static_cast<SotClipboardFormatId>(SAL_MAX_UINT32);
SdPageObjsTLV::SdPageObjsTransferable::SdPageObjsTransferable(
- const INetBookmark& rBookmark,
+ INetBookmark aBookmark,
::sd::DrawDocShell& rDocShell,
NavigatorDragType eDragType)
: SdTransferable(rDocShell.GetDoc(), nullptr, true),
- maBookmark( rBookmark ),
+ maBookmark(std::move( aBookmark )),
mrDocShell( rDocShell ),
meDragType( eDragType )
{
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index da633a540b5e..c67ecbb77a22 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -23,6 +23,7 @@
#include "ConfigurationUpdater.hxx"
+#include <utility>
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
#include <com/sun/star/container/XNamed.hpp>
@@ -50,9 +51,9 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest)
namespace sd::framework {
ChangeRequestQueueProcessor::ChangeRequestQueueProcessor (
- const std::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater)
+ std::shared_ptr<ConfigurationUpdater> pConfigurationUpdater)
: mnUserEventId(nullptr),
- mpConfigurationUpdater(rpConfigurationUpdater)
+ mpConfigurationUpdater(std::move(pConfigurationUpdater))
{
}
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index 4afd5af767a2..823df7d8f86e 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -57,7 +57,7 @@ public:
ConfigurationController so that its UpdateConfiguration() method can
be called when the queue becomes empty.
*/
- explicit ChangeRequestQueueProcessor(const std::shared_ptr<ConfigurationUpdater>& rpUpdater);
+ explicit ChangeRequestQueueProcessor(std::shared_ptr<ConfigurationUpdater> pUpdater);
~ChangeRequestQueueProcessor();
/** Sets the configuration who will be changed by subsequent change
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 904011d7d5c0..20a0306a4cf2 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -27,6 +27,7 @@
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
#include <algorithm>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -37,11 +38,11 @@ namespace sd::framework {
//===== ConfigurationControllerResourceManager ================================
ConfigurationControllerResourceManager::ConfigurationControllerResourceManager (
- const std::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster)
+ std::shared_ptr<ResourceFactoryManager> pResourceFactoryContainer,
+ std::shared_ptr<ConfigurationControllerBroadcaster> pBroadcaster)
: maResourceMap(ResourceComparator()),
- mpResourceFactoryContainer(rpResourceFactoryContainer),
- mpBroadcaster(rpBroadcaster)
+ mpResourceFactoryContainer(std::move(pResourceFactoryContainer)),
+ mpBroadcaster(std::move(pBroadcaster))
{
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index f3a3d6d76712..9839a0db3cde 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -59,8 +59,8 @@ public:
resources.
*/
ConfigurationControllerResourceManager (
- const std::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster);
+ std::shared_ptr<ResourceFactoryManager> pResourceFactoryContainer,
+ std::shared_ptr<ConfigurationControllerBroadcaster> pBroadcaster);
~ConfigurationControllerResourceManager();
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 96ac74186b6d..1de3b3f47885 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -29,6 +29,7 @@
#include <comphelper/scopeguard.hxx>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
+#include <utility>
using namespace ::com::sun::star;
@@ -62,17 +63,17 @@ private:
//===== ConfigurationUpdater ==================================================
ConfigurationUpdater::ConfigurationUpdater (
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
- const std::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
+ std::shared_ptr<ConfigurationControllerBroadcaster> pBroadcaster,
+ std::shared_ptr<ConfigurationControllerResourceManager> pResourceManager,
const Reference<XControllerManager>& rxControllerManager)
- : mpBroadcaster(rpBroadcaster),
+ : mpBroadcaster(std::move(pBroadcaster)),
mxCurrentConfiguration(Reference<XConfiguration>(new Configuration(nullptr, false))),
mbUpdatePending(false),
mbUpdateBeingProcessed(false),
mnLockCount(0),
maUpdateTimer("sd::ConfigurationUpdater maUpdateTimer"),
mnFailedUpdateCount(0),
- mpResourceManager(rpResourceManager)
+ mpResourceManager(std::move(pResourceManager))
{
// Prepare the timer that is started when after an update the current
// and the requested configuration differ. With the timer we try
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 9fba364b13d7..2d981d4ad99f 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -60,10 +60,9 @@ public:
changes and the start and end of updates via the given broadcaster.
*/
ConfigurationUpdater(
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
- const std::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
- const css::uno::Reference<css::drawing::framework::XControllerManager>&
- rxControllerManager);
+ std::shared_ptr<ConfigurationControllerBroadcaster> pBroadcaster,
+ std::shared_ptr<ConfigurationControllerResourceManager> pResourceManager,
+ const css::uno::Reference<css::drawing::framework::XControllerManager>& xControllerManager);
~ConfigurationUpdater();
/** Request an update of the current configuration so that it looks like
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index dceecd5102a7..a2e1ed7c056b 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -37,6 +37,7 @@
#include <sfx2/request.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <osl/doublecheckedlocking.h>
#include <osl/getglobalmutex.hxx>
@@ -86,9 +87,9 @@ public:
*/
CallbackCaller (
const ::sd::ViewShellBase& rBase,
- const OUString& rsEventType,
- const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
- const ::sd::framework::FrameworkHelper::Callback& rCallback);
+ OUString sEventType,
+ ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter aFilter,
+ ::sd::framework::FrameworkHelper::Callback aCallback);
virtual void disposing(std::unique_lock<std::mutex>&) override;
// XEventListener
@@ -255,7 +256,7 @@ class FrameworkHelper::DisposeListener
: public FrameworkHelperDisposeListenerInterfaceBase
{
public:
- explicit DisposeListener (const ::std::shared_ptr<FrameworkHelper>& rpHelper);
+ explicit DisposeListener (::std::shared_ptr<FrameworkHelper> pHelper);
virtual void disposing(std::unique_lock<std::mutex>&) override;
@@ -760,8 +761,8 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
//----- FrameworkHelper::DisposeListener --------------------------------------
FrameworkHelper::DisposeListener::DisposeListener (
- const ::std::shared_ptr<FrameworkHelper>& rpHelper)
- : mpHelper(rpHelper)
+ ::std::shared_ptr<FrameworkHelper> pHelper)
+ : mpHelper(std::move(pHelper))
{
Reference<XComponent> xComponent (mpHelper->mxConfigurationController, UNO_QUERY);
if (xComponent.is())
@@ -799,12 +800,12 @@ namespace {
CallbackCaller::CallbackCaller (
const ::sd::ViewShellBase& rBase,
- const OUString& rsEventType,
- const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
- const ::sd::framework::FrameworkHelper::Callback& rCallback)
- : msEventType(rsEventType),
- maFilter(rFilter),
- maCallback(rCallback)
+ OUString rsEventType,
+ ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter aFilter,
+ ::sd::framework::FrameworkHelper::Callback aCallback)
+ : msEventType(std::move(rsEventType)),
+ maFilter(std::move(aFilter)),
+ maCallback(std::move(aCallback))
{
try
{
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index ff53821168c9..b9fdc74c9721 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/sd/source/ui/func/smarttag.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <utility>
#include <vcl/commandevent.hxx>
#include <ViewShell.hxx>
@@ -315,16 +316,16 @@ void SmartTagSet::CheckPossibilities()
mxSelectedTag->CheckPossibilities();
}
-SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind /*=SdrHdlKind::Move*/ )
+SmartHdl::SmartHdl( SmartTagReference xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind /*=SdrHdlKind::Move*/ )
: SdrHdl( rPnt, eNewKind )
-, mxSmartTag( xTag )
+, mxSmartTag(std::move( xTag ))
{
SetObj( pObject );
}
-SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind /*=SdrHdlKind::Move*/ )
+SmartHdl::SmartHdl( SmartTagReference xTag, const Point& rPnt, SdrHdlKind eNewKind /*=SdrHdlKind::Move*/ )
: SdrHdl( rPnt, eNewKind )
-, mxSmartTag( xTag )
+, mxSmartTag(std::move( xTag ))
{
}
diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx
index 648a2dd35842..18a89d4ca8f5 100644
--- a/sd/source/ui/func/undoheaderfooter.cxx
+++ b/sd/source/ui/func/undoheaderfooter.cxx
@@ -22,13 +22,14 @@
#include <app.hrc>
#include <undoheaderfooter.hxx>
+#include <utility>
-SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings )
+SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, sd::HeaderFooterSettings aNewSettings )
: SdUndoAction(pDoc),
mpPage(pPage),
maOldSettings(pPage->getHeaderFooterSettings()),
- maNewSettings(rNewSettings)
+ maNewSettings(std::move(aNewSettings))
{
}
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index b29142ee8de7..15084376b9a5 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -24,23 +24,24 @@
#include <DrawViewShell.hxx>
#include <strings.hrc>
#include <sdresid.hxx>
+#include <utility>
SdLayerModifyUndoAction::SdLayerModifyUndoAction(
SdDrawDocument* _pDoc, SdrLayer* pLayer,
- const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
- const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable )
+ OUString aOldLayerName, OUString aOldLayerTitle, OUString aOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
+ OUString aNewLayerName, OUString aNewLayerTitle, OUString aNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable )
: SdUndoAction( _pDoc ),
mpLayer( pLayer ),
- maOldLayerName( rOldLayerName ),
- maOldLayerTitle( rOldLayerTitle ),
- maOldLayerDesc( rOldLayerDesc ),
+ maOldLayerName(std::move( aOldLayerName )),
+ maOldLayerTitle(std::move( aOldLayerTitle )),
+ maOldLayerDesc(std::move( aOldLayerDesc )),
mbOldIsVisible( bOldIsVisible ),
mbOldIsLocked( bOldIsLocked ),
mbOldIsPrintable( bOldIsPrintable ),
- maNewLayerName( rNewLayerName ),
- maNewLayerTitle( rNewLayerTitle ),
- maNewLayerDesc( rNewLayerDesc ),
+ maNewLayerName(std::move( aNewLayerName )),
+ maNewLayerTitle(std::move( aNewLayerTitle )),
+ maNewLayerDesc(std::move( aNewLayerDesc )),
mbNewIsVisible( bNewIsVisible ),
mbNewIsLocked( bNewIsLocked ),
mbNewIsPrintable( bNewIsPrintable )
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 0db25b689cff..e940357f18ce 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -106,7 +106,7 @@ public:
AccessibleDocumentViewBase (
::sd::Window* pSdWindow,
::sd::ViewShell* pViewShell,
- const css::uno::Reference<css::frame::XController>& rxController,
+ css::uno::Reference<css::frame::XController> xController,
const css::uno::Reference<css::accessibility::XAccessible>& rxParent);
virtual ~AccessibleDocumentViewBase() override;
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index 164fb96fe866..06dc76555214 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -49,7 +49,7 @@ public:
would not keep a strong reference to the new object.
*/
AccessiblePageShape (
- const css::uno::Reference<css::drawing::XDrawPage>& rxPage,
+ css::uno::Reference<css::drawing::XDrawPage> xPage,
const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
const AccessibleShapeTreeInfo& rShapeTreeInfo);
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 00be547c0721..788e6ae61072 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -54,7 +54,7 @@ public:
const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
IteratorImplBase (SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ std::weak_ptr<ViewShell> pViewShellWeak,
bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode);
virtual ~IteratorImplBase();
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 965bf7a276c5..aa42ffb7d03e 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -9,6 +9,7 @@
#pragma once
#include <memory>
+#include <utility>
#include <vector>
#include <osl/socket_decl.hxx>
@@ -36,9 +37,9 @@ namespace sd
bool mbIsAlreadyAuthorised;
- ClientInfo( const OUString& rName,
+ ClientInfo( OUString aName,
const bool bIsAlreadyAuthorised ) :
- mName( rName ),
+ mName(std::move( aName )),
mbIsAlreadyAuthorised( bIsAlreadyAuthorised ) {}
virtual ~ClientInfo() {};
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 034f000a6d5d..7924cc294cee 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/uno/Reference.h>
#include <memory>
+#include <utility>
#include <vector>
namespace com::sun::star::ucb
@@ -44,9 +45,9 @@ namespace sd
class TemplateEntry
{
public:
- TemplateEntry(const OUString& rsTitle, const OUString& rsPath)
- : msTitle(rsTitle)
- , msPath(rsPath)
+ TemplateEntry(OUString sTitle, OUString sPath)
+ : msTitle(std::move(sTitle))
+ , msPath(std::move(sPath))
{
}
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 45f4532fb955..e641149b430b 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -24,6 +24,7 @@
#include <sal/types.h>
#include <memory>
+#include <utility>
class SdrView;
namespace sd { class ViewShell; }
@@ -245,8 +246,8 @@ public:
bar operations are made in a row.
*/
class UpdateLock { public:
- UpdateLock(const std::shared_ptr<ToolBarManager>& rpManager)
- : mpManager(rpManager) { mpManager->LockUpdate(); }
+ UpdateLock(std::shared_ptr<ToolBarManager> pManager)
+ : mpManager(std::move(pManager)) { mpManager->LockUpdate(); }
~UpdateLock() COVERITY_NOEXCEPT_FALSE { mpManager->UnlockUpdate(); }
private:
std::shared_ptr<ToolBarManager> mpManager;
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index a2c8f1ef2c9b..c4011c52d5fd 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -22,6 +22,7 @@
#include "ShellFactory.hxx"
#include <o3tl/deleter.hxx>
#include <memory>
+#include <utility>
class FmFormShell;
class SfxShell;
@@ -167,8 +168,8 @@ public:
class UpdateLock
{
public:
- UpdateLock(const std::shared_ptr<ViewShellManager>& rpManager)
- : mpManager(rpManager)
+ UpdateLock(std::shared_ptr<ViewShellManager> pManager)
+ : mpManager(std::move(pManager))
{
mpManager->LockUpdate();
}
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index ca9db932e0c6..d483f2b057d0 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -45,7 +45,7 @@ namespace sd {
class TabBarControl final : public InterimItemWindow
{
public:
- TabBarControl(vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar);
+ TabBarControl(vcl::Window* pParentWindow, ::rtl::Reference<ViewTabBar> pViewTabBar);
virtual void dispose() override;
virtual ~TabBarControl() override;
weld::Notebook& GetNotebook() { return *mxTabControl; }
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 12e76762e1f3..375e5401c999 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -42,7 +42,7 @@ private:
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
public:
- SdPagesField(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame);
+ SdPagesField(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> xFrame);
virtual void dispose() override;
void set_sensitive(bool bSensitive);
virtual ~SdPagesField() override;
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index 769dc12c7c9a..40cadc9f40f0 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -46,7 +46,7 @@ private:
DECL_LINK(LanguageChangeHdl, weld::ComboBox&, void);
public:
- SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet);
+ SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, SfxItemSet aSet);
virtual ~SdModifyFieldDlg() override;
SvxFieldData* GetField();
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 0e500eb0f5c9..7eeb2551a778 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -175,7 +175,7 @@ class SdNavigatorControllerItem : public SfxControllerItem
{
public:
SdNavigatorControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings*,
- const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest);
+ SdNavigatorWin::UpdateRequestFunctor aUpdateRequest);
protected:
virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState,
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index c59e2897ab08..e2e23618b7bd 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -355,7 +355,7 @@ public:
{
public:
SdPageObjsTransferable(
- const INetBookmark& rBookmark,
+ INetBookmark aBookmark,
::sd::DrawDocShell& rDocShell,
NavigatorDragType eDragType );
::sd::DrawDocShell& GetDocShell() const { return mrDocShell;}
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index 6e27979d6ebe..2157abb130bb 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -156,9 +156,8 @@ private:
class SmartHdl : public SdrHdl
{
public:
- SmartHdl(const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt,
- SdrHdlKind eNewKind);
- SmartHdl(const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind);
+ SmartHdl(SmartTagReference xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind);
+ SmartHdl(SmartTagReference xTag, const Point& rPnt, SdrHdlKind eNewKind);
const SmartTagReference& getTag() const { return mxSmartTag; }
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index bbff549f10f7..4084e7e8fe83 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -73,7 +73,7 @@ private:
sal_uInt32 mnMaxTimePerStep;
TimerBasedTaskExecution (
- const std::shared_ptr<AsynchronousTask>& rpTask,
+ std::shared_ptr<AsynchronousTask> pTask,
sal_uInt32 nMillisecondsBetweenSteps,
sal_uInt32 nMaxTimePerStep);
~TimerBasedTaskExecution();
diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx
index 2c8c9c8e9938..a6928a63c205 100644
--- a/sd/source/ui/inc/undoheaderfooter.hxx
+++ b/sd/source/ui/inc/undoheaderfooter.hxx
@@ -35,7 +35,7 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction final : public SdUndoAction
const sd::HeaderFooterSettings maNewSettings;
public:
- SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings );
+ SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, sd::HeaderFooterSettings aNewSettings );
virtual ~SdHeaderFooterUndoAction() override;
virtual void Undo() override;
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index 431f60d4f632..7b0d33d9ae9d 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -31,8 +31,8 @@ class SdLayerModifyUndoAction final : public SdUndoAction
public:
SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer,
- const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
- const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
+ OUString aOldLayerName, OUString aOldLayerTitle, OUString aOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
+ OUString aNewLayerName, OUString aNewLayerTitle, OUString aNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
virtual void Undo() override;
virtual void Redo() override;
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 9248642bf377..4dd1979d2b30 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -57,8 +57,8 @@ class RenameLayoutTemplateUndoAction final : public SdUndoAction
public:
RenameLayoutTemplateUndoAction(
SdDrawDocument* pDocument,
- const OUString& rOldLayoutName,
- const OUString& rNewLayoutName);
+ OUString aOldLayoutName,
+ OUString aNewLayoutName);
virtual void Undo() override;
virtual void Redo() override;
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index f586969bc7b9..e9031c66c57c 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -30,6 +30,7 @@
#include <comphelper/compbase.hxx>
#include <rtl/ref.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <utility>
#include <vcl/window.hxx>
using namespace ::com::sun::star;
@@ -51,7 +52,7 @@ class PresenterCustomSprite final
{
public:
PresenterCustomSprite (
- const rtl::Reference<PresenterCanvas>& rpCanvas,
+ rtl::Reference<PresenterCanvas> pCanvas,
const Reference<rendering::XCustomSprite>& rxSprite,
const Reference<awt::XWindow>& rxBaseWindow);
PresenterCustomSprite(const PresenterCustomSprite&) = delete;
@@ -690,10 +691,10 @@ void PresenterCanvas::ThrowIfDisposed()
//===== PresenterCustomSprite =================================================
PresenterCustomSprite::PresenterCustomSprite (
- const rtl::Reference<PresenterCanvas>& rpCanvas,
+ rtl::Reference<PresenterCanvas> pCanvas,
const Reference<rendering::XCustomSprite>& rxSprite,
const Reference<awt::XWindow>& rxBaseWindow)
- : mpCanvas(rpCanvas),
+ : mpCanvas(std::move(pCanvas)),
mxSprite(rxSprite),
mxBaseWindow(rxBaseWindow),
maPosition(0,0)
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 0166bd1665f0..492f51380e7b 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/presentation/XSlideShowController.hpp>
#include <com/sun/star/presentation/XPresentationPage.hpp>
#include <com/sun/star/text/XTextRange.hpp>
+#include <utility>
using namespace ::sd;
using namespace ::osl;
@@ -40,10 +41,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
ImagePreparer::ImagePreparer(
- const uno::Reference<presentation::XSlideShowController>& rxController,
+ uno::Reference<presentation::XSlideShowController> _xController,
Transmitter *aTransmitter )
: Timer("sd ImagePreparer"),
- xController( rxController ),
+ xController(std::move( _xController )),
pTransmitter( aTransmitter )
{
SAL_INFO( "sdremote", "ImagePreparer - start" );
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 146eba073b1e..10c282ccd75d 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -21,9 +21,8 @@ class ImagePreparer : private Timer
{
sal_uInt32 mnSendingSlide;
public:
- ImagePreparer( const
- css::uno::Reference<css::presentation::XSlideShowController>&
- rxController, sd::Transmitter *aTransmitter );
+ ImagePreparer( css::uno::Reference<css::presentation::XSlideShowController> xController,
+ sd::Transmitter *aTransmitter );
virtual ~ImagePreparer() override;
private:
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index 3753ed9b59e0..8f92da26518f 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -8,6 +8,7 @@
*/
#include <sal/log.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include "Communicator.hxx"
@@ -20,9 +21,9 @@
using namespace sd;
using namespace ::com::sun::star::presentation;
-Listener::Listener( const ::rtl::Reference<Communicator>& rCommunicator,
+Listener::Listener( ::rtl::Reference<Communicator> xCommunicator,
sd::Transmitter *aTransmitter ):
- mCommunicator( rCommunicator ),
+ mCommunicator(std::move( xCommunicator )),
pTransmitter( nullptr )
{
pTransmitter = aTransmitter;
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index 58d7483f60b5..eb75ab44b766 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -28,7 +28,7 @@ class Listener
: public comphelper::WeakComponentImplHelper< css::presentation::XSlideShowListener >
{
public:
- Listener( const ::rtl::Reference<Communicator>& rServer, sd::Transmitter *aTransmitter );
+ Listener( ::rtl::Reference<Communicator> xServer, sd::Transmitter *aTransmitter );
virtual ~Listener() override;
void init( const css::uno::Reference< css::presentation::XSlideShowController >& aController );
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 53bf0352c74b..962afbe5f9c2 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -8,6 +8,7 @@
*/
#include <algorithm>
+#include <utility>
#include <vector>
#include <officecfg/Office/Impress.hxx>
@@ -55,10 +56,10 @@ namespace sd {
ClientInfoInternal( const OUString& rName,
BufferedStreamSocket *pSocket,
- const OUString& rPin ):
+ OUString aPin ):
ClientInfo( rName, false ),
mpStreamSocket( pSocket ),
- mPin( rPin ) {}
+ mPin(std::move( aPin )) {}
};
}
diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx
index a595d0b58bf1..98abe410853e 100644
--- a/sd/source/ui/remotecontrol/ZeroconfService.hxx
+++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx
@@ -10,6 +10,7 @@
#define ZEROCONF_SERVICE
#include <string>
+#include <utility>
/**
* The port used by LO's custom remote server discovery protocol.
@@ -32,8 +33,8 @@ namespace sd{
uint port;
public:
- explicit ZeroconfService(const std::string& aname, uint aport)
- :name(aname), port(aport){}
+ explicit ZeroconfService(std::string aname, uint aport)
+ :name(std::move(aname)), port(aport){}
virtual ~ZeroconfService(){}
const std::string& getName() const {return name;}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 23521df0ef89..26d26d507715 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -49,6 +49,7 @@
#include <svl/cjkoptions.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
+#include <utility>
#include <vcl/commandevent.hxx>
#include <vcl/image.hxx>
#include <xmloff/autolayout.hxx>
@@ -157,13 +158,13 @@ public:
LayoutMenu::LayoutMenu (
weld::Widget* pParent,
ViewShellBase& rViewShellBase,
- const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
+ css::uno::Reference<css::ui::XSidebar> xSidebar)
: PanelLayout( pParent, "LayoutPanel", "modules/simpress/ui/layoutpanel.ui" ),
mrBase(rViewShellBase),
mxLayoutValueSet(new LayoutValueSet(*this)),
mxLayoutValueSetWin(new weld::CustomWeld(*m_xBuilder, "layoutvalueset", *mxLayoutValueSet)),
mbIsMainViewChangePending(false),
- mxSidebar(rxSidebar),
+ mxSidebar(std::move(xSidebar)),
mbIsDisposed(false)
{
implConstruct( *mrBase.GetDocument()->GetDocSh() );
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 4cc9168585d1..d24b7386e0b8 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -62,7 +62,7 @@ public:
the view shell of the task pane.
*/
LayoutMenu(weld::Widget* pParent, ViewShellBase& rViewShellBase,
- const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
+ css::uno::Reference<css::ui::XSidebar> xSidebar);
virtual ~LayoutMenu() override;
void Dispose();
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index 785536daad79..164e18595b6f 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
@@ -27,6 +27,7 @@
#include <sfx2/app.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/thumbnailview.hxx>
+#include <utility>
#include <vcl/image.hxx>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
@@ -73,8 +74,8 @@ bool PagePreviewProvider::NeedsPageObject()
//===== TemplatePreviewProvider ===============================================
-TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL)
- : msURL(rsURL)
+TemplatePreviewProvider::TemplatePreviewProvider (OUString sURL)
+ : msURL(std::move(sURL))
{
}
@@ -98,8 +99,8 @@ bool TemplatePreviewProvider::NeedsPageObject()
//===== TemplatePageObjectProvider =============================================
-TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL)
- : msURL(rsURL)
+TemplatePageObjectProvider::TemplatePageObjectProvider (OUString sURL)
+ : msURL(std::move(sURL))
{
}
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
index b76076e15e71..672644a9f6b2 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
@@ -117,7 +117,7 @@ private:
class TemplatePageObjectProvider : public PageObjectProvider
{
public:
- explicit TemplatePageObjectProvider(const OUString& rsURL);
+ explicit TemplatePageObjectProvider(OUString sURL);
virtual ~TemplatePageObjectProvider(){};
virtual SdPage* operator()(SdDrawDocument* pDocument) override;
virtual int GetCostIndex() override;
@@ -134,7 +134,7 @@ private:
class TemplatePreviewProvider : public PreviewProvider
{
public:
- explicit TemplatePreviewProvider(const OUString& rsURL);
+ explicit TemplatePreviewProvider(OUString sURL);
virtual ~TemplatePreviewProvider(){};
virtual Image operator()(int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) override;
virtual int GetCostIndex() override;
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 229f3d9728c8..e65d1861d90f 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -23,6 +23,7 @@
#include <tools/IdleDetection.hxx>
#include <set>
+#include <utility>
namespace sd::sidebar {
@@ -37,8 +38,8 @@ sal_uInt32 MasterPageContainerQueue::snWaitForMoreRequestsCount(15);
class MasterPageContainerQueue::PreviewCreationRequest
{
public:
- PreviewCreationRequest (const SharedMasterPageDescriptor& rpDescriptor, int nPriority)
- : mpDescriptor(rpDescriptor),
+ PreviewCreationRequest (SharedMasterPageDescriptor pDescriptor, int nPriority)
+ : mpDescriptor(std::move(pDescriptor)),
mnPriority(nPriority)
{}
SharedMasterPageDescriptor mpDescriptor;
@@ -91,8 +92,8 @@ MasterPageContainerQueue* MasterPageContainerQueue::Create (
}
MasterPageContainerQueue::MasterPageContainerQueue (
- const std::weak_ptr<ContainerAdapter>& rpContainer)
- : mpWeakContainer(rpContainer),
+ std::weak_ptr<ContainerAdapter> pContainer)
+ : mpWeakContainer(std::move(pContainer)),
mpRequestQueue(new RequestQueue()),
maDelayedPreviewCreationTimer("sd MasterPageContainerQueue maDelayedPreviewCreationTimer"),
mnRequestsServedCount(0)
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 6b9b0adca2f4..d121bf2fcc86 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -115,7 +115,7 @@ private:
*/
static sal_uInt32 snWaitForMoreRequestsCount;
- explicit MasterPageContainerQueue (const std::weak_ptr<ContainerAdapter>& rpContainer);
+ explicit MasterPageContainerQueue (std::weak_ptr<ContainerAdapter> pContainer);
void LateInit();
/** Calculate the priority that defines the order in which requests
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index 2c0c23eb780c..549e6c25bd83 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -26,6 +26,7 @@
#include <sdpage.hxx>
#include <tools/urlobj.hxx>
#include <sal/log.hxx>
+#include <utility>
namespace sd::sidebar {
@@ -35,21 +36,21 @@ MasterPageDescriptor::MasterPageDescriptor (
MasterPageContainer::Origin eOrigin,
const sal_Int32 nTemplateIndex,
std::u16string_view rsURL,
- const OUString& rsPageName,
- const OUString& rsStyleName,
+ OUString sPageName,
+ OUString sStyleName,
const bool bIsPrecious,
- const std::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
- const std::shared_ptr<PreviewProvider>& rpPreviewProvider)
+ std::shared_ptr<PageObjectProvider> pPageObjectProvider,
+ std::shared_ptr<PreviewProvider> pPreviewProvider)
: maToken(MasterPageContainer::NIL_TOKEN),
meOrigin(eOrigin),
msURL(INetURLObject(rsURL).GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)),
- msPageName(rsPageName),
- msStyleName(rsStyleName),
+ msPageName(std::move(sPageName)),
+ msStyleName(std::move(sStyleName)),
mbIsPrecious(bIsPrecious),
mpMasterPage(nullptr),
mpSlide(nullptr),
- mpPreviewProvider(rpPreviewProvider),
- mpPageObjectProvider(rpPageObjectProvider),
+ mpPreviewProvider(std::move(pPreviewProvider)),
+ mpPageObjectProvider(std::move(pPageObjectProvider)),
mnTemplateIndex(nTemplateIndex),
meURLClassification(URLCLASS_UNDETERMINED),
mnUseCount(0)
@@ -258,8 +259,8 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati
//===== URLComparator =========================================================
-MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL)
- : msURL(sURL)
+MasterPageDescriptor::URLComparator::URLComparator (OUString sURL)
+ : msURL(std::move(sURL))
{
}
@@ -274,8 +275,8 @@ bool MasterPageDescriptor::URLComparator::operator() (
// ===== StyleNameComparator ==================================================
-MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString& sStyleName)
- : msStyleName(sStyleName)
+MasterPageDescriptor::StyleNameComparator::StyleNameComparator (OUString sStyleName)
+ : msStyleName(std::move(sStyleName))
{
}
@@ -306,8 +307,8 @@ bool MasterPageDescriptor::PageObjectComparator::operator() (
//===== AllComparator =========================================================
-MasterPageDescriptor::AllComparator::AllComparator(const SharedMasterPageDescriptor& rDescriptor)
- : mpDescriptor(rDescriptor)
+MasterPageDescriptor::AllComparator::AllComparator(SharedMasterPageDescriptor aDescriptor)
+ : mpDescriptor(std::move(aDescriptor))
{
}
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 62717e528221..24e77e65bda4 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -43,11 +43,11 @@ public:
MasterPageContainer::Origin eOrigin,
const sal_Int32 nTemplateIndex,
std::u16string_view rURL,
- const OUString& rPageName,
- const OUString& rStyleName,
+ OUString sPageName,
+ OUString sStyleName,
const bool bIsPrecious,
- const std::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
- const std::shared_ptr<PreviewProvider>& rpPreviewProvider);
+ std::shared_ptr<PageObjectProvider> pPageObjectProvider,
+ std::shared_ptr<PreviewProvider> pPreviewProvider);
void SetToken (MasterPageContainer::Token aToken);
@@ -204,12 +204,12 @@ public:
class URLComparator { public:
OUString msURL;
- explicit URLComparator (const OUString& sURL);
+ explicit URLComparator (OUString sURL);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class StyleNameComparator { public:
OUString msStyleName;
- explicit StyleNameComparator (const OUString& sStyleName);
+ explicit StyleNameComparator (OUString sStyleName);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class PageObjectComparator { public:
@@ -218,7 +218,7 @@ public:
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class AllComparator { public:
- explicit AllComparator(const SharedMasterPageDescriptor& rDescriptor);
+ explicit AllComparator(SharedMasterPageDescriptor aDescriptor);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
private:
SharedMasterPageDescriptor mpDescriptor;
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 979726910a19..884a955c1bc2 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -54,17 +54,17 @@ MasterPagesSelector::MasterPagesSelector (
weld::Widget* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
- const css::uno::Reference<css::ui::XSidebar>& rxSidebar,
+ std::shared_ptr<MasterPageContainer> pContainer,
+ css::uno::Reference<css::ui::XSidebar> xSidebar,
const OUString& rUIFileName,
const OString& rValueSetName)
: PanelLayout( pParent, "MasterPagePanel", rUIFileName ),
- mpContainer(rpContainer),
+ mpContainer(std::move(pContainer)),
mxPreviewValueSet(new PreviewValueSet),
mxPreviewValueSetWin(new weld::CustomWeld(*m_xBuilder, rValueSetName, *mxPreviewValueSet)),
mrDocument(rDocument),
mrBase(rBase),
- mxSidebar(rxSidebar)
+ mxSidebar(std::move(xSidebar))
{
mxPreviewValueSet->SetSelectHdl (
LINK(this, MasterPagesSelector, ClickHandler));
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 1b69327892b9..5709bd6d4482 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -50,8 +50,8 @@ public:
weld::Widget* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
- const css::uno::Reference<css::ui::XSidebar>& rxSidebar,
+ std::shared_ptr<MasterPageContainer> pContainer,
+ css::uno::Reference<css::ui::XSidebar> xSidebar,
const OUString& rUIFileName,
const OString& rValueSetName);
virtual ~MasterPagesSelector() override;
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index e95e66ccbeba..7172df6b8660 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -21,6 +21,7 @@
#include <tools/SdGlobalResourceContainer.hxx>
#include <tools/link.hxx>
+#include <utility>
#include <vector>
#include "MasterPageContainer.hxx"
@@ -55,9 +56,9 @@ private:
OUString msName;
::sd::sidebar::MasterPageContainer::Token maToken;
Descriptor (::sd::sidebar::MasterPageContainer::Token aToken,
- const OUString& rsURL, const OUString& rsName)
- : msURL(rsURL),
- msName(rsName),
+ OUString sURL, OUString sName)
+ : msURL(std::move(sURL)),
+ msName(std::move(sName)),
maToken(aToken)
{}
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 89c16e0d6fc2..bcd564e7bbc1 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -57,6 +57,7 @@
#include <sfx2/sidebar/Panel.hxx>
#include <EventMultiplexer.hxx>
#include <unotools/localedatawrapper.hxx>
+#include <utility>
#include <vcl/EnumContext.hxx>
#include <vcl/svapp.hxx>
@@ -88,7 +89,7 @@ enum eFillStyle
SlideBackground::SlideBackground(
weld::Widget* pParent,
ViewShellBase& rBase,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ css::uno::Reference<css::frame::XFrame> xFrame,
SfxBindings* pBindings) :
PanelLayout( pParent, "SlideBackgroundPanel", "modules/simpress/ui/sidebarslidebackground.ui" ),
mrBase( rBase ),
@@ -127,7 +128,7 @@ SlideBackground::SlideBackground(
mpPageItem( new SvxPageItem(SID_ATTR_PAGE) ),
mbSwitchModeToNormal(false),
mbSwitchModeToMaster(false),
- mxFrame(rxFrame),
+ mxFrame(std::move(xFrame)),
maDrawOtherContext(vcl::EnumContext::Application::Draw, vcl::EnumContext::Context::DrawPage),
maDrawMasterContext(vcl::EnumContext::Application::Draw, vcl::EnumContext::Context::MasterPage),
maImpressOtherContext(vcl::EnumContext::Application::Impress, vcl::EnumContext::Context::DrawPage),
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 25af0a4af24b..f7599f0c9ab0 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -52,7 +52,7 @@ public:
SlideBackground(
weld::Widget* pParent,
ViewShellBase& rBase,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ css::uno::Reference<css::frame::XFrame> xFrame,
SfxBindings* pBindings );
virtual ~SlideBackground() override;
SfxBindings* GetBindings() { return mpBindings; }
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index b8c61ba48515..639d80c32e87 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -28,6 +28,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/svxids.hrc>
+#include <utility>
#include <vcl/svapp.hxx>
#include <functional>
@@ -39,10 +40,10 @@ using ::sd::framework::FrameworkHelper;
namespace sd {
SlideShowRestarter::SlideShowRestarter (
- const ::rtl::Reference<SlideShow>& rpSlideShow,
+ ::rtl::Reference<SlideShow> pSlideShow,
ViewShellBase* pViewShellBase)
: mnEventId(nullptr),
- mpSlideShow(rpSlideShow),
+ mpSlideShow(std::move(pSlideShow)),
mpViewShellBase(pViewShellBase),
mnDisplayCount(Application::GetScreenCount()),
mpDispatcher(pViewShellBase->GetViewFrame()->GetDispatcher()),
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index e8e97a600fa2..f8cf95c33ab9 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -55,8 +55,7 @@ public:
@param pViewShellBase
Used to get access to a slot dispatcher.
*/
- SlideShowRestarter(const ::rtl::Reference<SlideShow>& rpSlideShow,
- ViewShellBase* pViewShellBase);
+ SlideShowRestarter(::rtl::Reference<SlideShow> pSlideShow, ViewShellBase* pViewShellBase);
virtual ~SlideShowRestarter();
/** Restarting the slide show is an asynchronous multi step process
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 35c0a4027f04..e793dec288c1 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -35,6 +35,7 @@
#include <strings.hrc>
#include <sal/log.hxx>
+#include <utility>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
@@ -45,7 +46,7 @@ namespace sd {
const sal_uInt64 HIDE_MOUSE_TIMEOUT = 10000;
const sal_uInt64 SHOW_MOUSE_TIMEOUT = 1000;
-ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vcl::Window* pParent )
+ShowWindow::ShowWindow( ::rtl::Reference< SlideshowImpl > xController, vcl::Window* pParent )
: ::sd::Window( pParent )
, maPauseTimer("sd ShowWindow maPauseTimer")
, maMouseTimer("sd ShowWindow maMouseTimer")
@@ -56,7 +57,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc
, mbMouseAutoHide(true)
, mbMouseCursorHidden(false)
, mnFirstMouseMove(0)
-, mxController( xController )
+, mxController(std::move( xController ))
{
GetOutDev()->SetOutDevViewType( OutDevViewType::SlideShow );
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index f0f88228b8f0..c7a1d9bf0261 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -46,7 +46,7 @@ class ShowWindow
{
public:
- ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, vcl::Window* pParent );
+ ShowWindow ( ::rtl::Reference< ::sd::SlideshowImpl > xController, vcl::Window* pParent );
virtual ~ShowWindow() override;
virtual void dispose() override;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 89a8ac95f033..2e58c4640146 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -68,6 +68,7 @@
#include <bitmaps.hlst>
#include <strings.hrc>
#include <sdresid.hxx>
+#include <utility>
#include <vcl/canvastools.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/weldutils.hxx>
@@ -3131,10 +3132,10 @@ void PresentationSettingsEx::SetPropertyValue( std::u16string_view rProperty, co
// XAnimationListener
-SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow )
+SlideShowListenerProxy::SlideShowListenerProxy( rtl::Reference< SlideshowImpl > xController, css::uno::Reference< css::presentation::XSlideShow > xSlideShow )
: maListeners( m_aMutex )
-, mxController( xController )
-, mxSlideShow( xSlideShow )
+, mxController(std::move( xController ))
+, mxSlideShow(std::move( xSlideShow ))
{
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index eeec8a3fd7c5..09177762c598 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -84,7 +84,7 @@ class SlideShowListenerProxy : private ::cppu::BaseMutex,
public ::cppu::WeakImplHelper< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener >
{
public:
- SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow );
+ SlideShowListenerProxy( rtl::Reference< SlideshowImpl > xController, css::uno::Reference< css::presentation::XSlideShow > xSlideShow );
virtual ~SlideShowListenerProxy() override;
void addAsSlideShowListener();
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 79ab9fab27f8..f5fa8690af20 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -27,6 +27,7 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <com/sun/star/uno/Any.hxx>
+#include <utility>
using namespace ::com::sun::star::uno;
@@ -65,7 +66,7 @@ public:
CacheCompactionByCompression (
::sd::slidesorter::cache::BitmapCache& rCache,
sal_Int32 nMaximalCacheSize,
- const std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor);
+ std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> pCompressor);
protected:
virtual void Run() override;
@@ -156,9 +157,9 @@ namespace {
CacheCompactionByCompression::CacheCompactionByCompression (
::sd::slidesorter::cache::BitmapCache& rCache,
sal_Int32 nMaximalCacheSize,
- const std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor)
+ std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> pCompressor)
: CacheCompactor(rCache,nMaximalCacheSize),
- mpCompressor(rpCompressor)
+ mpCompressor(std::move(pCompressor))
{
}
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 45afd93c96f3..465bb6c992b5 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -25,6 +25,7 @@
#include <map>
#include <memory>
#include <unordered_map>
+#include <utility>
namespace {
@@ -37,9 +38,9 @@ public:
Size maPreviewSize;
CacheDescriptor(
- ::sd::slidesorter::cache::PageCacheManager::DocumentKey const & pDocument,
+ ::sd::slidesorter::cache::PageCacheManager::DocumentKey pDocument,
const Size& rPreviewSize)
- :mpDocument(pDocument),maPreviewSize(rPreviewSize)
+ :mpDocument(std::move(pDocument)),maPreviewSize(rPreviewSize)
{}
/// Test for equality with respect to all members.
class Equal {public: bool operator() (
@@ -64,8 +65,8 @@ public:
RecentlyUsedCacheDescriptor(
const Size& rPreviewSize,
- const std::shared_ptr< ::sd::slidesorter::cache::BitmapCache>& rpCache)
- :maPreviewSize(rPreviewSize),mpCache(rpCache)
+ std::shared_ptr< ::sd::slidesorter::cache::BitmapCache> pCache)
+ :maPreviewSize(rPreviewSize),mpCache(std::move(pCache))
{}
};
@@ -120,8 +121,8 @@ public:
address only.
*/
class CompareWithCache { public:
- explicit CompareWithCache(const std::shared_ptr<BitmapCache>& rpCache)
- : mpCache(rpCache) {}
+ explicit CompareWithCache(std::shared_ptr<BitmapCache> pCache)
+ : mpCache(std::move(pCache)) {}
bool operator () (const PageCacheContainer::value_type& rValue) const
{ return rValue.second == mpCache; }
private:
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 077c48709de6..bb57bacd9031 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -23,6 +23,7 @@
#include <sdpage.hxx>
#include <comphelper/profilezone.hxx>
+#include <utility>
#include <tools/diagnose_ex.h>
namespace sd::slidesorter::cache {
@@ -31,16 +32,16 @@ namespace sd::slidesorter::cache {
QueueProcessor::QueueProcessor (
RequestQueue& rQueue,
- const std::shared_ptr<BitmapCache>& rpCache,
+ std::shared_ptr<BitmapCache> pCache,
const Size& rPreviewSize,
const bool bDoSuperSampling,
- const SharedCacheContext& rpCacheContext)
+ SharedCacheContext pCacheContext)
: maTimer("sd::QueueProcessor maTimer"),
maPreviewSize(rPreviewSize),
mbDoSuperSampling(bDoSuperSampling),
- mpCacheContext(rpCacheContext),
+ mpCacheContext(std::move(pCacheContext)),
mrQueue(rQueue),
- mpCache(rpCache),
+ mpCache(std::move(pCache)),
mbIsPaused(false)
{
maTimer.SetInvokeHandler (LINK(this,QueueProcessor,ProcessRequestHdl));
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 0035bcbce7e1..70ea8d5b3eb3 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -41,10 +41,10 @@ class QueueProcessor final
public:
QueueProcessor (
RequestQueue& rQueue,
- const std::shared_ptr<BitmapCache>& rpCache,
+ std::shared_ptr<BitmapCache> pCache,
const Size& rPreviewSize,
const bool bDoSuperSampling,
- const SharedCacheContext& rpCacheContext);
+ SharedCacheContext pCacheContext);
~QueueProcessor();
/** Start the processor. This implementation is timer based and waits
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 931c1a8f6ce1..a0dcc9f0cb42 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -24,6 +24,7 @@
#include <svx/svdpage.hxx>
#include <set>
+#include <utility>
namespace sd::slidesorter::cache {
@@ -91,9 +92,9 @@ class RequestQueue::Container
//===== GenericRequestQueue =================================================
-RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext)
+RequestQueue::RequestQueue (SharedCacheContext pCacheContext)
: mpRequestQueue(new Container),
- mpCacheContext(rpCacheContext),
+ mpCacheContext(std::move(pCacheContext)),
mnMinimumPriority(0),
mnMaximumPriority(1)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 618ba5801b99..d9a94c862f79 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -34,7 +34,7 @@ namespace sd::slidesorter::cache
class RequestQueue : public sdr::PageUser
{
public:
- explicit RequestQueue(const SharedCacheContext& rpCacheContext);
+ explicit RequestQueue(SharedCacheContext pCacheContext);
virtual ~RequestQueue();
/** Insert a request with highest or lowest priority in its priority
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index b400ec4dc49f..eb04eceb7831 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -18,6 +18,7 @@
*/
#include <controller/SlsAnimator.hxx>
+#include <utility>
#include <view/SlideSorterView.hxx>
#include <osl/diagnose.h>
@@ -30,12 +31,12 @@ class Animator::Animation
{
public:
Animation (
- const Animator::AnimationFunctor& rAnimation,
+ Animator::AnimationFunctor aAnimation,
const double nStartOffset,
const double nDuration,
const double nGlobalTime,
const Animator::AnimationId nAnimationId,
- const Animator::FinishFunctor& rFinishFunctor);
+ Animator::FinishFunctor aFinishFunctor);
/** Run next animation step. If animation has reached its end it is
expired.
*/
@@ -222,14 +223,14 @@ IMPL_LINK_NOARG(Animator, TimeoutHandler, Timer *, void)
//===== Animator::Animation ===================================================
Animator::Animation::Animation (
- const Animator::AnimationFunctor& rAnimation,
+ Animator::AnimationFunctor aAnimation,
const double nStartOffset,
const double nDuration,
const double nGlobalTime,
const Animator::AnimationId nId,
- const Animator::FinishFunctor& rFinishFunctor)
- : maAnimation(rAnimation),
- maFinishFunctor(rFinishFunctor),
+ Animator::FinishFunctor aFinishFunctor)
+ : maAnimation(std::move(aAnimation)),
+ maFinishFunctor(std::move(aFinishFunctor)),
mnAnimationId(nId),
mnDuration(nDuration),
mnEnd(nGlobalTime + nDuration + nStartOffset),
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 160077e6426d..90fa0b7d7399 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -28,6 +28,7 @@
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageDescriptor.hxx>
#include <model/SlsPageEnumerationProvider.hxx>
+#include <utility>
#include <view/SlideSorterView.hxx>
#include <controller/SlideSorterController.hxx>
#include <controller/SlsInsertionIndicatorHandler.hxx>
@@ -102,9 +103,9 @@ class Clipboard::UndoContext
public:
UndoContext (
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpMainViewShell)
+ std::shared_ptr<ViewShell> pMainViewShell)
: mpDocument(pDocument),
- mpMainViewShell(rpMainViewShell)
+ mpMainViewShell(std::move(pMainViewShell))
{
if (mpDocument!=nullptr && mpDocument->IsUndoEnabled())
{
diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index ff1a05ef1b30..dafeef5a5627 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -18,6 +18,7 @@
*/
#include <controller/SlsInsertionIndicatorHandler.hxx>
+#include <utility>
#include <view/SlideSorterView.hxx>
#include <view/SlsLayouter.hxx>
#include <view/SlsInsertAnimator.hxx>
@@ -227,8 +228,8 @@ bool InsertionIndicatorHandler::IsInsertionTrivial (const sal_Int8 nDndAction)
//===== InsertionIndicatorHandler::ForceShowContext ===========================
InsertionIndicatorHandler::ForceShowContext::ForceShowContext (
- const std::shared_ptr<InsertionIndicatorHandler>& rpHandler)
- : mpHandler(rpHandler)
+ std::shared_ptr<InsertionIndicatorHandler> pHandler)
+ : mpHandler(std::move(pHandler))
{
mpHandler->ForceShow();
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
index 43f2d2f6a514..3109288822c8 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
@@ -60,7 +60,7 @@ public:
class ForceShowContext
{
public:
- ForceShowContext (const std::shared_ptr<InsertionIndicatorHandler>& rpHandler);
+ ForceShowContext (std::shared_ptr<InsertionIndicatorHandler> pHandler);
~ForceShowContext() COVERITY_NOEXCEPT_FALSE;
private:
const std::shared_ptr<InsertionIndicatorHandler> mpHandler;
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index a67f057e7e19..a0a3db221ded 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -36,7 +36,7 @@ class PageEnumerationImpl
public:
PageEnumerationImpl (
const SlideSorterModel& rModel,
- const PageEnumeration::PagePredicate& rPredicate);
+ PageEnumeration::PagePredicate aPredicate);
PageEnumerationImpl(const PageEnumerationImpl&) = delete;
PageEnumerationImpl& operator=(const PageEnumerationImpl&) = delete;
/** Create a copy of the called enumeration object.
@@ -58,7 +58,7 @@ private:
*/
PageEnumerationImpl (
const SlideSorterModel& rModel,
- const PageEnumeration::PagePredicate& rPredicate,
+ PageEnumeration::PagePredicate aPredicate,
int nIndex);
/** Skip all elements that do not fulfill Predicate starting with the
@@ -129,9 +129,9 @@ namespace {
PageEnumerationImpl::PageEnumerationImpl (
const SlideSorterModel& rModel,
- const PageEnumeration::PagePredicate& rPredicate)
+ PageEnumeration::PagePredicate aPredicate)
: mrModel(rModel),
- maPredicate(rPredicate),
+ maPredicate(std::move(aPredicate)),
mnIndex(0)
{
Rewind();
@@ -139,10 +139,10 @@ PageEnumerationImpl::PageEnumerationImpl (
PageEnumerationImpl::PageEnumerationImpl (
const SlideSorterModel& rModel,
- const PageEnumeration::PagePredicate& rPredicate,
+ PageEnumeration::PagePredicate aPredicate,
int nIndex)
: mrModel(rModel),
- maPredicate(rPredicate),
+ maPredicate(std::move(aPredicate)),
mnIndex(nIndex)
{
}
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index b41bbe307a9c..4bd3808992e0 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -20,6 +20,7 @@
#include "SlsLayeredDevice.hxx"
#include <Window.hxx>
+#include <utility>
#include <vcl/virdev.hxx>
#include <sal/log.hxx>
#include <o3tl/safeint.hxx>
@@ -39,10 +40,10 @@ class LayerInvalidator : public ILayerInvalidator
{
public:
LayerInvalidator (
- const std::shared_ptr<LayeredDevice>& rpLayeredDevice,
+ std::shared_ptr<LayeredDevice> pLayeredDevice,
sd::Window *pTargetWindow,
const int nLayer)
- : mpLayeredDevice(rpLayeredDevice),
+ : mpLayeredDevice(std::move(pLayeredDevice)),
mpTargetWindow(pTargetWindow),
mnLayer(nLayer)
{
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 21f0be13cb32..8bc0daf3f5e9 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <utility>
#include <view/SlsPageObjectLayouter.hxx>
#include <view/SlsTheme.hxx>
#include <view/SlsLayouter.hxx>
@@ -202,7 +203,7 @@ public:
protected:
Implementation (
sd::Window *pWindow,
- const std::shared_ptr<view::Theme>& rpTheme);
+ std::shared_ptr<view::Theme> pTheme);
explicit Implementation (const Implementation& rImplementation);
virtual void CalculateRowAndColumnCount (const Size& rWindowSize) = 0;
@@ -428,7 +429,7 @@ Layouter::Implementation* Layouter::Implementation::Create (
Layouter::Implementation::Implementation (
sd::Window *pWindow,
- const std::shared_ptr<view::Theme>& rpTheme)
+ std::shared_ptr<view::Theme> pTheme)
: mpWindow(pWindow),
mnLeftBorder(5),
mnRightBorder(5),
@@ -445,7 +446,7 @@ Layouter::Implementation::Implementation (
mnMaxColumnCount(0),
mnMaxRowCount(0),
maPageObjectSize(1,1),
- mpTheme(rpTheme)
+ mpTheme(std::move(pTheme))
{
}
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index ae1f2233f91f..bfd2e2fae549 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -22,6 +22,7 @@
#include <tools/time.hxx>
#include <sal/log.hxx>
#include <memory>
+#include <utility>
namespace sd::tools {
@@ -80,10 +81,10 @@ void TimerBasedTaskExecution::ReleaseTask (
}
TimerBasedTaskExecution::TimerBasedTaskExecution (
- const std::shared_ptr<AsynchronousTask>& rpTask,
+ std::shared_ptr<AsynchronousTask> pTask,
sal_uInt32 nMillisecondsBetweenSteps,
sal_uInt32 nMaxTimePerStep)
- : mpTask(rpTask),
+ : mpTask(std::move(pTask)),
maTimer("sd TimerBasedTaskExecution maTimer"),
mnMaxTimePerStep(nMaxTimePerStep)
{
diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx
index afd130ee20cc..403aa8555ca1 100644
--- a/sd/source/ui/uitest/uiobject.cxx
+++ b/sd/source/ui/uitest/uiobject.cxx
@@ -18,13 +18,14 @@
#include <sfx2/sfxsids.hrc>
#include <svx/uiobject.hxx>
#include <tools/debug.hxx>
+#include <utility>
namespace
{
class ImpressSdrObject : public SdrUIObject
{
public:
- ImpressSdrObject(const VclPtr<sd::Window>& xImpressWin, const OUString& rName);
+ ImpressSdrObject(const VclPtr<sd::Window>& xImpressWin, OUString aName);
SdrObject* get_object() override;
@@ -69,9 +70,9 @@ SdrObject* getObject(const VclPtr<sd::Window>& xWindow, std::u16string_view rNam
}
}
-ImpressSdrObject::ImpressSdrObject(const VclPtr<sd::Window>& xImpressWin, const OUString& rName)
+ImpressSdrObject::ImpressSdrObject(const VclPtr<sd::Window>& xImpressWin, OUString aName)
: mxWindow(xImpressWin)
- , maName(rName)
+ , maName(std::move(aName))
{
}
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 3ac777b3522a..80b5a2beb27c 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <utility>
#include <vcl/svapp.hxx>
#include <svx/svdobj.hxx>
@@ -60,8 +61,8 @@ class SearchContext_impl
sal_Int32 mnIndex;
public:
- SearchContext_impl(uno::Reference<drawing::XShapes> const& xShapes)
- : mxShapes( xShapes ), mnIndex( -1 ) {}
+ SearchContext_impl(uno::Reference<drawing::XShapes> xShapes)
+ : mxShapes(std::move( xShapes )), mnIndex( -1 ) {}
uno::Reference< drawing::XShape > firstShape()
{
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 8764afd0f85c..7c21f23c9fae 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -53,6 +53,7 @@
#include <svx/xlnclit.hxx>
#include <toolkit/awt/vclxdevice.hxx>
#include <unotools/localedatawrapper.hxx>
+#include <utility>
#include <vcl/print.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -687,7 +688,7 @@ namespace {
const PageKind ePageKind,
const MapMode& rMapMode,
const bool bPrintMarkedOnly,
- const OUString& rsPageString,
+ OUString sPageString,
const Point& rPageStringOffset,
const DrawModeFlags nDrawMode,
const Orientation eOrientation,
@@ -695,7 +696,7 @@ namespace {
: mePageKind(ePageKind),
maMap(rMapMode),
mbPrintMarkedOnly(bPrintMarkedOnly),
- msPageString(rsPageString),
+ msPageString(std::move(sPageString)),
maPageStringOffset(rPageStringOffset),
mnDrawMode(nDrawMode),
meOrientation(eOrientation),
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 8cdb29330e6e..c2453b622119 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -27,6 +27,7 @@
#include <drawdoc.hxx>
#include <DrawViewShell.hxx>
#include <sdpage.hxx>
+#include <utility>
namespace sd::outliner {
@@ -359,10 +360,10 @@ IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument,
}
IteratorImplBase::IteratorImplBase( SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ std::weak_ptr<ViewShell> pViewShellWeak,
bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode)
: mpDocument (pDocument)
-, mpViewShellWeak (rpViewShellWeak)
+, mpViewShellWeak (std::move(pViewShellWeak))
, mbDirectionIsForward (bDirectionIsForward)
{
maPosition.mePageKind = ePageKind;
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 0bb0f9528cb1..23587872fd8c 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -40,6 +40,7 @@
#include <svx/fontworkbar.hxx>
#include <tools/debug.hxx>
#include <tools/link.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
@@ -186,8 +187,8 @@ class ToolBarRules
{
public:
ToolBarRules (
- const std::shared_ptr<ToolBarManager>& rpToolBarManager,
- const std::shared_ptr<ViewShellManager>& rpViewShellManager);
+ std::shared_ptr<ToolBarManager> pToolBarManager,
+ std::shared_ptr<ViewShellManager> pViewShellManager);
/** This method calls MainViewShellChanged() and SelectionHasChanged()
for the current main view shell and its view.
@@ -245,7 +246,7 @@ public:
*/
Implementation (
ViewShellBase& rBase,
- const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ std::shared_ptr<sd::tools::EventMultiplexer> pMultiplexer,
const std::shared_ptr<ViewShellManager>& rpViewShellManager,
const std::shared_ptr<ToolBarManager>& rpToolBarManager);
~Implementation();
@@ -496,11 +497,11 @@ void ToolBarManager::ToolBarsDestroyed()
ToolBarManager::Implementation::Implementation (
ViewShellBase& rBase,
- const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ std::shared_ptr<sd::tools::EventMultiplexer> pMultiplexer,
const std::shared_ptr<ViewShellManager>& rpViewShellManager,
const std::shared_ptr<ToolBarManager>& rpToolBarManager)
: mrBase(rBase),
- mpEventMultiplexer(rpMultiplexer),
+ mpEventMultiplexer(std::move(pMultiplexer)),
mbIsValid(false),
mnLockCount(0),
mbPreUpdatePending(false),
@@ -916,10 +917,10 @@ LayouterLock::~LayouterLock()
//===== ToolBarRules ==========================================================
ToolBarRules::ToolBarRules (
- const std::shared_ptr<sd::ToolBarManager>& rpToolBarManager,
- const std::shared_ptr<sd::ViewShellManager>& rpViewShellManager)
- : mpToolBarManager(rpToolBarManager),
- mpViewShellManager(rpViewShellManager)
+ std::shared_ptr<sd::ToolBarManager> pToolBarManager,
+ std::shared_ptr<sd::ViewShellManager> pViewShellManager)
+ : mpToolBarManager(std::move(pToolBarManager)),
+ mpViewShellManager(std::move(pViewShellManager))
{
}
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 18a408e83956..ab1a9ce9b1e9 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -25,6 +25,7 @@
#include <DrawController.hxx>
#include <Client.hxx>
+#include <utility>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -510,10 +511,10 @@ void ViewTabBar::UpdateTabBarButtons()
TabBarControl::TabBarControl (
vcl::Window* pParentWindow,
- const ::rtl::Reference<ViewTabBar>& rpViewTabBar)
+ ::rtl::Reference<ViewTabBar> pViewTabBar)
: InterimItemWindow(pParentWindow, "modules/simpress/ui/tabviewbar.ui", "TabViewBar")
, mxTabControl(m_xBuilder->weld_notebook("tabcontrol"))
- , mpViewTabBar(rpViewTabBar)
+ , mpViewTabBar(std::move(pViewTabBar))
, mnAllocatedWidth(0)
{
// Because the actual window background is transparent--to avoid
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 047a036efe00..2fdfbd13a9bb 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -34,6 +34,7 @@
#include <sdresid.hxx>
#include <unokywds.hxx>
#include <drawdoc.hxx>
+#include <utility>
ModifyPageUndoAction::ModifyPageUndoAction(
@@ -170,11 +171,11 @@ ModifyPageUndoAction::~ModifyPageUndoAction()
RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction(
SdDrawDocument* pDocument,
- const OUString& rOldLayoutName,
- const OUString& rNewLayoutName)
+ OUString aOldLayoutName,
+ OUString aNewLayoutName)
: SdUndoAction(pDocument)
- , maOldName(rOldLayoutName)
- , maNewName(rNewLayoutName)
+ , maOldName(std::move(aOldLayoutName))
+ , maNewName(std::move(aNewLayoutName))
, maComment(SdResId(STR_TITLE_RENAMESLIDE))
{
sal_Int32 nPos = maOldName.indexOf(SD_LT_SEPARATOR);