diff options
Diffstat (limited to 'svx/source')
119 files changed, 460 insertions, 369 deletions
diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index 7a70ca4d799d..8904480adc89 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -18,16 +18,17 @@ */ #include <svx/AccessibleShapeInfo.hxx> +#include <utility> namespace accessibility { AccessibleShapeInfo::AccessibleShapeInfo ( - const css::uno::Reference<css::drawing::XShape>& rxShape, - const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + css::uno::Reference<css::drawing::XShape> xShape, + css::uno::Reference<css::accessibility::XAccessible> xParent, IAccessibleParent* pChildrenManager) - : mxShape (rxShape), - mxParent (rxParent), + : mxShape (std::move(xShape)), + mxParent (std::move(xParent)), mpChildrenManager (pChildrenManager) { // empty. @@ -35,10 +36,10 @@ AccessibleShapeInfo::AccessibleShapeInfo ( AccessibleShapeInfo::AccessibleShapeInfo ( - const css::uno::Reference<css::drawing::XShape>& rxShape, - const css::uno::Reference<css::accessibility::XAccessible>& rxParent) - : mxShape (rxShape), - mxParent (rxParent), + css::uno::Reference<css::drawing::XShape> xShape, + css::uno::Reference<css::accessibility::XAccessible> xParent) + : mxShape (std::move(xShape)), + mxParent (std::move(xParent)), mpChildrenManager (nullptr) { // empty. diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 27647f70c097..f6637af3fa18 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -27,6 +27,7 @@ #include <svx/AccessibleShape.hxx> #include <svx/AccessibleShapeInfo.hxx> #include <svx/IAccessibleViewForwarder.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> @@ -66,12 +67,12 @@ void adjustIndexInParentOfShapes(ChildDescriptorListType& _rList) // AccessibleChildrenManager ChildrenManagerImpl::ChildrenManagerImpl ( - const uno::Reference<XAccessible>& rxParent, - const uno::Reference<drawing::XShapes>& rxShapeList, + uno::Reference<XAccessible> xParent, + uno::Reference<drawing::XShapes> xShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext) - : mxShapeList (rxShapeList), - mxParent (rxParent), + : mxShapeList (std::move(xShapeList)), + mxParent (std::move(xParent)), maShapeTreeInfo (rShapeTreeInfo), mrContext (rContext), mpFocusedShape(nullptr) diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 20b4ea732b22..36617291cb62 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -96,8 +96,8 @@ public: for new and deleted children, i.e. that holds a list of listeners to be informed. */ - ChildrenManagerImpl (const css::uno::Reference<css::accessibility::XAccessible>& rxParent, - const css::uno::Reference<css::drawing::XShapes>& rxShapeList, + ChildrenManagerImpl (css::uno::Reference<css::accessibility::XAccessible> xParent, + css::uno::Reference<css::drawing::XShapes> xShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext); diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index fe410914910f..ad133fa8f4bf 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XShape.hpp> +#include <utility> #include <vcl/svapp.hxx> // Includes for string resources. @@ -35,8 +36,8 @@ using namespace ::com::sun::star; namespace accessibility { -DescriptionGenerator::DescriptionGenerator(const uno::Reference<drawing::XShape>& xShape) - : mxShape(xShape) +DescriptionGenerator::DescriptionGenerator(uno::Reference<drawing::XShape> xShape) + : mxShape(std::move(xShape)) , mxSet(mxShape, uno::UNO_QUERY) , mbIsFirstProperty(true) { diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 4b1ded51ac8d..cd1e0a4d5263 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <toolkit/helper/convert.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <osl/mutex.hxx> @@ -312,10 +313,10 @@ void SvxPixelCtlAccessibleChild::SelectChild( bool bSelect) } SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild( SvxPixelCtl& rWindow, bool bPixelColorOrBG, - const tools::Rectangle& rBoundingBox, const rtl::Reference<SvxPixelCtlAccessible>& rxParent, + const tools::Rectangle& rBoundingBox, rtl::Reference<SvxPixelCtlAccessible> xParent, tools::Long nIndexInParent) : mrParentWindow( rWindow ) - , mxParent(rxParent) + , mxParent(std::move(xParent)) , m_bPixelColorOrBG(bPixelColorOrBG) , maBoundingBox( rBoundingBox ) , mnIndexInParent( nIndexInParent ) diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 5b57fd318bba..550ea079cdda 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <toolkit/helper/convert.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <tools/debug.hxx> @@ -400,12 +401,12 @@ awt::Rectangle SvxRectCtlAccessibleContext::implGetBounds() SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference<XAccessible>& rxParent, - const OUString& rName, - const OUString& rDescription, + OUString aName, + OUString aDescription, const tools::Rectangle& rBoundingBox, tools::Long nIndexInParent ) - : msDescription( rDescription ) - , msName( rName ) + : msDescription(std::move( aDescription )) + , msName(std::move( aName )) , mxParent(rxParent) , maBoundingBox( rBoundingBox ) , mnIndexInParent( nIndexInParent ) diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 3225e47f02bb..e25328b829b2 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -9,6 +9,7 @@ #include <svx/extedit.hxx> +#include <utility> #include <vcl/graph.hxx> #include <vcl/GraphicObject.hxx> #include <vcl/cvtgrf.hxx> @@ -77,9 +78,9 @@ private: virtual void execute() override; public: - explicit ExternalToolEditThread(OUString const& rFileName) + explicit ExternalToolEditThread(OUString aFileName) : ::salhelper::Thread("ExternalToolEdit") - , m_aFileName(rFileName) + , m_aFileName(std::move(aFileName)) {} }; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index f7aa223f4997..dfa8c2380616 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -41,6 +41,7 @@ #include <functional> #include <algorithm> #include <stack> +#include <utility> #include <math.h> using namespace EnhancedCustomShape; @@ -290,9 +291,9 @@ class UnaryFunctionExpression : public ExpressionNode std::shared_ptr<ExpressionNode> mpArg; public: - UnaryFunctionExpression( const ExpressionFunct eFunct, const std::shared_ptr<ExpressionNode>& rArg ) : + UnaryFunctionExpression( const ExpressionFunct eFunct, std::shared_ptr<ExpressionNode> aArg ) : meFunct( eFunct ), - mpArg( rArg ) + mpArg(std::move( aArg )) { } static double getValue( const ExpressionFunct eFunct, const std::shared_ptr<ExpressionNode>& rArg ) @@ -460,10 +461,10 @@ class BinaryFunctionExpression : public ExpressionNode public: - BinaryFunctionExpression( const ExpressionFunct eFunct, const std::shared_ptr<ExpressionNode>& rFirstArg, const std::shared_ptr<ExpressionNode>& rSecondArg ) : + BinaryFunctionExpression( const ExpressionFunct eFunct, std::shared_ptr<ExpressionNode> xFirstArg, std::shared_ptr<ExpressionNode> xSecondArg ) : meFunct( eFunct ), - mpFirstArg( rFirstArg ), - mpSecondArg( rSecondArg ) + mpFirstArg(std::move( xFirstArg )), + mpSecondArg(std::move( xSecondArg )) { } #if defined(__clang__) || (defined (__GNUC__) && __GNUC__ >= 8) @@ -686,12 +687,12 @@ class IfExpression : public ExpressionNode public: - IfExpression( const std::shared_ptr<ExpressionNode>& rFirstArg, - const std::shared_ptr<ExpressionNode>& rSecondArg, - const std::shared_ptr<ExpressionNode>& rThirdArg ) : - mpFirstArg( rFirstArg ), - mpSecondArg( rSecondArg ), - mpThirdArg( rThirdArg ) + IfExpression( std::shared_ptr<ExpressionNode> xFirstArg, + std::shared_ptr<ExpressionNode> xSecondArg, + std::shared_ptr<ExpressionNode> xThirdArg ) : + mpFirstArg(std::move( xFirstArg )), + mpSecondArg(std::move(xSecondArg )), + mpThirdArg(std::move( xThirdArg )) { } virtual bool isConstant() const override @@ -756,8 +757,8 @@ class DoubleConstantFunctor ParserContextSharedPtr mxContext; public: - explicit DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) : - mxContext( rContext ) + explicit DoubleConstantFunctor( ParserContextSharedPtr xContext ) : + mxContext(std::move( xContext )) { } void operator()( double n ) const @@ -773,9 +774,9 @@ class EnumFunctor public: - EnumFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) + EnumFunctor( const ExpressionFunct eFunct, ParserContextSharedPtr xContext ) : meFunct( eFunct ) - , mxContext( rContext ) + , mxContext(std::move( xContext )) { } void operator()( StringIteratorT rFirst, StringIteratorT rSecond ) const @@ -808,9 +809,9 @@ class UnaryFunctionFunctor public: - UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : + UnaryFunctionFunctor( const ExpressionFunct eFunct, ParserContextSharedPtr xContext ) : meFunct( eFunct ), - mxContext( rContext ) + mxContext(std::move( xContext )) { } void operator()( StringIteratorT, StringIteratorT ) const @@ -845,9 +846,9 @@ class BinaryFunctionFunctor public: - BinaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : + BinaryFunctionFunctor( const ExpressionFunct eFunct, ParserContextSharedPtr xContext ) : meFunct( eFunct ), - mxContext( rContext ) + mxContext(std::move( xContext )) { } @@ -882,8 +883,8 @@ class IfFunctor public: - explicit IfFunctor( const ParserContextSharedPtr& rContext ) : - mxContext( rContext ) + explicit IfFunctor( ParserContextSharedPtr xContext ) : + mxContext(std::move( xContext )) { } void operator()( StringIteratorT, StringIteratorT ) const @@ -972,8 +973,8 @@ public: @param rParserContext Contains context info for the parser */ - explicit ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) : - mpParserContext( rParserContext ) + explicit ExpressionGrammar( ParserContextSharedPtr xParserContext ) : + mpParserContext(std::move( xParserContext )) { } diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 8dce09c1ca1b..53c5201a604f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -20,11 +20,12 @@ #include "EnhancedCustomShapeHandle.hxx" #include <svx/EnhancedCustomShape2d.hxx> #include <svx/svdoashp.hxx> +#include <utility> -EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape > const & xCustomShape, sal_uInt32 nIndex ) : +EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape > xCustomShape, sal_uInt32 nIndex ) : mnIndex ( nIndex ), - mxCustomShape ( xCustomShape ) + mxCustomShape (std::move( xCustomShape )) { } diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index b56909420768..00f70d3609bc 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx @@ -37,7 +37,7 @@ class EnhancedCustomShapeHandle : public cppu::WeakImplHelper public: - EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape > const & xCustomShape, sal_uInt32 nIndex ); + EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape > xCustomShape, sal_uInt32 nIndex ); virtual ~EnhancedCustomShapeHandle() override; // XInterface diff --git a/svx/source/diagram/datamodel.cxx b/svx/source/diagram/datamodel.cxx index e45fe7fb4c3a..42677954bada 100644 --- a/svx/source/diagram/datamodel.cxx +++ b/svx/source/diagram/datamodel.cxx @@ -24,6 +24,7 @@ #include <svx/diagram/datamodel.hxx> #include <comphelper/xmltools.hxx> #include <sal/log.hxx> +#include <utility> namespace svx::diagram { @@ -141,9 +142,9 @@ bool DiagramData::removeNode(const OUString& rNodeId) return true; } -DiagramDataState::DiagramDataState(const Connections& rConnections, const Points& rPoints) -: maConnections(rConnections) -, maPoints(rPoints) +DiagramDataState::DiagramDataState(Connections aConnections, Points aPoints) +: maConnections(std::move(aConnections)) +, maPoints(std::move(aPoints)) { } diff --git a/svx/source/dialog/AccessibilityCheckDialog.cxx b/svx/source/dialog/AccessibilityCheckDialog.cxx index 8fb0c43cee62..136bafc265bf 100644 --- a/svx/source/dialog/AccessibilityCheckDialog.cxx +++ b/svx/source/dialog/AccessibilityCheckDialog.cxx @@ -11,6 +11,7 @@ #include <svx/AccessibilityCheckDialog.hxx> #include <sfx2/AccessibilityIssue.hxx> +#include <utility> #include <vcl/svapp.hxx> namespace svx @@ -35,10 +36,10 @@ IMPL_LINK_NOARG(AccessibilityCheckEntry, GotoButtonClicked, weld::Button&, void) } AccessibilityCheckDialog::AccessibilityCheckDialog( - weld::Window* pParent, sfx::AccessibilityIssueCollection const& rIssueCollection) + weld::Window* pParent, sfx::AccessibilityIssueCollection aIssueCollection) : GenericDialogController(pParent, "svx/ui/accessibilitycheckdialog.ui", "AccessibilityCheckDialog") - , m_aIssueCollection(rIssueCollection) + , m_aIssueCollection(std::move(aIssueCollection)) , m_xAccessibilityCheckBox(m_xBuilder->weld_box("accessibilityCheckBox")) { sal_Int32 i = 0; diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index af72a7edf2a2..e815f995aa56 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -23,6 +23,7 @@ #include <tools/stream.hxx> #include <tools/XmlWriter.hxx> #include <tools/XmlWalker.hxx> +#include <utility> #include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> @@ -154,12 +155,12 @@ void writeResultToXml(tools::XmlWriter & rXmlWriter, } // end anonymous namespace -ClassificationDialog::ClassificationDialog(weld::Window* pParent, const bool bPerParagraph, const std::function<void()>& rParagraphSignHandler) +ClassificationDialog::ClassificationDialog(weld::Window* pParent, const bool bPerParagraph, std::function<void()> aParagraphSignHandler) : GenericDialogController(pParent, "svx/ui/classificationdialog.ui", "AdvancedDocumentClassificationDialog") , maHelper(SfxObjectShell::Current()->getDocProperties()) , maInternationalHelper(SfxObjectShell::Current()->getDocProperties(), /*bUseLocalizedPolicy*/ false) , m_bPerParagraph(bPerParagraph) - , m_aParagraphSignHandler(rParagraphSignHandler) + , m_aParagraphSignHandler(std::move(aParagraphSignHandler)) , m_nCurrentSelectedCategory(-1) , m_xOkButton(m_xBuilder->weld_button("ok")) , m_xSignButton(m_xBuilder->weld_button("signButton")) diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 6eb9745c8233..a48d26b67954 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -19,6 +19,7 @@ #include <config_wasm_strip.h> +#include <utility> #include <vcl/event.hxx> #include <vcl/fontcharmap.hxx> #include <vcl/svapp.hxx> @@ -898,8 +899,8 @@ const Subset* SubsetMap::GetSubsetByUnicode( sal_UCS4 cChar ) const return nullptr; } -inline Subset::Subset(sal_UCS4 nMin, sal_UCS4 nMax, const OUString& rName) -: mnRangeMin(nMin), mnRangeMax(nMax), maRangeName(rName) +inline Subset::Subset(sal_UCS4 nMin, sal_UCS4 nMax, OUString aName) +: mnRangeMin(nMin), mnRangeMax(nMax), maRangeName(std::move(aName)) { } diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index f4f6e0500131..a8b5916d8dde 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -18,6 +18,7 @@ */ #include "dlgunit.hxx" +#include <utility> #include <vcl/fieldvalues.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> @@ -74,10 +75,10 @@ CompressGraphicsDialog::CompressGraphicsDialog( weld::Window* pParent, SdrGrafOb recallParameter(); } -CompressGraphicsDialog::CompressGraphicsDialog( weld::Window* pParent, Graphic const & rGraphic, Size rViewSize100mm, tools::Rectangle const & rCropRectangle, SfxBindings& rBindings ) : +CompressGraphicsDialog::CompressGraphicsDialog( weld::Window* pParent, Graphic aGraphic, Size rViewSize100mm, tools::Rectangle const & rCropRectangle, SfxBindings& rBindings ) : GenericDialogController( pParent, "svx/ui/compressgraphicdialog.ui", "CompressGraphicDialog" ), m_xGraphicObj ( nullptr ), - m_aGraphic ( rGraphic ), + m_aGraphic (std::move( aGraphic )), m_aViewSize100mm ( rViewSize100mm ), m_aCropRectangle ( rCropRectangle ), m_rBindings ( rBindings ), diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 181d27b4f006..61a2fedb4f8a 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -29,6 +29,7 @@ #include <svtools/imagemgr.hxx> #include <sfx2/filedlghelper.hxx> #include <tools/urlobj.hxx> +#include <utility> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> @@ -46,9 +47,9 @@ namespace svx::DocRecovery using namespace ::osl; -RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext, +RecoveryCore::RecoveryCore(css::uno::Reference< css::uno::XComponentContext > xContext, bool bUsedForSaving) - : m_xContext ( rxContext ) + : m_xContext (std::move( xContext )) , m_pListener ( nullptr ) , m_bListenForSaving(bUsedForSaving) { diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 4ef2c9277a86..d92c5f6754e3 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SVX_SOURCE_DIALOG_IMAPWND_HXX #define INCLUDED_SVX_SOURCE_DIALOG_IMAPWND_HXX +#include <utility> #include <vcl/imapobj.hxx> #include <vcl/transfer.hxx> #include <vcl/imap.hxx> @@ -50,9 +51,9 @@ class IMapUserData : public SdrObjUserData public: - explicit IMapUserData( const IMapObjectPtr& rIMapObj ) : + explicit IMapUserData( IMapObjectPtr xIMapObj ) : SdrObjUserData ( SdrInventor::IMap, SVD_IMAP_USERDATA ), - mpObj ( rIMapObj ) {} + mpObj (std::move( xIMapObj )) {} IMapUserData( const IMapUserData& rIMapUserData ) : SdrObjUserData ( SdrInventor::IMap, SVD_IMAP_USERDATA ), diff --git a/svx/source/dialog/svxgraphicitem.cxx b/svx/source/dialog/svxgraphicitem.cxx index 9550e79e4814..940941b6055a 100644 --- a/svx/source/dialog/svxgraphicitem.cxx +++ b/svx/source/dialog/svxgraphicitem.cxx @@ -19,9 +19,10 @@ #include <svx/svxgraphicitem.hxx> #include <svx/svxids.hrc> +#include <utility> -SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic ) - : SfxPoolItem( SID_GRAPHIC ), aGraphic( rGraphic ) +SvxGraphicItem::SvxGraphicItem( Graphic _aGraphic ) + : SfxPoolItem( SID_GRAPHIC ), aGraphic(std::move( _aGraphic )) { } diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index b1d99ddfd2b3..5f8319767d38 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -19,6 +19,7 @@ #include <svx/e3dundo.hxx> #include <svx/e3dsceneupdater.hxx> +#include <utility> E3dUndoAction::~E3dUndoAction () @@ -54,12 +55,12 @@ void E3dRotateUndoAction::Redo() E3dAttributesUndoAction::E3dAttributesUndoAction( E3dObject& rInObject, - const SfxItemSet& rNewSet, - const SfxItemSet& rOldSet) + SfxItemSet aNewSet, + SfxItemSet aOldSet) : SdrUndoAction(rInObject.getSdrModelFromSdrObject()) ,mrObject(rInObject) - ,maNewSet(rNewSet) - ,maOldSet(rOldSet) + ,maNewSet(std::move(aNewSet)) + ,maOldSet(std::move(aOldSet)) { } diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index a74479b60d8a..3675b66a70a4 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -34,6 +34,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> +#include <utility> // DrawContact section @@ -52,10 +53,10 @@ std::unique_ptr<sdr::properties::BaseProperties> E3dExtrudeObj::CreateObjectSpec E3dExtrudeObj::E3dExtrudeObj( SdrModel& rSdrModel, const E3dDefaultAttributes& rDefault, - const basegfx::B2DPolyPolygon& rPP, + basegfx::B2DPolyPolygon aPP, double fDepth) : E3dCompoundObject(rSdrModel), - maExtrudePolygon(rPP) + maExtrudePolygon(std::move(aPP)) { // since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here basegfx::B2DHomMatrix aMirrorY; diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 70a6b7ab007a..1d8b4350c156 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -31,6 +31,7 @@ #include <sdr/contact/viewcontactofe3dlathe.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <utility> // DrawContact section @@ -48,9 +49,9 @@ std::unique_ptr<sdr::properties::BaseProperties> E3dLatheObj::CreateObjectSpecif E3dLatheObj::E3dLatheObj( SdrModel& rSdrModel, const E3dDefaultAttributes& rDefault, - const basegfx::B2DPolyPolygon& rPoly2D) + basegfx::B2DPolyPolygon aPoly2D) : E3dCompoundObject(rSdrModel), - maPolyPoly2D(rPoly2D) + maPolyPoly2D(std::move(aPoly2D)) { // since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here basegfx::B2DHomMatrix aMirrorY; diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index e5caf53556c7..64a86bc89463 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -51,6 +51,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <svx/e3dsceneupdater.hxx> +#include <utility> using namespace com::sun::star; @@ -1002,9 +1003,9 @@ struct E3dDepthNeighbour E3dExtrudeObj* mpObj; basegfx::B2DPolyPolygon maPreparedPolyPolygon; - E3dDepthNeighbour(E3dExtrudeObj* pObj, basegfx::B2DPolyPolygon const & rPreparedPolyPolygon) + E3dDepthNeighbour(E3dExtrudeObj* pObj, basegfx::B2DPolyPolygon aPreparedPolyPolygon) : mpObj(pObj), - maPreparedPolyPolygon(rPreparedPolyPolygon) + maPreparedPolyPolygon(std::move(aPreparedPolyPolygon)) { } }; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 8fda483e4798..69b91b9d0b68 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -39,6 +39,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <utility> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/weld.hxx> @@ -2514,11 +2515,11 @@ namespace svxform } AddConditionDialog::AddConditionDialog(weld::Window* pParent, - const OUString& _rPropertyName, + OUString _aPropertyName, const Reference< XPropertySet >& _rPropSet) : GenericDialogController(pParent, "svx/ui/addconditiondialog.ui", "AddConditionDialog") , m_aResultIdle("svx AddConditionDialog m_aResultIdle") - , m_sPropertyName(_rPropertyName) + , m_sPropertyName(std::move(_aPropertyName)) , m_xBinding(_rPropSet) , m_xConditionED(m_xBuilder->weld_text_view("condition")) , m_xResultWin(m_xBuilder->weld_text_view("result")) diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9b1703f6abc9..09b0f524c634 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -44,6 +44,7 @@ #include <svx/svxids.hrc> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <utility> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> @@ -139,11 +140,11 @@ OUString FmFilterItems::GetImage() const } FmFilterItem::FmFilterItem( FmFilterItems* pParent, - const OUString& aFieldName, + OUString aFieldName, const OUString& aText, const sal_Int32 _nComponentIndex ) :FmFilterData(pParent, aText) - ,m_aFieldName(aFieldName) + ,m_aFieldName(std::move(aFieldName)) ,m_nComponentIndex( _nComponentIndex ) { } diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 8ab6006bd559..704085242e9e 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -37,6 +37,7 @@ #include <svx/fmshell.hxx> #include <comphelper/types.hxx> +#include <utility> using namespace ::svxform; using namespace ::com::sun::star::uno; @@ -79,9 +80,9 @@ FmNavRemovedHint::~FmNavRemovedHint() { } -FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ) +FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, OUString _aNewName ) :pEntryData( pData ) - ,aNewName( rNewName ) + ,aNewName(std::move( _aNewName )) { } diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 31de563042cd..02541fb8b0e5 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -32,6 +32,7 @@ #include <tools/diagnose_ex.h> #include <tools/debug.hxx> #include <cppuhelper/implbase.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <mutex> #include <o3tl/sorted_vector.hxx> @@ -802,9 +803,9 @@ namespace svxform const OUString m_sScriptCode; public: - NewStyleUNOScript( SfxObjectShell& _rObjectShell, const OUString& _rScriptCode ) + NewStyleUNOScript( SfxObjectShell& _rObjectShell, OUString _aScriptCode ) :m_rObjectShell( _rObjectShell ) - ,m_sScriptCode( _rScriptCode ) + ,m_sScriptCode(std::move( _aScriptCode )) { } diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c365becea715..87744df0e5cf 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -25,14 +25,15 @@ #include <svl/intitem.hxx> #include <svl/cjkoptions.hxx> +#include <utility> namespace svx { - TextControlCharAttribDialog::TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, const SvxFontListItem& rFontList) + TextControlCharAttribDialog::TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, SvxFontListItem aFontList) : SfxTabDialogController(pParent, "svx/ui/textcontrolchardialog.ui", "TextControlCharacterPropertiesDialog", &rCoreSet) - , m_aFontList(rFontList) + , m_aFontList(std::move(aFontList)) { AddTabPage("font", RID_SVXPAGE_CHAR_NAME); AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS); diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index 68bb8606a453..8abc2d78d781 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -19,6 +19,7 @@ #include <fmtextcontrolfeature.hxx> #include <fmtextcontrolshell.hxx> +#include <utility> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> @@ -33,9 +34,9 @@ namespace svx using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, const URL& _rFeatureURL, SfxSlotId _nSlotId, FmTextControlShell* _pInvalidator ) + FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, URL _aFeatureURL, SfxSlotId _nSlotId, FmTextControlShell* _pInvalidator ) :m_xDispatcher ( _rxDispatcher ) - ,m_aFeatureURL ( _rFeatureURL ) + ,m_aFeatureURL (std::move( _aFeatureURL )) ,m_nSlotId ( _nSlotId ) ,m_pInvalidator ( _pInvalidator ) ,m_bFeatureEnabled( false ) diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index c95c5d710977..4251342a8721 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -75,6 +75,7 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/stdtext.hxx> #include <vcl/window.hxx> @@ -147,9 +148,9 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; -FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) +FormViewPageWindowAdapter::FormViewPageWindowAdapter( css::uno::Reference<css::uno::XComponentContext> _xContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) : m_xControlContainer( _rWindow.GetControlContainer() ), - m_xContext( _rContext ), + m_xContext(std::move( _xContext )), m_pViewImpl( _pViewImpl ), m_pWindow( _rWindow.GetPaintWindow().GetOutputDevice().GetOwnerWindow() ) { diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index b90cd4c92366..0a8473fe4704 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -21,6 +21,7 @@ #include <formfeaturedispatcher.hxx> #include <comphelper/namedvaluecollection.hxx> +#include <utility> #include <tools/diagnose_ex.h> @@ -35,12 +36,12 @@ namespace svx using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::runtime; - OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature, + OSingleFeatureDispatcher::OSingleFeatureDispatcher( URL _aFeatureURL, const sal_Int16 _nFormFeature, const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex ) :m_rMutex( _rMutex ) ,m_aStatusListeners( _rMutex ) ,m_xFormOperations( _rxFormOperations ) - ,m_aFeatureURL( _rFeatureURL ) + ,m_aFeatureURL(std::move( _aFeatureURL )) ,m_nFormFeature( _nFormFeature ) ,m_bLastKnownEnabled( false ) { diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 4aa65b56e6fd..faaf0ac76522 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -41,6 +41,7 @@ #include <svx/dataaccessdescriptor.hxx> #include <tools/diagnose_ex.h> #include <tabwin.hrc> +#include <utility> const tools::Long STD_WIN_SIZE_X = 120; const tools::Long STD_WIN_SIZE_Y = 150; @@ -61,8 +62,8 @@ using namespace ::dbtools; struct ColumnInfo { OUString sColumnName; - explicit ColumnInfo(const OUString& i_sColumnName) - : sColumnName(i_sColumnName) + explicit ColumnInfo(OUString i_sColumnName) + : sColumnName(std::move(i_sColumnName)) { } }; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index e33e16974ce3..5a01e2d61874 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <tools/datetime.hxx> +#include <utility> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> @@ -46,7 +47,7 @@ using namespace ::com::sun::star; GalleryBrowser1::GalleryBrowser1( weld::Builder& rBuilder, Gallery* pGallery, - const std::function<void ()>& rThemeSelectionHandler) + std::function<void ()> aThemeSelectionHandler) : mxNewTheme(rBuilder.weld_button("insert")), mxThemes(rBuilder.weld_tree_view("themelist")), @@ -56,7 +57,7 @@ GalleryBrowser1::GalleryBrowser1( aImgNormal ( RID_SVXBMP_THEME_NORMAL ), aImgDefault ( RID_SVXBMP_THEME_DEFAULT ), aImgReadOnly ( RID_SVXBMP_THEME_READONLY ), - maThemeSelectionHandler(rThemeSelectionHandler) + maThemeSelectionHandler(std::move(aThemeSelectionHandler)) { mxNewTheme->set_help_id(HID_GALLERY_NEWTHEME); mxNewTheme->connect_clicked( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index ccbc7f24f8ef..22381b9b8848 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -80,7 +80,7 @@ public: GalleryBrowser1( weld::Builder& rBuilder, Gallery* pGallery, - const ::std::function<void ()>& rThemeSelectionHandler); + ::std::function<void ()> aThemeSelectionHandler); ~GalleryBrowser1(); diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx index 71396c5ce40a..788acab692a0 100644 --- a/svx/source/inc/DefaultShapesPanel.hxx +++ b/svx/source/inc/DefaultShapesPanel.hxx @@ -39,7 +39,7 @@ class DefaultShapesPanel final public: DefaultShapesPanel ( weld::Widget* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + css::uno::Reference<css::frame::XFrame> xFrame); static std::unique_ptr<PanelLayout> Create( weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx index 3b652dcfb0d0..354b99673dbe 100644 --- a/svx/source/inc/StylesPreviewWindow.hxx +++ b/svx/source/inc/StylesPreviewWindow.hxx @@ -61,7 +61,7 @@ class StyleItemController std::pair<OUString, OUString> m_aStyleName; public: - StyleItemController(const std::pair<OUString, OUString>& aStyleName); + StyleItemController(std::pair<OUString, OUString> aStyleName); void Paint(vcl::RenderContext& rRenderContext); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 22f30e0445f3..33be4f3c1cc0 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -419,7 +419,7 @@ namespace svxform public: AddConditionDialog(weld::Window* pParent, - const OUString& _rPropertyName, const css::uno::Reference< css::beans::XPropertySet >& _rBinding); + OUString _aPropertyName, const css::uno::Reference< css::beans::XPropertySet >& _rBinding); virtual ~AddConditionDialog() override; const css::uno::Reference< css::xforms::XFormsUIHelper1 >& GetUIHelper() const { return m_xUIHelper; } diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 9b69342bc5a7..df90e5354f56 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -210,7 +210,7 @@ class RecoveryCore final : public ::cppu::WeakImplHelper< css::frame::XStatusLis /** @short TODO */ - RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + RecoveryCore(css::uno::Reference< css::uno::XComponentContext > xContext, bool bUsedForSaving); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 47af4017a7f3..67e1deb8bff7 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -25,6 +25,7 @@ #include <svl/lstner.hxx> #include <svl/SfxBroadcaster.hxx> +#include <utility> #include <vcl/window.hxx> #include <sfx2/childwin.hxx> #include <svl/poolitem.hxx> @@ -52,9 +53,9 @@ class FmFilterData OUString m_aText; public: - FmFilterData(FmParentData* pParent, const OUString& rText) + FmFilterData(FmParentData* pParent, OUString aText) :m_pParent( pParent ) - ,m_aText( rText ) + ,m_aText(std::move( aText )) {} virtual ~FmFilterData(){} @@ -122,7 +123,7 @@ class FmFilterItem final : public FmFilterData public: FmFilterItem( FmFilterItems* pParent, - const OUString& aFieldName, + OUString aFieldName, const OUString& aCondition, const sal_Int32 _nComponentIndex ); diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx index bce8b5589e16..eb1b6cc11ee5 100644 --- a/svx/source/inc/findtextfield.hxx +++ b/svx/source/inc/findtextfield.hxx @@ -31,9 +31,8 @@ class AcceleratorExecute; class FindTextFieldControl final : public InterimItemWindow { public: - FindTextFieldControl(vcl::Window* pParent, - css::uno::Reference<css::frame::XFrame> const& xFrame, - const css::uno::Reference<css::uno::XComponentContext>& xContext); + FindTextFieldControl(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> xFrame, + css::uno::Reference<css::uno::XComponentContext> xContext); virtual void dispose() override; diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 620d8b98db98..e0d96c5577a8 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -28,6 +28,7 @@ #include <tools/color.hxx> #include <set> +#include <utility> namespace com::sun::star::form::validation { class XValidatableFormComponent; } @@ -80,8 +81,8 @@ namespace svxform OUString sOriginalHelpText; ControlData() : BorderDescriptor() { } - ControlData( const css::uno::Reference< css::awt::XControl >& _rxControl ) - :xControl( _rxControl ) + ControlData( css::uno::Reference< css::awt::XControl > _xControl ) + :xControl(std::move( _xControl )) { } }; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index fc7823b699d9..aae83d41a2e4 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -96,7 +96,7 @@ class FmNavNameChangedHint final : public SfxHint OUString aNewName; public: - FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ); + FmNavNameChangedHint( FmEntryData* pData, OUString aNewName ); virtual ~FmNavNameChangedHint() override; FmEntryData* GetEntryData() const { return pEntryData; } diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index e915b06f1a53..056aeff51349 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -32,7 +32,7 @@ namespace svx SvxFontListItem m_aFontList; public: - TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, const SvxFontListItem& rFontList); + TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, SvxFontListItem aFontList); private: virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override; diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index 2414f2bbdfff..fb8d64ec55f6 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -55,7 +55,7 @@ namespace svx */ FmTextControlFeature( const css::uno::Reference< css::frame::XDispatch >& _rxDispatcher, - const css::util::URL& _rFeatureURL, + css::util::URL _aFeatureURL, SfxSlotId _nId, FmTextControlShell* _pInvalidator ); diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index c7cb3681b418..35255769fbc8 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -97,7 +97,7 @@ class FormViewPageWindowAdapter final : public FormViewPageWindowAdapter_Base VclPtr<vcl::Window> m_pWindow; public: - FormViewPageWindowAdapter( const css::uno::Reference<css::uno::XComponentContext>& _rContext, + FormViewPageWindowAdapter( css::uno::Reference<css::uno::XComponentContext> _xContext, const SdrPageWindow&, FmXFormView* pView); //const SdrPageViewWinRec*, FmXFormView* pView); diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index a57453dc8df2..62fe40e699c3 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -52,7 +52,7 @@ namespace svx @see dispose */ OSingleFeatureDispatcher( - const css::util::URL& _rFeatureURL, + css::util::URL _aFeatureURL, const sal_Int16 _nFormFeature, const css::uno::Reference< css::form::runtime::XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 8970e9983099..b9c738605b11 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -48,7 +48,7 @@ public: SvxPixelCtl& rWindow, bool bPixelColorOrBG, const tools::Rectangle& rBounds, - const rtl::Reference<SvxPixelCtlAccessible>& xParent, + rtl::Reference<SvxPixelCtlAccessible> xParent, tools::Long nIndexInParent ); DECLARE_XINTERFACE( ) diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 5e8f458d8895..66c9cc51ecbb 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -142,7 +142,7 @@ class SvxRectCtlChildAccessibleContext final : public ::comphelper::OAccessibleC public: SvxRectCtlChildAccessibleContext( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, - const OUString& rName, const OUString& rDescription, + OUString aName, OUString aDescription, const tools::Rectangle& rBoundingBox, tools::Long nIndexInParent ); diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index fcec36315447..6cb9a1ced72b 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -22,6 +22,7 @@ #include <sal/log.hxx> #include <com/sun/star/container/XStringKeyMap.hpp> +#include <utility> using namespace ::com::sun::star; @@ -33,20 +34,20 @@ SvxSmartTagItem::SvxSmartTagItem( const TypedWhichId<SvxSmartTagItem> nId, const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, const css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, const css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps, - const css::uno::Reference<css::text::XTextRange>& rRange, - const css::uno::Reference<css::frame::XController>& rController, - const css::lang::Locale& rLocale, - const OUString& rApplicationName, - const OUString& rRangeText ) : + css::uno::Reference<css::text::XTextRange> xRange, + css::uno::Reference<css::frame::XController> xController, + css::lang::Locale aLocale, + OUString aApplicationName, + OUString aRangeText ) : SfxPoolItem( nId ), maActionComponentsSequence( rActionComponentsSequence ), maActionIndicesSequence( rActionIndicesSequence ), maStringKeyMaps( rStringKeyMaps ), - mxRange( rRange ), - mxController( rController ), - maLocale( rLocale ), - maApplicationName( rApplicationName ), - maRangeText( rRangeText ) + mxRange(std::move( xRange )), + mxController(std::move( xController )), + maLocale(std::move( aLocale )), + maApplicationName(std::move( aApplicationName )), + maRangeText(std::move( aRangeText )) { } diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 24a6acb395df..8274c2d23ab7 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -19,6 +19,7 @@ #include <svx/drawitem.hxx> #include <svx/xtable.hxx> +#include <utility> using namespace ::com::sun::star; @@ -36,9 +37,9 @@ SvxColorListItem::SvxColorListItem() } -SvxColorListItem::SvxColorListItem( XColorListRef const & pTable, TypedWhichId<SvxColorListItem> nW ) : +SvxColorListItem::SvxColorListItem( XColorListRef pTable, TypedWhichId<SvxColorListItem> nW ) : SfxPoolItem( nW ), - pColorList( pTable ) + pColorList(std::move( pTable )) { } @@ -96,9 +97,9 @@ SvxGradientListItem::SvxGradientListItem() { } -SvxGradientListItem::SvxGradientListItem( XGradientListRef const & pList, TypedWhichId<SvxGradientListItem> nW ) : +SvxGradientListItem::SvxGradientListItem( XGradientListRef pList, TypedWhichId<SvxGradientListItem> nW ) : SfxPoolItem( nW ), - pGradientList( pList ) + pGradientList(std::move( pList )) { } @@ -141,9 +142,9 @@ SvxHatchListItem::SvxHatchListItem() } -SvxHatchListItem::SvxHatchListItem( XHatchListRef const & pList, TypedWhichId<SvxHatchListItem> nW ) : +SvxHatchListItem::SvxHatchListItem( XHatchListRef pList, TypedWhichId<SvxHatchListItem> nW ) : SfxPoolItem( nW ), - pHatchList( pList ) + pHatchList(std::move( pList )) { } @@ -185,9 +186,9 @@ SvxBitmapListItem::SvxBitmapListItem() { } -SvxBitmapListItem::SvxBitmapListItem( XBitmapListRef const & pList, TypedWhichId<SvxBitmapListItem> nW ) : +SvxBitmapListItem::SvxBitmapListItem( XBitmapListRef pList, TypedWhichId<SvxBitmapListItem> nW ) : SfxPoolItem( nW ), - pBitmapList( pList ) + pBitmapList(std::move( pList )) { } @@ -226,9 +227,9 @@ SvxPatternListItem::SvxPatternListItem() { } -SvxPatternListItem::SvxPatternListItem( XPatternListRef const & pList, TypedWhichId<SvxPatternListItem> nW ) : +SvxPatternListItem::SvxPatternListItem( XPatternListRef pList, TypedWhichId<SvxPatternListItem> nW ) : SfxPoolItem( nW ), - pPatternList( pList ) + pPatternList(std::move( pList )) { } @@ -267,9 +268,9 @@ SvxDashListItem::SvxDashListItem() { } -SvxDashListItem::SvxDashListItem( XDashListRef const & pList, TypedWhichId<SvxDashListItem> nW ) : +SvxDashListItem::SvxDashListItem( XDashListRef pList, TypedWhichId<SvxDashListItem> nW ) : SfxPoolItem( nW ), - pDashList( pList ) + pDashList(std::move( pList )) { } @@ -308,9 +309,9 @@ SvxLineEndListItem::SvxLineEndListItem() { } -SvxLineEndListItem::SvxLineEndListItem( XLineEndListRef const & pList, TypedWhichId<SvxLineEndListItem> nW ) : +SvxLineEndListItem::SvxLineEndListItem( XLineEndListRef pList, TypedWhichId<SvxLineEndListItem> nW ) : SfxPoolItem( nW ), - pLineEndList( pList ) + pLineEndList(std::move( pList )) { } diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 4a8bc3290762..fa635b22b13c 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -20,6 +20,7 @@ #include <svx/svxids.hrc> #include <sfx2/event.hxx> #include <svx/hlnkitem.hxx> +#include <utility> SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(TypedWhichId<SvxHyperlinkItem>(0));} @@ -39,15 +40,15 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ): }; -SvxHyperlinkItem::SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> _nWhich, const OUString& rName, const OUString& rURL, - const OUString& rTarget, const OUString& rIntName, SvxLinkInsertMode eTyp, +SvxHyperlinkItem::SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> _nWhich, OUString aName, OUString aURL, + OUString aTarget, OUString aIntName, SvxLinkInsertMode eTyp, HyperDialogEvent nEvents, SvxMacroTableDtor const *pMacroTbl ): SfxPoolItem (_nWhich), - sName (rName), - sURL (rURL), - sTarget (rTarget), + sName (std::move(aName)), + sURL (std::move(aURL)), + sTarget (std::move(aTarget)), eType (eTyp), - sIntName (rIntName), + sIntName (std::move(aIntName)), nMacroEvents (nEvents) { if (pMacroTbl) diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index d4bb1e915e79..a7b834c78658 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -18,6 +18,7 @@ */ #include <svx/numinf.hxx> +#include <utility> SvxNumberInfoItem::SvxNumberInfoItem( const TypedWhichId<SvxNumberInfoItem> nId ) : @@ -42,11 +43,11 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, - const OUString& rVal, const TypedWhichId<SvxNumberInfoItem> nId ) : + OUString aVal, const TypedWhichId<SvxNumberInfoItem> nId ) : SfxPoolItem ( nId ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::String ), - aStringVal ( rVal ), + aStringVal (std::move( aVal )), nDoubleVal ( 0 ) { } @@ -64,12 +65,12 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, - const double& rVal, const OUString& rValueStr, + const double& rVal, OUString aValueStr, const TypedWhichId<SvxNumberInfoItem> nId ) : SfxPoolItem ( nId ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Number ), - aStringVal ( rValueStr ), + aStringVal (std::move( aValueStr )), nDoubleVal ( rVal ) { } diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 688507592b40..1d5ef696b740 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -20,6 +20,7 @@ #include <svx/ofaitem.hxx> #include <svx/xtable.hxx> +#include <utility> OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr ) : SfxPoolItem( _nWhich ), pPtr( _pPtr ) @@ -38,8 +39,8 @@ OfaPtrItem* OfaPtrItem::Clone( SfxItemPool * ) const return new OfaPtrItem( *this ); } -OfaXColorListItem::OfaXColorListItem( sal_uInt16 _nWhich, const rtl::Reference<XColorList> &xRef ) - : SfxPoolItem( _nWhich ), mxRef( xRef ) +OfaXColorListItem::OfaXColorListItem( sal_uInt16 _nWhich, rtl::Reference<XColorList> xRef ) + : SfxPoolItem( _nWhich ), mxRef(std::move( xRef )) {} bool OfaXColorListItem::operator==( const SfxPoolItem& rItem ) const diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index 86f11e8d0cc4..8d425836c386 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -21,6 +21,7 @@ #include <svtools/popupmenucontrollerbase.hxx> #include <svx/SmartTagItem.hxx> #include <toolkit/awt/vclxmenu.hxx> +#include <utility> #include <vcl/commandinfoprovider.hxx> const sal_uInt16 MN_ST_INSERT_START = 500; @@ -50,9 +51,9 @@ private: css::uno::Reference< css::smarttags::XSmartTagAction > m_xAction; css::uno::Reference< css::container::XStringKeyMap > m_xSmartTagProperties; sal_uInt32 m_nActionID; - InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > const & xAction, - css::uno::Reference< css::container::XStringKeyMap > const & xSmartTagProperties, - sal_uInt32 nActionID ) : m_xAction( xAction ), m_xSmartTagProperties( xSmartTagProperties ), m_nActionID( nActionID ) {} + InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > xAction, + css::uno::Reference< css::container::XStringKeyMap > xSmartTagProperties, + sal_uInt32 nActionID ) : m_xAction(std::move( xAction )), m_xSmartTagProperties(std::move( xSmartTagProperties )), m_nActionID( nActionID ) {} }; std::vector< InvokeAction > m_aInvokeActions; std::unique_ptr< const SvxSmartTagItem > m_pSmartTagItem; diff --git a/svx/source/sdr/attribute/sdreffectstextattribute.cxx b/svx/source/sdr/attribute/sdreffectstextattribute.cxx index 3287b8c8ebb0..30d8a6db1c1e 100644 --- a/svx/source/sdr/attribute/sdreffectstextattribute.cxx +++ b/svx/source/sdr/attribute/sdreffectstextattribute.cxx @@ -19,18 +19,19 @@ #include <sdr/attribute/sdreffectstextattribute.hxx> +#include <utility> namespace drawinglayer::attribute { SdrEffectsTextAttribute::SdrEffectsTextAttribute( - const SdrShadowAttribute& rShadow, - const SdrTextAttribute& rTextAttribute, - const SdrGlowAttribute& rGlow, + SdrShadowAttribute aShadow, + SdrTextAttribute aTextAttribute, + SdrGlowAttribute aGlow, sal_Int32 nSoftEdgeRadius) - : maShadow(rShadow), - maTextAttribute(rTextAttribute), - maGlow(rGlow), + : maShadow(std::move(aShadow)), + maTextAttribute(std::move(aTextAttribute)), + maGlow(std::move(aGlow)), mnSoftEdgeRadius(nSoftEdgeRadius) { } diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 01593c9821fc..77f8e7b4273b 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -19,17 +19,18 @@ #include <sdr/attribute/sdrfilltextattribute.hxx> +#include <utility> namespace drawinglayer::attribute { SdrFillTextAttribute::SdrFillTextAttribute( - const SdrFillAttribute& rFill, - const FillGradientAttribute& rFillFloatTransGradient, - const SdrTextAttribute& rTextAttribute) - : maFill(rFill), - maFillFloatTransGradient(rFillFloatTransGradient), - maTextAttribute(rTextAttribute) + SdrFillAttribute aFill, + FillGradientAttribute aFillFloatTransGradient, + SdrTextAttribute aTextAttribute) + : maFill(std::move(aFill)), + maFillFloatTransGradient(std::move(aFillFloatTransGradient)), + maTextAttribute(std::move(aTextAttribute)) { } diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index ec97cf04429d..f720b561628d 100644 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx @@ -21,6 +21,7 @@ #include <sdr/attribute/sdrformtextoutlineattribute.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> +#include <utility> namespace drawinglayer::attribute @@ -35,10 +36,10 @@ namespace drawinglayer::attribute ImpSdrFormTextOutlineAttribute( const LineAttribute& rLineAttribute, - const StrokeAttribute& rStrokeAttribute, + StrokeAttribute aStrokeAttribute, sal_uInt8 nTransparence) : maLineAttribute(rLineAttribute), - maStrokeAttribute(rStrokeAttribute), + maStrokeAttribute(std::move(aStrokeAttribute)), mnTransparence(nTransparence) { } diff --git a/svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx b/svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx index 72a3ef032d87..c3f3dbcb18c4 100644 --- a/svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx @@ -19,20 +19,21 @@ #include <sdr/attribute/sdrlineeffectstextattribute.hxx> +#include <utility> namespace drawinglayer::attribute { SdrLineEffectsTextAttribute::SdrLineEffectsTextAttribute( - const SdrLineAttribute& rLine, - const SdrLineStartEndAttribute& rLineStartEnd, + SdrLineAttribute aLine, + SdrLineStartEndAttribute aLineStartEnd, const SdrShadowAttribute& rShadow, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow, sal_Int32 nSoftEdgeRadius) : SdrEffectsTextAttribute(rShadow, rTextAttribute, rGlow, nSoftEdgeRadius), - maLine(rLine), - maLineStartEnd(rLineStartEnd) + maLine(std::move(aLine)), + maLineStartEnd(std::move(aLineStartEnd)) { } diff --git a/svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx b/svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx index 442b51833678..4d57225b2fb3 100644 --- a/svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx @@ -19,22 +19,23 @@ #include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> +#include <utility> namespace drawinglayer::attribute { SdrLineFillEffectsTextAttribute::SdrLineFillEffectsTextAttribute( const SdrLineAttribute& rLine, - const SdrFillAttribute& rFill, + SdrFillAttribute aFill, const SdrLineStartEndAttribute& rLineStartEnd, const SdrShadowAttribute& rShadow, - const FillGradientAttribute& rFillFloatTransGradient, + FillGradientAttribute aFillFloatTransGradient, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow, sal_Int32 nSoftEdgeRadius) : SdrLineEffectsTextAttribute(rLine, rLineStartEnd, rShadow, rTextAttribute, rGlow, nSoftEdgeRadius), - maFill(rFill), - maFillFloatTransGradient(rFillFloatTransGradient) + maFill(std::move(aFill)), + maFillFloatTransGradient(std::move(aFillFloatTransGradient)) { } diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 5ca5a32d2f34..9883591191f4 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XContainer.hpp> +#include <utility> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -799,8 +800,8 @@ namespace sdr::contact { ) const override; public: - explicit LazyControlCreationPrimitive2D( const ::rtl::Reference< ViewObjectContactOfUnoControl_Impl >& _pVOCImpl ) - :m_pVOCImpl( _pVOCImpl ) + explicit LazyControlCreationPrimitive2D( ::rtl::Reference< ViewObjectContactOfUnoControl_Impl > _pVOCImpl ) + :m_pVOCImpl(std::move( _pVOCImpl )) { ENSURE_OR_THROW( m_pVOCImpl.is(), "Illegal argument." ); getTransformation( m_pVOCImpl->getViewContact(), m_aTransformation ); diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index 69dacf375c2a..7d06d7439f34 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -25,17 +25,18 @@ #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svtools/optionsdrawinglayer.hxx> +#include <utility> namespace sdr::overlay { OverlayPolyPolygon::OverlayPolyPolygon( - const basegfx::B2DPolyPolygon& rLinePolyPolygon, + basegfx::B2DPolyPolygon aLinePolyPolygon, Color const & rLineColor, double fLineWidth, Color const & rFillColor) : OverlayObject(rLineColor) - , maLinePolyPolygon(rLinePolyPolygon) + , maLinePolyPolygon(std::move(aLinePolyPolygon)) , mfLineWidth(fLineWidth) , maFillColor(rFillColor) { @@ -113,9 +114,9 @@ namespace sdr::overlay } OverlayPolyPolygonStripedAndFilled::OverlayPolyPolygonStripedAndFilled( - const basegfx::B2DPolyPolygon& rLinePolyPolygon) + basegfx::B2DPolyPolygon aLinePolyPolygon) : OverlayObject(COL_BLACK), - maLinePolyPolygon(rLinePolyPolygon) + maLinePolyPolygon(std::move(aLinePolyPolygon)) { } diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 50787ed399f1..51164210a5cc 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -23,6 +23,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <utility> using namespace com::sun::star; @@ -119,14 +120,14 @@ namespace drawinglayer::primitive2d } SdrCaptionPrimitive2D::SdrCaptionPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, - const basegfx::B2DPolygon& rTail, + basegfx::B2DPolygon aTail, double fCornerRadiusX, double fCornerRadiusY) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute), - maTail(rTail), + maTail(std::move(aTail)), mfCornerRadiusX(fCornerRadiusX), mfCornerRadiusY(fCornerRadiusY) { diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index aa663fb7aa7f..ccfc5c111d97 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -23,6 +23,7 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <utility> using namespace com::sun::star; @@ -77,9 +78,9 @@ namespace drawinglayer::primitive2d SdrConnectorPrimitive2D::SdrConnectorPrimitive2D( const attribute::SdrLineEffectsTextAttribute& rSdrLSTAttribute, - const ::basegfx::B2DPolygon& rUnitPolygon) + ::basegfx::B2DPolygon aUnitPolygon) : maSdrLSTAttribute(rSdrLSTAttribute), - maUnitPolygon(rUnitPolygon) + maUnitPolygon(std::move(aUnitPolygon)) { } diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index dddb8aa3069a..19717e2eb121 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -24,6 +24,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> +#include <utility> using namespace com::sun::star; @@ -90,16 +91,16 @@ namespace drawinglayer::primitive2d SdrCustomShapePrimitive2D::SdrCustomShapePrimitive2D( const attribute::SdrEffectsTextAttribute& rSdrSTAttribute, Primitive2DContainer&& rSubPrimitives, - const basegfx::B2DHomMatrix& rTextBox, + basegfx::B2DHomMatrix aTextBox, bool bWordWrap, bool b3DShape, - const basegfx::B2DHomMatrix& rTransform) + basegfx::B2DHomMatrix aTransform) : maSdrSTAttribute(rSdrSTAttribute), maSubPrimitives(std::move(rSubPrimitives)), - maTextBox(rTextBox), + maTextBox(std::move(aTextBox)), mbWordWrap(bWordWrap), mb3DShape(b3DShape), - maTransform(rTransform) + maTransform(std::move(aTransform)) { } diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 89c348beb01b..126b301391d8 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -25,6 +25,7 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <utility> using namespace com::sun::star; @@ -109,9 +110,9 @@ namespace drawinglayer::primitive2d } SdrEllipsePrimitive2D::SdrEllipsePrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute) { } diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index f5ac21cfc9c8..18bef098575a 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -23,6 +23,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <utility> namespace drawinglayer::primitive2d { @@ -124,10 +125,10 @@ void SdrGrafPrimitive2D::create2DDecomposition( } SdrGrafPrimitive2D::SdrGrafPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr) - : maTransform(rTransform) + : maTransform(std::move(aTransform)) , maSdrLFSTAttribute(rSdrLFSTAttribute) , maGraphicObject(rGraphicObject) , maGraphicAttr(rGraphicAttr) diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index e7576b4983e8..3a4ed80c8166 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -24,6 +24,7 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <utility> using namespace com::sun::star; @@ -33,10 +34,10 @@ namespace drawinglayer::primitive2d { SdrOle2Primitive2D::SdrOle2Primitive2D( Primitive2DContainer&& rOLEContent, - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute) : maOLEContent(std::move(rOLEContent)), - maTransform(rTransform), + maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute) { } diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index f520a3d972b9..fe7e53481039 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -20,6 +20,7 @@ #include <sdr/primitive2d/sdrolecontentprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <svx/svdoole2.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx> @@ -130,11 +131,11 @@ namespace drawinglayer::primitive2d SdrOleContentPrimitive2D::SdrOleContentPrimitive2D( const SdrOle2Obj& rSdrOle2Obj, - const basegfx::B2DHomMatrix& rObjectTransform, + basegfx::B2DHomMatrix aObjectTransform, sal_uInt32 nGraphicVersion ) : mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)), - maObjectTransform(rObjectTransform), + maObjectTransform(std::move(aObjectTransform)), mnGraphicVersion(nGraphicVersion) { } diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 829525e2bc36..46fcec09115b 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -21,6 +21,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <utility> using namespace com::sun::star; @@ -119,14 +120,14 @@ namespace drawinglayer::primitive2d } SdrPathPrimitive2D::SdrPathPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, - const basegfx::B2DPolyPolygon& rUnitPolyPolygon, - const basegfx::B2DPolyPolygon& rUnitDefinitionPolyPolygon) - : maTransform(rTransform), + basegfx::B2DPolyPolygon aUnitPolyPolygon, + basegfx::B2DPolyPolygon aUnitDefinitionPolyPolygon) + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute), - maUnitPolyPolygon(rUnitPolyPolygon), - maUnitDefinitionPolyPolygon(rUnitDefinitionPolyPolygon) + maUnitPolyPolygon(std::move(aUnitPolyPolygon)), + maUnitDefinitionPolyPolygon(std::move(aUnitDefinitionPolyPolygon)) { } diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index f289ea6bcac2..2f1fe3d7e494 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -24,6 +24,7 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <utility> using namespace com::sun::star; @@ -112,12 +113,12 @@ namespace drawinglayer::primitive2d } SdrRectanglePrimitive2D::SdrRectanglePrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, double fCornerRadiusX, double fCornerRadiusY, bool bForceFillForHitTest) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute), mfCornerRadiusX(fCornerRadiusX), mfCornerRadiusY(fCornerRadiusY), diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 6311c123ded5..386800af663d 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -30,6 +30,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <utility> #include <osl/diagnose.h> @@ -95,9 +96,9 @@ namespace drawinglayer::primitive2d SdrTextPrimitive2D::SdrTextPrimitive2D( const SdrText* pSdrText, - const OutlinerParaObject& rOutlinerParaObject) + OutlinerParaObject aOutlinerParaObject) : mrSdrText(const_cast< SdrText* >(pSdrText)), - maOutlinerParaObject(rOutlinerParaObject), + maOutlinerParaObject(std::move(aOutlinerParaObject)), mnLastPageNumber(0), mnLastPageCount(0), mbContainsPageField(false), @@ -248,11 +249,11 @@ namespace drawinglayer::primitive2d SdrContourTextPrimitive2D::SdrContourTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DPolyPolygon& rUnitPolyPolygon, - const basegfx::B2DHomMatrix& rObjectTransform) + basegfx::B2DPolyPolygon aUnitPolyPolygon, + basegfx::B2DHomMatrix aObjectTransform) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maUnitPolyPolygon(rUnitPolyPolygon), - maObjectTransform(rObjectTransform) + maUnitPolyPolygon(std::move(aUnitPolyPolygon)), + maObjectTransform(std::move(aObjectTransform)) { } @@ -297,11 +298,11 @@ namespace drawinglayer::primitive2d SdrPathTextPrimitive2D::SdrPathTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DPolyPolygon& rPathPolyPolygon, - const attribute::SdrFormTextAttribute& rSdrFormTextAttribute) + basegfx::B2DPolyPolygon aPathPolyPolygon, + attribute::SdrFormTextAttribute aSdrFormTextAttribute) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maPathPolyPolygon(rPathPolyPolygon), - maSdrFormTextAttribute(rSdrFormTextAttribute) + maPathPolyPolygon(std::move(aPathPolyPolygon)), + maSdrFormTextAttribute(std::move(aSdrFormTextAttribute)) { } @@ -349,7 +350,7 @@ namespace drawinglayer::primitive2d SdrBlockTextPrimitive2D::SdrBlockTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DHomMatrix& rTextRangeTransform, + basegfx::B2DHomMatrix aTextRangeTransform, SdrTextHorzAdjust aSdrTextHorzAdjust, SdrTextVertAdjust aSdrTextVertAdjust, bool bFixedCellHeight, @@ -357,7 +358,7 @@ namespace drawinglayer::primitive2d bool bCellText, bool bWordWrap) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maTextRangeTransform(rTextRangeTransform), + maTextRangeTransform(std::move(aTextRangeTransform)), maSdrTextHorzAdjust(aSdrTextHorzAdjust), maSdrTextVertAdjust(aSdrTextVertAdjust), mbFixedCellHeight(bFixedCellHeight), @@ -418,10 +419,10 @@ namespace drawinglayer::primitive2d SdrAutoFitTextPrimitive2D::SdrAutoFitTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rParaObj, - const ::basegfx::B2DHomMatrix& rTextRangeTransform, + ::basegfx::B2DHomMatrix aTextRangeTransform, bool bWordWrap) : SdrTextPrimitive2D(pSdrText, rParaObj), - maTextRangeTransform(rTextRangeTransform), + maTextRangeTransform(std::move(aTextRangeTransform)), mbWordWrap(bWordWrap) { } @@ -456,9 +457,9 @@ namespace drawinglayer::primitive2d SdrChainedTextPrimitive2D::SdrChainedTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DHomMatrix& rTextRangeTransform) + basegfx::B2DHomMatrix aTextRangeTransform) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maTextRangeTransform(rTextRangeTransform) + maTextRangeTransform(std::move(aTextRangeTransform)) { } void SdrChainedTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const @@ -504,10 +505,10 @@ namespace drawinglayer::primitive2d SdrStretchTextPrimitive2D::SdrStretchTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DHomMatrix& rTextRangeTransform, + basegfx::B2DHomMatrix aTextRangeTransform, bool bFixedCellHeight) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maTextRangeTransform(rTextRangeTransform), + maTextRangeTransform(std::move(aTextRangeTransform)), mbFixedCellHeight(bFixedCellHeight) { } diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index f4ef4d8934d1..6affde64e727 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <utility> #include <vcl/EnumContext.hxx> @@ -30,10 +31,10 @@ using namespace css::uno; namespace svx::sidebar { SelectionChangeHandler::SelectionChangeHandler ( - const std::function<OUString()>& rSelectionChangeCallback, + std::function<OUString()> aSelectionChangeCallback, const Reference<css::frame::XController>& rxController, const vcl::EnumContext::Context eDefaultContext) - : maSelectionChangeCallback(rSelectionChangeCallback), + : maSelectionChangeCallback(std::move(aSelectionChangeCallback)), mxController(rxController), meDefaultContext(eDefaultContext), mbIsConnected(false) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index f4e2fd83bb52..a5a341376838 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -31,6 +31,7 @@ #include <sal/log.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <utility> using namespace css; using namespace css::uno; @@ -390,7 +391,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const css::uno::Reference<css::ui::XSidebar>& rxSidebar) + css::uno::Reference<css::ui::XSidebar> xSidebar) : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui"), //Alignment mxTBxHorzAlign(m_xBuilder->weld_toolbar("horizontalalignment")), @@ -427,7 +428,7 @@ ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent, maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this), m_aMetricCtl (SID_ATTR_METRIC, *pBindings,*this), mpBindings(pBindings), - mxSidebar(rxSidebar) + mxSidebar(std::move(xSidebar)) { // tdf#130197 We want to give this toolbar a width as if it had 5 entries // (the parent grid has homogeneous width set so both columns will have the diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index bd252eb1af8a..b6e61ae018fe 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -68,7 +68,7 @@ public: weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const css::uno::Reference<css::ui::XSidebar>& rxSidebar); + css::uno::Reference<css::ui::XSidebar> xSidebar); private: // UI controls diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index da9e067b2f01..100a7dcc8e16 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -37,6 +37,7 @@ #include <svx/sdangitm.hxx> #include <unotools/viewoptions.hxx> #include <unotools/localedatawrapper.hxx> +#include <utility> #include <vcl/canvastools.hxx> #include <vcl/fieldvalues.hxx> #include <svl/intitem.hxx> @@ -59,7 +60,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const css::uno::Reference<css::ui::XSidebar>& rxSidebar) + css::uno::Reference<css::ui::XSidebar> xSidebar) : PanelLayout(pParent, "PosSizePropertyPanel", "svx/ui/sidebarpossize.ui"), mxFtPosX(m_xBuilder->weld_label("horizontallabel")), mxMtrPosX(m_xBuilder->weld_metric_spin_button("horizontalpos", FieldUnit::CM)), @@ -111,7 +112,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( mbAutoWidth(false), mbAutoHeight(false), mbAdjustEnabled(false), - mxSidebar(rxSidebar) + mxSidebar(std::move(xSidebar)) { Initialize(); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index ede3d3e44315..42af309883b2 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -71,7 +71,7 @@ public: weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const css::uno::Reference<css::ui::XSidebar>& rxSidebar); + css::uno::Reference<css::ui::XSidebar> xSidebar); virtual void GetControlState( const sal_uInt16 nSId, diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 2dc8092a54c8..1b62cdedbaf7 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <comphelper/dispatchcommand.hxx> +#include <utility> #include <vcl/commandinfoprovider.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -28,7 +29,7 @@ namespace svx::sidebar { DefaultShapesPanel::DefaultShapesPanel ( weld::Widget* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame) + css::uno::Reference<css::frame::XFrame> xFrame) : PanelLayout(pParent, "DefaultShapesPanel", "svx/ui/defaultshapespanel.ui") , mxLineArrowSet(new ValueSet(nullptr)) , mxLineArrowSetWin(new weld::CustomWeld(*m_xBuilder, "LinesArrows", *mxLineArrowSet)) @@ -50,7 +51,7 @@ DefaultShapesPanel::DefaultShapesPanel ( , mxStarSetWin(new weld::CustomWeld(*m_xBuilder, "Stars", *mxStarSet)) , mx3DObjectSet(new ValueSet(nullptr)) , mx3DObjectSetWin(new weld::CustomWeld(*m_xBuilder, "3DObjects", *mx3DObjectSet)) - , mxFrame(rxFrame) + , mxFrame(std::move(xFrame)) { Initialize(); pParent->set_size_request(pParent->get_approximate_digit_width() * 20, -1); diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 875d4557db4b..37b9bc935222 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -21,6 +21,7 @@ #include <svx/SmartTagMgr.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.hpp> @@ -46,8 +47,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -SmartTagMgr::SmartTagMgr( const OUString& rApplicationName ) - : maApplicationName( rApplicationName ), +SmartTagMgr::SmartTagMgr( OUString aApplicationName ) + : maApplicationName(std::move( aApplicationName )), mxContext( ::comphelper::getProcessComponentContext() ), mbLabelTextWithSmartTags(true) { diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx index 240b65e2b10a..0dde00e219c0 100644 --- a/svx/source/styles/ColorSets.cxx +++ b/svx/source/styles/ColorSets.cxx @@ -26,6 +26,7 @@ #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <editeng/unoprnms.hxx> +#include <utility> using namespace com::sun::star; @@ -125,8 +126,8 @@ void UpdateSdrObject(svx::Theme* pTheme, SdrObject* pObject) namespace svx { -ColorSet::ColorSet(OUString const & aColorSetName) - : maColorSetName(aColorSetName) +ColorSet::ColorSet(OUString aColorSetName) + : maColorSetName(std::move(aColorSetName)) , maColors(12) {} @@ -233,8 +234,8 @@ const ColorSet& ColorSets::getColorSet(std::u16string_view rName) return maColorSets[0]; } -Theme::Theme(const OUString& rName) - : maName(rName) +Theme::Theme(OUString aName) + : maName(std::move(aName)) { } diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx index b3f6d3bc5175..4a9c88845431 100644 --- a/svx/source/svdraw/polypolygoneditor.cxx +++ b/svx/source/svdraw/polypolygoneditor.cxx @@ -22,11 +22,12 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/polypolygoneditor.hxx> +#include <utility> namespace sdr { -PolyPolygonEditor::PolyPolygonEditor( const basegfx::B2DPolyPolygon& rPolyPolygon) -: maPolyPolygon( rPolyPolygon ) +PolyPolygonEditor::PolyPolygonEditor( basegfx::B2DPolyPolygon aPolyPolygon) +: maPolyPolygon(std::move( aPolyPolygon )) { } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 77685d863ae8..895a3d85bd96 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -22,6 +22,7 @@ #include <o3tl/numeric.hxx> #include <osl/diagnose.h> +#include <utility> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -81,8 +82,8 @@ SdrDragEntry::~SdrDragEntry() } -SdrDragEntryPolyPolygon::SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon) -: maOriginalPolyPolygon(rOriginalPolyPolygon) +SdrDragEntryPolyPolygon::SdrDragEntryPolyPolygon(basegfx::B2DPolyPolygon aOriginalPolyPolygon) +: maOriginalPolyPolygon(std::move(aOriginalPolyPolygon)) { } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index a570c6c903ac..379b3ed3f73e 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -24,6 +24,7 @@ #include <svx/svdhdl.hxx> #include <svx/svdpagv.hxx> #include <svx/svdmrkv.hxx> +#include <utility> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <vcl/ptrstyle.hxx> @@ -2463,15 +2464,15 @@ void SdrCropHdl::CreateB2dIAObject() // accordingly SdrCropViewHdl::SdrCropViewHdl( - const basegfx::B2DHomMatrix& rObjectTransform, - const Graphic& rGraphic, + basegfx::B2DHomMatrix aObjectTransform, + Graphic aGraphic, double fCropLeft, double fCropTop, double fCropRight, double fCropBottom) : SdrHdl(Point(), SdrHdlKind::User), - maObjectTransform(rObjectTransform), - maGraphic(rGraphic), + maObjectTransform(std::move(aObjectTransform)), + maGraphic(std::move(aGraphic)), mfCropLeft(fCropLeft), mfCropTop(fCropTop), mfCropRight(fCropRight), diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 3146d62f7df3..cb482b9fc2a9 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -23,6 +23,7 @@ #include <svx/svdmodel.hxx> #include <algorithm> +#include <utility> bool SdrLayerIDSet::IsEmpty() const { @@ -67,8 +68,8 @@ void SdrLayerIDSet::PutValue( const css::uno::Any & rAny ) } } -SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) : - maName(rNewName), pModel(nullptr), nID(nNewID) +SdrLayer::SdrLayer(SdrLayerID nNewID, OUString aNewName) : + maName(std::move(aNewName)), pModel(nullptr), nID(nNewID) { // ODF default values mbVisibleODF = true; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 9f338301e6ef..f58e89d4996d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -43,6 +43,7 @@ #include <sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <sdr/attribute/sdrformtextattribute.hxx> +#include <utility> #include <vcl/ptrstyle.hxx> #include <memory> #include <sal/log.hxx> @@ -1637,9 +1638,9 @@ SdrPathObj::SdrPathObj(SdrModel& rSdrModel, SdrPathObj const & rSource) SdrPathObj::SdrPathObj( SdrModel& rSdrModel, SdrObjKind eNewKind, - const basegfx::B2DPolyPolygon& rPathPoly) + basegfx::B2DPolyPolygon aPathPoly) : SdrTextObj(rSdrModel), - maPathPolygon(rPathPoly), + maPathPolygon(std::move(aPathPoly)), meKind(eNewKind) { m_bClosedObj = IsClosed(); diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 14bbd73ca4a6..dd3d3af8b026 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -43,6 +43,7 @@ #include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <sdr/attribute/sdrformtextoutlineattribute.hxx> +#include <utility> using namespace ::com::sun::star::uno; @@ -230,10 +231,10 @@ namespace public: impPolygonParagraphHandler( - const drawinglayer::attribute::SdrFormTextAttribute& rSdrFormTextAttribute, + drawinglayer::attribute::SdrFormTextAttribute aSdrFormTextAttribute, drawinglayer::primitive2d::Primitive2DContainer& rDecomposition, drawinglayer::primitive2d::Primitive2DContainer& rShadowDecomposition) - : maSdrFormTextAttribute(rSdrFormTextAttribute), + : maSdrFormTextAttribute(std::move(aSdrFormTextAttribute)), mrDecomposition(rDecomposition), mrShadowDecomposition(rShadowDecomposition) { diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 15c690427363..792b62b7a76f 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -40,6 +40,7 @@ #include <svx/e3dsceneupdater.hxx> #include <svx/svdviter.hxx> #include <svx/svdotable.hxx> // #i124389# +#include <utility> #include <vcl/svapp.hxx> #include <sfx2/viewsh.hxx> #include <svx/svdoashp.hxx> @@ -1225,12 +1226,12 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const // Undo/Redo for setting object's name (#i73249#) SdrUndoObjStrAttr::SdrUndoObjStrAttr( SdrObject& rNewObj, const ObjStrAttrType eObjStrAttr, - const OUString& sOldStr, - const OUString& sNewStr) + OUString sOldStr, + OUString sNewStr) : SdrUndoObj( rNewObj ) , meObjStrAttr( eObjStrAttr ) - , msOldStr( sOldStr ) - , msNewStr( sNewStr ) + , msOldStr(std::move( sOldStr )) + , msNewStr(std::move( sNewStr )) { } diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 1f2678782834..84dbe792cf08 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <editeng/unoedsrc.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -49,11 +50,11 @@ using namespace ::com::sun::star::container; namespace accessibility { -AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo ) +AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, sdr::table::CellRef xCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo ) : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL ) , maShapeTreeInfo( rShapeTreeInfo ) , mnIndexInParent( nIndex ) -, mxCell( rCell ) +, mxCell(std::move( xCell )) { //Init the pAccTable var pAccTable = dynamic_cast <AccessibleTableShape *> (rxParent.get()); diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index d08cc97e9207..d926e0bec704 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -47,7 +47,7 @@ class AccessibleCell : public AccessibleCellBase , public IAccessibleViewForwarderListener { public: - AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); + AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, sdr::table::CellRef xCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); virtual ~AccessibleCell() override; AccessibleCell(const AccessibleCell&) = delete; AccessibleCell& operator=(const AccessibleCell&) = delete; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 27c928eb20f3..2d609cf4a5d0 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -30,6 +30,7 @@ #include <svl/style.hxx> #include <svl/itemset.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <libxml/xmlwriter.h> @@ -111,7 +112,7 @@ namespace class CellTextProvider : public svx::ITextProvider { public: - explicit CellTextProvider(const sdr::table::CellRef& rCell); + explicit CellTextProvider(sdr::table::CellRef xCell); virtual ~CellTextProvider(); private: @@ -122,8 +123,8 @@ private: const sdr::table::CellRef m_xCell; }; -CellTextProvider::CellTextProvider(const sdr::table::CellRef& rCell) - : m_xCell(rCell) +CellTextProvider::CellTextProvider(sdr::table::CellRef xCell) + : m_xCell(std::move(xCell)) { } diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index f9941fd242da..1a6c039dcfd2 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <utility> #include "cellrange.hxx" @@ -32,8 +33,8 @@ using namespace ::com::sun::star::table; namespace sdr::table { -CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) -: mxTable( xTable ) +CellRange::CellRange( TableModelRef xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) +: mxTable(std::move( xTable )) , mnLeft(nLeft) , mnTop(nTop) , mnRight(nRight) diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index b4802eff0fbd..0c3f7a09ab63 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -31,7 +31,7 @@ namespace sdr::table { class CellRange : public ::cppu::WeakAggImplHelper1< css::table::XCellRange >, public ICellRange { public: - CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ); + CellRange( TableModelRef xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ); virtual ~CellRange() override; // ICellRange diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 0dc90358c229..536a8170dac0 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -18,6 +18,8 @@ */ +#include <utility> + #include "propertyset.hxx" using namespace ::com::sun::star::uno; @@ -89,8 +91,8 @@ sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName return hasProperty( aName ) != nullptr; } -FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ) -: mxInfo( xInfo ) +FastPropertySet::FastPropertySet( rtl::Reference< FastPropertySetInfo > xInfo ) +: mxInfo(std::move( xInfo )) { } diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 69500afe06c4..bb2bb103a317 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -61,7 +61,7 @@ private: class FastPropertySet : public ::cppu::WeakAggImplHelper3< css::beans::XPropertySet, css::beans::XMultiPropertySet, css::beans::XFastPropertySet > { public: - explicit FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ); + explicit FastPropertySet( rtl::Reference< FastPropertySetInfo > xInfo ); virtual ~FastPropertySet() override; // XPropertySet diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index d9e33db47525..9638787237a0 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -26,6 +26,7 @@ #include "tableundo.hxx" #include <svx/svdmodel.hxx> #include <svx/svdotable.hxx> +#include <utility> using namespace ::com::sun::star::uno; @@ -46,9 +47,9 @@ const sal_Int32 Property_IsStartOfNewPage = 3; // TableRow -TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn ) +TableColumn::TableColumn( TableModelRef xTableModel, sal_Int32 nColumn ) : TableColumnBase( getStaticPropertySetInfo() ) -, mxTableModel( xTableModel ) +, mxTableModel(std::move( xTableModel )) , mnColumn( nColumn ) , mnWidth( 0 ) , mbOptimalWidth( true ) diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 0d1dbb802f9b..9f24cb1822cb 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -37,7 +37,7 @@ class TableColumn : public TableColumnBase friend class TableColumnUndo; friend class TableModel; public: - TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn ); + TableColumn( TableModelRef xTableModel, sal_Int32 nColumn ); virtual ~TableColumn() override; void dispose(); diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index c202f3a52cea..02796648bfb1 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <tablemodel.hxx> +#include <utility> #include "tablecolumns.hxx" #include "tablecolumn.hxx" @@ -34,8 +35,8 @@ using namespace ::com::sun::star::table; namespace sdr::table { -TableColumns::TableColumns( const TableModelRef& xTableModel ) -: mxTableModel( xTableModel ) +TableColumns::TableColumns( TableModelRef xTableModel ) +: mxTableModel(std::move( xTableModel )) { } diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 696463aac2ef..2371ef1ba1b1 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -31,7 +31,7 @@ namespace sdr::table { class TableColumns : public ::cppu::WeakAggImplHelper1< css::table::XTableColumns > { public: - explicit TableColumns( const TableModelRef& xTableModel ); + explicit TableColumns( TableModelRef xTableModel ); virtual ~TableColumns() override; void dispose(); diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index a776c579eae2..eb5632d7cf7e 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -20,6 +20,7 @@ #include "tablehandles.hxx" +#include <utility> #include <vcl/outdev.hxx> #include <vcl/canvastools.hxx> #include <vcl/ptrstyle.hxx> @@ -50,7 +51,7 @@ protected: virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: - OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ); + OverlayTableEdge( basegfx::B2DPolyPolygon aPolyPolygon, bool bVisible ); }; } @@ -202,9 +203,9 @@ void TableEdgeHdl::CreateB2dIAObject() } -OverlayTableEdge::OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ) +OverlayTableEdge::OverlayTableEdge( basegfx::B2DPolyPolygon aPolyPolygon, bool bVisible ) : OverlayObject(COL_GRAY) -, maPolyPolygon( rPolyPolygon ) +, maPolyPolygon(std::move( aPolyPolygon )) , mbVisible(bVisible) { } diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 6c55b57bb97c..536f122d6661 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -32,6 +32,7 @@ #include <svx/svdotable.hxx> #include <editeng/borderline.hxx> #include <editeng/boxitem.hxx> +#include <utility> using ::editeng::SvxBorderLine; using namespace ::com::sun::star::uno; @@ -49,8 +50,8 @@ static SvxBorderLine gEmptyBorder; constexpr OUStringLiteral gsSize( u"Size" ); -TableLayouter::TableLayouter( const TableModelRef& xTableModel ) -: mxTable( xTableModel ) +TableLayouter::TableLayouter( TableModelRef xTableModel ) +: mxTable(std::move( xTableModel )) { } diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 309269bcce52..519c1bda0a47 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -67,7 +67,7 @@ struct EdgeInfo final class TableLayouter final { public: - explicit TableLayouter( const TableModelRef& xTableModel ); + explicit TableLayouter( TableModelRef xTableModel ); ~TableLayouter(); /** try to fit the table into the given rectangle. diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 71b51a653a6f..2b65fc0529fc 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -26,6 +26,7 @@ #include "tableundo.hxx" #include <svx/svdmodel.hxx> #include <svx/svdotable.hxx> +#include <utility> using namespace ::com::sun::star::uno; @@ -42,9 +43,9 @@ const sal_Int32 Property_OptimalHeight = 1; const sal_Int32 Property_IsVisible = 2; const sal_Int32 Property_IsStartOfNewPage = 3; -TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 nColumns ) +TableRow::TableRow( TableModelRef xTableModel, sal_Int32 nRow, sal_Int32 nColumns ) : TableRowBase( getStaticPropertySetInfo() ) -, mxTableModel( xTableModel ) +, mxTableModel(std::move( xTableModel )) , mnRow( nRow ) , mnHeight( 0 ) , mbOptimalHeight( true ) diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 9548e317f64d..59c67b60989a 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -37,7 +37,7 @@ class TableRow : public TableRowBase friend class TableModel; friend class TableRowUndo; public: - TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 nColumns ); + TableRow( TableModelRef xTableModel, sal_Int32 nRow, sal_Int32 nColumns ); virtual ~TableRow() override; void dispose(); diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index 8698f72f427c..b3a93c5c1192 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <tablemodel.hxx> +#include <utility> #include "tablerow.hxx" #include "tablerows.hxx" @@ -33,8 +34,8 @@ using namespace ::com::sun::star::table; namespace sdr::table { -TableRows::TableRows( const TableModelRef& xTableModel ) -: mxTableModel( xTableModel ) +TableRows::TableRows( TableModelRef xTableModel ) +: mxTableModel(std::move( xTableModel )) { } diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index 3b25d3d9e5f2..3141a7aac2c1 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -30,7 +30,7 @@ namespace sdr::table class TableRows : public ::cppu::WeakAggImplHelper1<css::table::XTableRows> { public: - explicit TableRows(const TableModelRef& xTableModel); + explicit TableRows(TableModelRef xTableModel); virtual ~TableRows() override; void dispose(); diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 6419c5057dab..2d71f83ef337 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -38,6 +38,7 @@ #include <svx/framelink.hxx> #include <svx/framelinkarray.hxx> #include <svx/sdooitm.hxx> +#include <utility> #include <vcl/canvastools.hxx> #include <o3tl/unit_conversion.hxx> #include <svx/xfltrit.hxx> @@ -66,9 +67,9 @@ namespace drawinglayer::primitive2d public: SdrCellPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrFillTextAttribute& rSdrFTAttribute) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrFTAttribute(rSdrFTAttribute) { } diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx index 84858c2eb208..64f2b648510e 100644 --- a/svx/source/tbxctrls/Palette.cxx +++ b/svx/source/tbxctrls/Palette.cxx @@ -21,6 +21,7 @@ #include <tools/stream.hxx> #include <palettes.hxx> +#include <utility> Palette::~Palette() { @@ -30,10 +31,10 @@ PaletteASE::~PaletteASE() { } -PaletteASE::PaletteASE( const OUString &rFPath, const OUString &rFName ) : +PaletteASE::PaletteASE( OUString aFPath, OUString aFName ) : mbValidPalette( false ), - maFPath ( rFPath ), - maASEPaletteName ( rFName ) + maFPath (std::move( aFPath )), + maASEPaletteName (std::move( aFName )) { LoadPalette(); } @@ -174,11 +175,11 @@ void PaletteASE::LoadPalette() static OString lcl_getToken(OStringBuffer& rStr, sal_Int32& index); -PaletteGPL::PaletteGPL( const OUString &rFPath, const OUString &rFName ) : +PaletteGPL::PaletteGPL( OUString aFPath, OUString aFName ) : mbLoadedPalette( false ), mbValidPalette( false ), - maFName( rFName ), - maFPath( rFPath ) + maFName(std::move( aFName )), + maFPath(std::move( aFPath )) { LoadPaletteHeader(); } @@ -322,10 +323,10 @@ static OString lcl_getToken(OStringBuffer& rStr, sal_Int32& index) // PaletteSOC ------------------------------------------------------------------ -PaletteSOC::PaletteSOC( const OUString &rFPath, const OUString &rFName ) : +PaletteSOC::PaletteSOC( OUString aFPath, OUString aFName ) : mbLoadedPalette( false ), - maFPath( rFPath ), - maSOCPaletteName( rFName ) + maFPath(std::move( aFPath )), + maSOCPaletteName(std::move( aFName )) { } diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index e786c7b60744..3ad9fa780117 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -20,6 +20,7 @@ #include <StylesPreviewWindow.hxx> #include <comphelper/propertyvalue.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <sfx2/objsh.hxx> #include <svl/itemset.hxx> @@ -105,9 +106,9 @@ void StylePoolChangeListener::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*r m_pPreviewControl->RequestStylesListUpdate(); } -StyleItemController::StyleItemController(const std::pair<OUString, OUString>& aStyleName) +StyleItemController::StyleItemController(std::pair<OUString, OUString> aStyleName) : m_eStyleFamily(SfxStyleFamily::Para) - , m_aStyleName(aStyleName) + , m_aStyleName(std::move(aStyleName)) { } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index e67d77fd59e2..20e6b059f08e 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> @@ -69,7 +70,7 @@ private: void InsertTable(); public: - TableWidget(SvxTableToolBoxControl* pControl, const OUString& rCommand); + TableWidget(SvxTableToolBoxControl* pControl, OUString aCommand); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; @@ -121,9 +122,9 @@ TableWindow::TableWindow(SvxTableToolBoxControl* pControl, weld::Widget* pParent mxTableButton->show(); } -TableWidget::TableWidget(SvxTableToolBoxControl* pControl, const OUString& rCommand) +TableWidget::TableWidget(SvxTableToolBoxControl* pControl, OUString aCommand) : mxControl(pControl) - , maCommand(rCommand) + , maCommand(std::move(aCommand)) , nCol(0) , nLine(0) , mnTableCellWidth(0) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index f19f683d71b0..70063a04980b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -120,10 +120,10 @@ namespace class SvxStyleBox_Base { public: - SvxStyleBox_Base(std::unique_ptr<weld::ComboBox> xWidget, const OUString& rCommand, SfxStyleFamily eFamily, + SvxStyleBox_Base(std::unique_ptr<weld::ComboBox> xWidget, OUString rCommand, SfxStyleFamily eFamily, const Reference<XDispatchProvider>& rDispatchProvider, - const Reference<XFrame>& _xFrame,const OUString& rClearFormatKey, - const OUString& rMoreKey, bool bInSpecialMode, SvxStyleToolBoxControl& rCtrl); + const Reference<XFrame>& _xFrame, OUString aClearFormatKey, + OUString aMoreKey, bool bInSpecialMode, SvxStyleToolBoxControl& rCtrl); virtual ~SvxStyleBox_Base() { @@ -836,12 +836,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener #define ITEM_HEIGHT 30 SvxStyleBox_Base::SvxStyleBox_Base(std::unique_ptr<weld::ComboBox> xWidget, - const OUString& rCommand, + OUString aCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame, - const OUString& rClearFormatKey, - const OUString& rMoreKey, + OUString _aClearFormatKey, + OUString _aMoreKey, bool bInSpec, SvxStyleToolBoxControl& rCtrl) : m_rCtrl(rCtrl) , m_xMenuBuilder(Application::CreateBuilder(nullptr, "svx/ui/stylemenu.ui")) @@ -853,9 +853,9 @@ SvxStyleBox_Base::SvxStyleBox_Base(std::unique_ptr<weld::ComboBox> xWidget, , bRelease( true ) , m_xDispatchProvider( rDispatchProvider ) , m_xFrame(_xFrame) - , m_aCommand( rCommand ) - , aClearFormatKey( rClearFormatKey ) - , aMoreKey( rMoreKey ) + , m_aCommand(std::move( aCommand )) + , aClearFormatKey(std::move( _aClearFormatKey )) + , aMoreKey(std::move( _aMoreKey )) , bInSpecialMode( bInSpec ) { m_xWidget->connect_changed(LINK(this, SvxStyleBox_Base, SelectHdl)); @@ -1760,22 +1760,22 @@ IMPL_LINK(SvxFontNameBox_Base, DumpAsPropertyTreeHdl, tools::JsonWriter&, rJsonW rJsonWriter.put("command", ".uno:CharFontName"); } -ColorWindow::ColorWindow(const OUString& rCommand, - std::shared_ptr<PaletteManager> const & rPaletteManager, +ColorWindow::ColorWindow(OUString rCommand, + std::shared_ptr<PaletteManager> xPaletteManager, ColorStatus& rColorStatus, sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const MenuOrToolMenuButton& rMenuButton, - TopLevelParentFunction const& rTopLevelParentFunction, - ColorSelectFunction const & rColorSelectFunction) + TopLevelParentFunction aTopLevelParentFunction, + ColorSelectFunction aColorSelectFunction) : WeldToolbarPopup(rFrame, rMenuButton.get_widget(), "svx/ui/colorwindow.ui", "palette_popup_window") , theSlotId(nSlotId) - , maCommand(rCommand) + , maCommand(std::move(rCommand)) , maMenuButton(rMenuButton) - , mxPaletteManager(rPaletteManager) + , mxPaletteManager(std::move(xPaletteManager)) , mrColorStatus(rColorStatus) - , maTopLevelParentFunction(rTopLevelParentFunction) - , maColorSelectFunction(rColorSelectFunction) + , maTopLevelParentFunction(std::move(aTopLevelParentFunction)) + , maColorSelectFunction(std::move(aColorSelectFunction)) , mxColorSet(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin", true))) , mxRecentColorSet(new SvxColorValueSet(nullptr)) , mxPaletteListBox(m_xBuilder->weld_combo_box("palette_listbox")) @@ -3973,13 +3973,13 @@ void ColorListBox::SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton) createColorWindow(); } -ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, TopLevelParentFunction const& rTopLevelParentFunction) +ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, TopLevelParentFunction aTopLevelParentFunction) : m_xButton(std::move(pControl)) , m_aColorWrapper(this) , m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor()) , m_nSlotId(0) , m_bShowNoneButton(false) - , m_aTopLevelParentFunction(rTopLevelParentFunction) + , m_aTopLevelParentFunction(std::move(aTopLevelParentFunction)) { m_xButton->connect_toggled(LINK(this, ColorListBox, ToggleHdl)); m_aSelectedColor = svx::NamedThemedColor::FromNamedColor(GetAutoColor(m_nSlotId)); @@ -4125,10 +4125,10 @@ MenuOrToolMenuButton::MenuOrToolMenuButton(weld::MenuButton* pMenuButton) { } -MenuOrToolMenuButton::MenuOrToolMenuButton(weld::Toolbar* pToolbar, const OString& rIdent) +MenuOrToolMenuButton::MenuOrToolMenuButton(weld::Toolbar* pToolbar, OString aIdent) : m_pMenuButton(nullptr) , m_pToolbar(pToolbar) - , m_aIdent(rIdent) + , m_aIdent(std::move(aIdent)) , m_pControl(nullptr) , m_nId(0) { diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index a8073a1a74d9..191dfd4cc9be 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -26,6 +26,7 @@ #include <comphelper/propertyvalue.hxx> #include <rtl/math.hxx> +#include <utility> #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/weldutils.hxx> @@ -94,7 +95,7 @@ class SvxFontSizeBox_Base { public: SvxFontSizeBox_Base(std::unique_ptr<weld::ComboBox> xWidget, - const uno::Reference< frame::XFrame >& _xFrame, + uno::Reference< frame::XFrame > _xFrame, FontHeightToolBoxControl& rCtrl); virtual ~SvxFontSizeBox_Base() @@ -172,11 +173,11 @@ private: }; SvxFontSizeBox_Base::SvxFontSizeBox_Base(std::unique_ptr<weld::ComboBox> xWidget, - const uno::Reference<frame::XFrame>& rFrame, + uno::Reference<frame::XFrame> xFrame, FontHeightToolBoxControl& rCtrl) : m_rCtrl(rCtrl) , m_bRelease(true) - , m_xFrame(rFrame) + , m_xFrame(std::move(xFrame)) , m_xWidget(new FontSizeBox(std::move(xWidget))) { m_xWidget->set_value(0); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 4871682857e9..087f71fc0b60 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <map> +#include <utility> #include <vector> #include <config_feature_desktop.h> @@ -192,13 +193,13 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext } FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent, - css::uno::Reference< css::frame::XFrame > const & xFrame, - const css::uno::Reference< css::uno::XComponentContext >& xContext) : + css::uno::Reference< css::frame::XFrame > xFrame, + css::uno::Reference< css::uno::XComponentContext > xContext) : InterimItemWindow(pParent, "svx/ui/findbox.ui", "FindBox"), m_nAsyncGetFocusId(nullptr), m_xWidget(m_xBuilder->weld_combo_box("find")), - m_xFrame(xFrame), - m_xContext(xContext), + m_xFrame(std::move(xFrame)), + m_xContext(std::move(xContext)), m_pAcc(svt::AcceleratorExecute::createAcceleratorHelper()) { InitControlBase(m_xWidget.get()); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index f9ca173d6fe2..37c8db06cf50 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -25,6 +25,7 @@ #include <svx/xlineit0.hxx> #include <svx/xlndsit.hxx> +#include <utility> #include <vcl/commandinfoprovider.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> @@ -37,16 +38,16 @@ namespace svx { - ToolboxButtonColorUpdaterBase::ToolboxButtonColorUpdaterBase(bool bWideButton, const OUString& rCommandLabel, - const OUString& rCommandURL, - const css::uno::Reference<css::frame::XFrame>& rFrame) + ToolboxButtonColorUpdaterBase::ToolboxButtonColorUpdaterBase(bool bWideButton, OUString aCommandLabel, + OUString aCommandURL, + css::uno::Reference<css::frame::XFrame> xFrame) : mbWideButton(bWideButton) , mbWasHiContrastMode(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) , maCurColor(COL_TRANSPARENT) , meImageType(vcl::ImageType::Size16) - , maCommandLabel(rCommandLabel) - , maCommandURL(rCommandURL) - , mxFrame(rFrame) + , maCommandLabel(std::move(aCommandLabel)) + , maCommandURL(std::move(aCommandURL)) + , mxFrame(std::move(xFrame)) { } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index ed81ba92f53e..a29f8cdf6c04 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -30,6 +30,7 @@ #include <o3tl/safeint.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> +#include <utility> #include <osl/diagnose.h> namespace textconversiondlgs @@ -231,11 +232,11 @@ int DictionaryList::deleteEntries( std::u16string_view rTerm ) return nPos; } -DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping +DictionaryEntry::DictionaryEntry( OUString aTerm, OUString aMapping , sal_Int16 nConversionPropertyType , bool bNewEntry ) - : m_aTerm( rTerm ) - , m_aMapping( rMapping ) + : m_aTerm(std::move( aTerm )) + , m_aMapping(std::move( aMapping )) , m_nConversionPropertyType( nConversionPropertyType ) , m_bNewEntry( bNewEntry ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 0213c53da380..bbca91feb8a8 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -30,7 +30,7 @@ namespace textconversiondlgs struct DictionaryEntry final { - DictionaryEntry( const OUString& rTerm, const OUString& rMapping + DictionaryEntry( OUString rTerm, OUString aMapping , sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType , bool bNewEntry = false ); diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 56550fd7f433..010d901f5dc3 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -29,6 +29,7 @@ #include <rtl/ref.hxx> #include <cppuhelper/supportsservice.hxx> +#include <utility> #include <vcl/svapp.hxx> namespace svxdr = svx::DocRecovery; @@ -73,7 +74,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo /** @short TODO */ - explicit RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext); + explicit RecoveryUI(css::uno::Reference< css::uno::XComponentContext > xContext); // css.lang.XServiceInfo @@ -106,8 +107,8 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo bool impl_doBringToFront(); }; -RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : m_xContext(xContext) +RecoveryUI::RecoveryUI(css::uno::Reference< css::uno::XComponentContext > xContext) + : m_xContext(std::move(xContext)) , m_pParentWindow(nullptr) , m_eJob(RecoveryUI::E_JOB_UNKNOWN) , m_pDialog(nullptr) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 2635074afee9..3d80997a115a 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -44,6 +44,7 @@ #include <svx/unoshprp.hxx> +#include <utility> #include <vcl/gdimtf.hxx> #include <vcl/wmf.hxx> #include <svtools/embedhlp.hxx> @@ -765,9 +766,9 @@ bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPro return SvxOle2Shape::getPropertyValueImpl( rName, pProperty, rValue ); } } -SvxMediaShape::SvxMediaShape(SdrObject* pObj, OUString const & referer) +SvxMediaShape::SvxMediaShape(SdrObject* pObj, OUString referer) : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ), - referer_(referer) + referer_(std::move(referer)) { SetShapeType( "com.sun.star.drawing.MediaShape" ); } diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 9fd5481d5c8b..d1ab26d2cd25 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -32,6 +32,7 @@ #include <comphelper/storagehelper.hxx> #include <sax/tools/converter.hxx> #include <sfx2/docfile.hxx> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/namespacemap.hxx> @@ -64,7 +65,7 @@ enum class SvxXMLTableImportContextEnum { Color, Marker, Dash, Hatch, Gradient, class SvxXMLTableImportContext : public SvXMLImportContext { public: - SvxXMLTableImportContext( SvXMLImport& rImport, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, + SvxXMLTableImportContext( SvXMLImport& rImport, SvxXMLTableImportContextEnum eContext, uno::Reference< XNameContainer > xTable, bool bOOoFormat ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL @@ -87,8 +88,8 @@ private: } -SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ) -: SvXMLImportContext( rImport ), mxTable( xTable ), meContext( eContext ), +SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, SvxXMLTableImportContextEnum eContext, uno::Reference< XNameContainer > xTable, bool bOOoFormat ) +: SvXMLImportContext( rImport ), mxTable(std::move( xTable )), meContext( eContext ), mbOOoFormat( bOOoFormat ) { } diff --git a/svx/source/xoutdev/XPropertyEntry.cxx b/svx/source/xoutdev/XPropertyEntry.cxx index 0c3d140e8d3d..2791946838c9 100644 --- a/svx/source/xoutdev/XPropertyEntry.cxx +++ b/svx/source/xoutdev/XPropertyEntry.cxx @@ -18,9 +18,10 @@ */ #include <svx/XPropertyEntry.hxx> +#include <utility> -XPropertyEntry::XPropertyEntry(const OUString& rPropEntryName) - : maPropEntryName(rPropEntryName) +XPropertyEntry::XPropertyEntry(OUString aPropEntryName) + : maPropEntryName(std::move(aPropEntryName)) { } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 7d8c1395e584..b85141dd16c5 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -999,9 +999,9 @@ XLineStartItem::XLineStartItem(sal_Int32 nIndex) { } -XLineStartItem::XLineStartItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon) +XLineStartItem::XLineStartItem(const OUString& rName, basegfx::B2DPolyPolygon aPolyPolygon) : NameOrIndex(XATTR_LINESTART, rName), - maPolyPolygon(rPolyPolygon) + maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1011,9 +1011,9 @@ XLineStartItem::XLineStartItem(const XLineStartItem& rItem) { } -XLineStartItem::XLineStartItem(const basegfx::B2DPolyPolygon& rPolyPolygon) +XLineStartItem::XLineStartItem(basegfx::B2DPolyPolygon aPolyPolygon) : NameOrIndex( XATTR_LINESTART, -1 ), - maPolyPolygon(rPolyPolygon) + maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1296,9 +1296,9 @@ XLineEndItem::XLineEndItem(sal_Int32 nIndex) { } -XLineEndItem::XLineEndItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon) +XLineEndItem::XLineEndItem(const OUString& rName, basegfx::B2DPolyPolygon aPolyPolygon) : NameOrIndex(XATTR_LINEEND, rName), - maPolyPolygon(rPolyPolygon) + maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1308,9 +1308,9 @@ XLineEndItem::XLineEndItem(const XLineEndItem& rItem) { } -XLineEndItem::XLineEndItem(const basegfx::B2DPolyPolygon& rPolyPolygon) +XLineEndItem::XLineEndItem(basegfx::B2DPolyPolygon aPolyPolygon) : NameOrIndex( XATTR_LINEEND, -1 ), - maPolyPolygon(rPolyPolygon) + maPolyPolygon(std::move(aPolyPolygon)) { } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 016dd261b858..bc8834e868b5 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -18,6 +18,7 @@ */ #include <memory> +#include <utility> #include <xmlxtexp.hxx> #include <xmlxtimp.hxx> #include <o3tl/safeint.hxx> @@ -35,9 +36,9 @@ XColorEntry::XColorEntry(const Color& rColor, const OUString& rName) { } -XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName) +XLineEndEntry::XLineEndEntry(basegfx::B2DPolyPolygon _aB2DPolyPolygon, const OUString& rName) : XPropertyEntry(rName), - aB2DPolyPolygon(rB2DPolyPolygon) + aB2DPolyPolygon(std::move(_aB2DPolyPolygon)) { } @@ -97,11 +98,11 @@ XBitmapEntry::XBitmapEntry(const XBitmapEntry& rOther) XPropertyList::XPropertyList( XPropertyListType type, - const OUString& rPath, const OUString& rReferer + OUString aPath, OUString aReferer ) : meType ( type ), maName ( "standard" ), - maPath ( rPath ), - maReferer ( rReferer ), + maPath (std::move( aPath )), + maReferer (std::move( aReferer )), mbListDirty ( true ), mbEmbedInDocument( false ) { |