sw/source/core/access/accmap.cxx | 21 ++++++-----
sw/source/core/attr/format.cxx | 1
sw/source/core/attr/hints.cxx | 3 +
sw/source/core/bastyp/breakit.cxx | 1
sw/source/core/bastyp/calc.cxx | 1
sw/source/core/bastyp/swcache.cxx | 5 +-
sw/source/core/crsr/bookmark.cxx | 5 +-
sw/source/core/crsr/contentcontrolbutton.cxx | 7 ++-
sw/source/core/crsr/pam.cxx | 1
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 5 +-
sw/source/core/doc/docfld.cxx | 5 +-
sw/source/core/doc/docredln.cxx | 1
sw/source/core/doc/htmltbl.cxx | 1
sw/source/core/doc/list.cxx | 1
sw/source/core/doc/number.cxx | 1
sw/source/core/doc/tblafmt.cxx | 1
sw/source/core/docnode/cancellablejob.cxx | 5 +-
sw/source/core/docnode/cancellablejob.hxx | 2 -
sw/source/core/docnode/finalthreadmanager.cxx | 5 +-
sw/source/core/docnode/retrieveinputstream.cxx | 9 ++---
sw/source/core/docnode/section.cxx | 1
sw/source/core/edit/autofmt.cxx | 7 ++-
sw/source/core/fields/cellfml.cxx | 1
sw/source/core/fields/dbfld.cxx | 1
sw/source/core/fields/ddefld.cxx | 1
sw/source/core/fields/docufld.cxx | 1
sw/source/core/fields/expfld.cxx | 1
sw/source/core/fields/macrofld.cxx | 1
sw/source/core/fields/reffld.cxx | 3 +
sw/source/core/fields/scrptfld.cxx | 1
sw/source/core/inc/SearchResultLocator.hxx | 6 +--
sw/source/core/inc/SwUndoFmt.hxx | 6 +--
sw/source/core/inc/UndoAttribute.hxx | 4 +-
sw/source/core/inc/UndoBookmark.hxx | 2 -
sw/source/core/inc/UndoInsert.hxx | 8 ++--
sw/source/core/inc/UndoManager.hxx | 2 -
sw/source/core/inc/UndoNumbering.hxx | 2 -
sw/source/core/inc/UndoTable.hxx | 2 -
sw/source/core/inc/acorrect.hxx | 5 +-
sw/source/core/inc/bookmark.hxx | 2 -
sw/source/core/inc/contentcontrolbutton.hxx | 3 -
sw/source/core/inc/docfld.hxx | 2 -
sw/source/core/inc/retrievedinputstreamdata.hxx | 3 +
sw/source/core/inc/retrieveinputstream.hxx | 4 +-
sw/source/core/inc/rolbck.hxx | 2 -
sw/source/core/inc/swblocks.hxx | 2 -
sw/source/core/inc/swcache.hxx | 2 -
sw/source/core/inc/txmsrt.hxx | 13 +++----
sw/source/core/inc/txtfrm.hxx | 5 +-
sw/source/core/inc/undoflystrattr.hxx | 4 +-
sw/source/core/inc/unoflatpara.hxx | 2 -
sw/source/core/inc/unoport.hxx | 6 +--
sw/source/core/inc/wrong.hxx | 4 +-
sw/source/core/layout/paintfrm.cxx | 7 ++-
sw/source/core/ole/ndole.cxx | 5 +-
sw/source/core/swg/swblocks.cxx | 5 +-
sw/source/core/text/porfld.cxx | 5 +-
sw/source/core/text/porfld.hxx | 2 -
sw/source/core/text/porftn.hxx | 2 -
sw/source/core/text/txtftn.cxx | 5 +-
sw/source/core/text/wrong.cxx | 9 ++---
sw/source/core/tox/ToxTextGenerator.cxx | 1
sw/source/core/tox/tox.cxx | 1
sw/source/core/tox/txmsrt.cxx | 13 +++----
sw/source/core/txtnode/atrref.cxx | 1
sw/source/core/txtnode/fmtatr2.cxx | 1
sw/source/core/txtnode/txtedt.cxx | 1
sw/source/core/undo/SwUndoField.cxx | 1
sw/source/core/undo/SwUndoFmt.cxx | 15 ++++----
sw/source/core/undo/docundo.cxx | 5 +-
sw/source/core/undo/rolbck.cxx | 7 ++-
sw/source/core/undo/unattr.cxx | 8 ++--
sw/source/core/undo/unbkmk.cxx | 7 ++-
sw/source/core/undo/undoflystrattr.cxx | 9 ++---
sw/source/core/undo/unins.cxx | 23 ++++++------
sw/source/core/undo/unnum.cxx | 5 +-
sw/source/core/undo/unovwr.cxx | 5 +-
sw/source/core/undo/untbl.cxx | 4 +-
sw/source/core/unocore/unocontentcontrol.cxx | 6 +--
sw/source/core/unocore/unoflatpara.cxx | 5 +-
sw/source/core/unocore/unoobj.cxx | 1
sw/source/core/unocore/unoobj2.cxx | 9 ++---
sw/source/core/unocore/unoparagraph.cxx | 5 +-
sw/source/core/unocore/unoport.cxx | 13 +++----
sw/source/core/unocore/unoportenum.cxx | 16 ++++----
sw/source/core/unocore/unorefmk.cxx | 4 +-
sw/source/core/unocore/unostyle.cxx | 15 ++++----
sw/source/core/unocore/unotextmarkup.cxx | 5 +-
sw/source/filter/basflt/fltshell.cxx | 5 +-
sw/source/filter/basflt/shellio.cxx | 1
sw/source/filter/html/htmlctxt.cxx | 5 +-
sw/source/filter/html/htmlform.cxx | 7 ++-
sw/source/filter/html/htmlforw.cxx | 5 +-
sw/source/filter/html/htmltab.cxx | 15 ++++----
sw/source/filter/html/parcss1.hxx | 9 ++---
sw/source/filter/html/svxcss1.cxx | 9 ++---
sw/source/filter/html/svxcss1.hxx | 4 +-
sw/source/filter/html/swhtml.cxx | 17 +++++----
sw/source/filter/html/swhtml.hxx | 15 ++++----
sw/source/filter/html/wrthtml.hxx | 2 -
sw/source/filter/inc/fltshell.hxx | 2 -
sw/source/filter/ww8/attributeoutputbase.hxx | 5 +-
sw/source/filter/ww8/writerhelper.cxx | 9 ++---
sw/source/filter/ww8/writerhelper.hxx | 4 +-
sw/source/filter/ww8/wrtww8.hxx | 9 ++---
sw/source/filter/ww8/ww8graf.cxx | 5 +-
sw/source/filter/ww8/ww8par.cxx | 5 +-
sw/source/filter/ww8/ww8par.hxx | 15 ++++----
sw/source/filter/xml/xmlimpit.cxx | 4 +-
sw/source/filter/xml/xmlimpit.hxx | 2 -
sw/source/filter/xml/xmltbli.cxx | 11 +++---
sw/source/ui/dbui/createaddresslistdialog.cxx | 5 +-
sw/source/ui/dbui/createaddresslistdialog.hxx | 2 -
sw/source/ui/dbui/dbinsdlg.cxx | 5 +-
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 5 +-
sw/source/ui/dbui/mailmergewizard.cxx | 5 +-
sw/source/ui/dbui/mmaddressblockpage.cxx | 7 ++-
sw/source/ui/dbui/mmaddressblockpage.hxx | 2 -
sw/source/ui/dbui/selectdbtabledialog.cxx | 5 +-
sw/source/ui/dbui/selectdbtabledialog.hxx | 2 -
sw/source/ui/dialog/swdlgfact.hxx | 3 +
sw/source/ui/frmdlg/cption.cxx | 7 ++-
sw/source/ui/index/cnttab.cxx | 7 ++-
sw/source/ui/index/swuiidxmrk.cxx | 5 +-
sw/source/ui/vba/vbaaddin.cxx | 5 +-
sw/source/ui/vba/vbaaddin.hxx | 3 -
sw/source/ui/vba/vbaautotextentry.cxx | 5 +-
sw/source/ui/vba/vbaautotextentry.hxx | 2 -
sw/source/ui/vba/vbabookmark.cxx | 5 +-
sw/source/ui/vba/vbabookmark.hxx | 2 -
sw/source/ui/vba/vbabookmarks.cxx | 7 ++-
sw/source/ui/vba/vbabookmarks.hxx | 2 -
sw/source/ui/vba/vbaborders.cxx | 5 +-
sw/source/ui/vba/vbacell.cxx | 6 ++-
sw/source/ui/vba/vbacell.hxx | 2 -
sw/source/ui/vba/vbacells.cxx | 5 +-
sw/source/ui/vba/vbacolumn.cxx | 5 +-
sw/source/ui/vba/vbacolumn.hxx | 2 -
sw/source/ui/vba/vbacolumns.cxx | 8 ++--
sw/source/ui/vba/vbacolumns.hxx | 4 +-
sw/source/ui/vba/vbadocumentproperties.cxx | 11 +++---
sw/source/ui/vba/vbadocuments.cxx | 3 +
sw/source/ui/vba/vbafield.cxx | 5 +-
sw/source/ui/vba/vbafind.cxx | 5 +-
sw/source/ui/vba/vbafind.hxx | 2 -
sw/source/ui/vba/vbaframe.cxx | 5 +-
sw/source/ui/vba/vbaframe.hxx | 2 -
sw/source/ui/vba/vbaframes.cxx | 5 +-
sw/source/ui/vba/vbaframes.hxx | 2 -
sw/source/ui/vba/vbaheaderfooter.cxx | 3 +
sw/source/ui/vba/vbaheaderfooter.hxx | 2 -
sw/source/ui/vba/vbaheadersfooters.cxx | 3 +
sw/source/ui/vba/vbalistformat.cxx | 3 +
sw/source/ui/vba/vbalistformat.hxx | 2 -
sw/source/ui/vba/vbalistgalleries.cxx | 3 +
sw/source/ui/vba/vbalistgalleries.hxx | 2 -
sw/source/ui/vba/vbalistgallery.cxx | 4 +-
sw/source/ui/vba/vbalistgallery.hxx | 2 -
sw/source/ui/vba/vbalisthelper.cxx | 3 +
sw/source/ui/vba/vbalisthelper.hxx | 2 -
sw/source/ui/vba/vbalistlevel.cxx | 3 +
sw/source/ui/vba/vbalistlevel.hxx | 2 -
sw/source/ui/vba/vbalistlevels.cxx | 3 +
sw/source/ui/vba/vbalistlevels.hxx | 2 -
sw/source/ui/vba/vbalisttemplates.cxx | 4 +-
sw/source/ui/vba/vbalisttemplates.hxx | 2 -
sw/source/ui/vba/vbapane.cxx | 5 +-
sw/source/ui/vba/vbapane.hxx | 2 -
sw/source/ui/vba/vbapanes.cxx | 5 +-
sw/source/ui/vba/vbaparagraph.cxx | 7 ++-
sw/source/ui/vba/vbaparagraph.hxx | 2 -
sw/source/ui/vba/vbaparagraphformat.cxx | 3 +
sw/source/ui/vba/vbaparagraphformat.hxx | 2 -
sw/source/ui/vba/vbarange.cxx | 7 ++-
sw/source/ui/vba/vbarange.hxx | 6 +--
sw/source/ui/vba/vbareplacement.cxx | 6 ++-
sw/source/ui/vba/vbareplacement.hxx | 2 -
sw/source/ui/vba/vbarevision.cxx | 3 +
sw/source/ui/vba/vbarevision.hxx | 2 -
sw/source/ui/vba/vbarevisions.cxx | 5 +-
sw/source/ui/vba/vbarevisions.hxx | 2 -
sw/source/ui/vba/vbarow.cxx | 5 +-
sw/source/ui/vba/vbarow.hxx | 2 -
sw/source/ui/vba/vbarows.cxx | 7 ++-
sw/source/ui/vba/vbarows.hxx | 4 +-
sw/source/ui/vba/vbasection.cxx | 5 +-
sw/source/ui/vba/vbasection.hxx | 2 -
sw/source/ui/vba/vbasections.cxx | 7 ++-
sw/source/ui/vba/vbaselection.cxx | 3 +
sw/source/ui/vba/vbaselection.hxx | 2 -
sw/source/ui/vba/vbastyle.cxx | 3 +
sw/source/ui/vba/vbastyle.hxx | 2 -
sw/source/ui/vba/vbatable.cxx | 3 +
sw/source/ui/vba/vbatable.hxx | 2 -
sw/source/ui/vba/vbatablehelper.cxx | 3 +
sw/source/ui/vba/vbatablehelper.hxx | 2 -
sw/source/ui/vba/vbatableofcontents.cxx | 5 +-
sw/source/ui/vba/vbatableofcontents.hxx | 2 -
sw/source/ui/vba/vbatables.cxx | 3 +
sw/source/ui/vba/vbatablesofcontents.cxx | 5 +-
sw/source/ui/vba/vbatabstops.cxx | 5 +-
sw/source/ui/vba/vbatemplate.cxx | 5 +-
sw/source/ui/vba/vbatemplate.hxx | 2 -
sw/source/ui/vba/vbavariable.cxx | 5 +-
sw/source/ui/vba/vbavariable.hxx | 2 -
sw/source/ui/vba/vbaview.cxx | 5 +-
sw/source/ui/vba/vbaview.hxx | 2 -
sw/source/uibase/app/docst.cxx | 9 ++---
sw/source/uibase/config/uinums.cxx | 5 +-
sw/source/uibase/dbui/maildispatcher.cxx | 21 ++++++-----
sw/source/uibase/dbui/mailmergehelper.cxx | 25 +++++++-------
sw/source/uibase/dochdl/gloshdl.cxx | 5 +-
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 13 +++----
sw/source/uibase/docvw/PostItMgr.cxx | 5 +-
sw/source/uibase/frmdlg/frmmgr.cxx | 5 +-
sw/source/uibase/inc/content.hxx | 9 ++---
sw/source/uibase/inc/dbinsdlg.hxx | 7 ++-
sw/source/uibase/inc/fldmgr.hxx | 7 ++-
sw/source/uibase/inc/frmmgr.hxx | 2 -
sw/source/uibase/inc/maildispatcher.hxx | 2 -
sw/source/uibase/inc/mailmergehelper.hxx | 17 +++++----
sw/source/uibase/inc/mailmergewizard.hxx | 2 -
sw/source/uibase/inc/navicont.hxx | 2 -
sw/source/uibase/inc/olmenu.hxx | 2 -
sw/source/uibase/inc/optload.hxx | 5 +-
sw/source/uibase/inc/redlndlg.hxx | 2 -
sw/source/uibase/inc/swcont.hxx | 2 -
sw/source/uibase/inc/swuiidxmrk.hxx | 2 -
sw/source/uibase/inc/uinums.hxx | 2 -
sw/source/uibase/inc/unoatxt.hxx | 2 -
sw/source/uibase/inc/workctrl.hxx | 2 -
sw/source/uibase/lingu/olmenu.cxx | 5 +-
sw/source/uibase/misc/redlndlg.cxx | 5 +-
sw/source/uibase/ribbar/workctrl.cxx | 5 +-
sw/source/uibase/sidebar/StylePresetsPanel.hxx | 5 +-
sw/source/uibase/sidebar/ThemePanel.cxx | 5 +-
sw/source/uibase/uno/unoatxt.cxx | 9 ++---
sw/source/uibase/uno/unomailmerge.cxx | 7 ++-
sw/source/uibase/uno/unotxdoc.cxx | 3 +
sw/source/uibase/utlui/content.cxx | 13 +++----
240 files changed, 658 insertions(+), 500 deletions(-)
New commits:
commit 24865e2d57a32aab7212b1a283f9b30215900dda
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Aug 11 11:04:01 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 12 08:04:16 2022 +0200
clang-tidy modernize-pass-by-value in sw
Change-Id: I9a3b33595e34a264baeede33672a0c090ae85157
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138134
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 4bb32730583e..632591ddfe93 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -19,6 +19,7 @@
#include <rtl/ref.hxx>
#include <cppuhelper/weakref.hxx>
+#include <utility>
#include <vcl/window.hxx>
#include <svx/svdmodel.hxx>
#include <svx/unomod.hxx>
@@ -379,17 +380,17 @@ public:
public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
- const SwAccessibleChild& rFrameOrObj )
+ SwAccessibleChild aFrameOrObj )
: mxAcc( pA ),
- maFrameOrObj( rFrameOrObj ),
+ maFrameOrObj(std::move( aFrameOrObj )),
meType( eT ),
mnStates( AccessibleStates::NONE ),
mpParentFrame( nullptr )
{}
SwAccessibleEvent_Impl( EventType eT,
- const SwAccessibleChild& rFrameOrObj )
- : maFrameOrObj( rFrameOrObj ),
+ SwAccessibleChild aFrameOrObj )
+ : maFrameOrObj(std::move( aFrameOrObj )),
meType( eT ),
mnStates( AccessibleStates::NONE ),
mpParentFrame( nullptr )
@@ -409,11 +410,11 @@ public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
- const SwAccessibleChild& rFrameOrObj,
+ SwAccessibleChild aFrameOrObj,
const SwRect& rR )
: maOldBox( rR ),
mxAcc( pA ),
- maFrameOrObj( rFrameOrObj ),
+ maFrameOrObj(std::move( aFrameOrObj )),
meType( eT ),
mnStates( AccessibleStates::NONE ),
mpParentFrame( nullptr )
@@ -425,10 +426,10 @@ public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
- const SwAccessibleChild& rFrameOrObj,
+ SwAccessibleChild aFrameOrObj,
const AccessibleStates _nStates )
: mxAcc( pA ),
- maFrameOrObj( rFrameOrObj ),
+ maFrameOrObj(std::move( aFrameOrObj )),
meType( eT ),
mnStates( _nStates ),
mpParentFrame( nullptr )
@@ -438,9 +439,9 @@ public:
}
SwAccessibleEvent_Impl( EventType eT, const SwFrame *pParentFrame,
- const SwAccessibleChild& rFrameOrObj, const SwRect& rR ) :
+ SwAccessibleChild aFrameOrObj, const SwRect& rR ) :
maOldBox( rR ),
- maFrameOrObj( rFrameOrObj ),
+ maFrameOrObj(std::move( aFrameOrObj )),
meType( eT ),
mnStates( AccessibleStates::NONE ),
mpParentFrame( pParentFrame )
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index b4eb205db4b2..3f9aa8f85f7f 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -32,6 +32,7 @@
#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
#include <svx/unobrushitemhelper.hxx>
#include <svx/xdef.hxx>
+#include <utility>
using namespace com::sun::star;
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 8016037bfdb8..abcdd54fe076 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -23,6 +23,7 @@
#include <ndtxt.hxx>
#include <swtypes.hxx>
#include <svl/languageoptions.hxx>
+#include <utility>
#include <vcl/outdev.hxx>
#include <osl/diagnose.h>
@@ -74,7 +75,7 @@ SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE,
sal_uInt16 nW )
}
SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW,
std::vector<sal_uInt16> aW )
- : SwMsgPoolItem( RES_UPDATE_ATTR ), m_nStart( nS ), m_nEnd( nE ),
m_nWhichAttr( nW ), m_aWhichFmtAttrs( aW )
+ : SwMsgPoolItem( RES_UPDATE_ATTR ), m_nStart( nS ), m_nEnd( nE ),
m_nWhichAttr( nW ), m_aWhichFmtAttrs(std::move( aW ))
{
}
diff --git a/sw/source/core/bastyp/breakit.cxx
b/sw/source/core/bastyp/breakit.cxx
index 2fd474d0df87..a8948ede9d97 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -27,6 +27,7 @@
#include <unicode/uchar.h>
#include <unotools/localedatawrapper.hxx>
#include <algorithm>
+#include <utility>
using namespace com::sun::star;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index baa98a3815db..a2dfd6c4aee2 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -48,6 +48,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/useroptions.hxx>
#include <usrfld.hxx>
+#include <utility>
#include <viewsh.hxx>
#include <com/sun/star/i18n/KParseTokens.hpp>
#include <com/sun/star/i18n/KParseType.hpp>
diff --git a/sw/source/core/bastyp/swcache.cxx
b/sw/source/core/bastyp/swcache.cxx
index ccf7522a2370..cf4e8e135454 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -22,6 +22,7 @@
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <utility>
#include <limits.h>
@@ -76,7 +77,7 @@ void SwCache::Check()
SwCache::SwCache( const sal_uInt16 nInitSize
#ifdef DBG_UTIL
- , const OString &rNm
+ , OString aNm
#endif
) :
m_pRealFirst( nullptr ),
@@ -84,7 +85,7 @@ SwCache::SwCache( const sal_uInt16 nInitSize
m_pLast( nullptr ),
m_nCurMax( nInitSize )
#ifdef DBG_UTIL
- , m_aName( rNm )
+ , m_aName(std::move( aNm ))
, m_nAppend( 0 )
, m_nInsertFree( 0 )
, m_nReplace( 0 )
diff --git a/sw/source/core/crsr/bookmark.cxx b/sw/source/core/crsr/bookmark.cxx
index a6c22c804e6b..6796d672387f 100644
--- a/sw/source/core/crsr/bookmark.cxx
+++ b/sw/source/core/crsr/bookmark.cxx
@@ -30,6 +30,7 @@
#include <sfx2/viewsh.hxx>
#include <UndoBookmark.hxx>
#include <unobookmark.hxx>
+#include <utility>
#include <xmloff/odffields.hxx>
#include <libxml/xmlwriter.h>
#include <comphelper/random.hxx>
@@ -267,9 +268,9 @@ namespace
namespace sw::mark
{
MarkBase::MarkBase(const SwPaM& aPaM,
- const OUString& rName)
+ OUString aName)
: m_oPos1(*aPaM.GetPoint())
- , m_aName(rName)
+ , m_aName(std::move(aName))
{
m_oPos1->SetMark(this);
lcl_FixPosition(*m_oPos1);
diff --git a/sw/source/core/crsr/contentcontrolbutton.cxx
b/sw/source/core/crsr/contentcontrolbutton.cxx
index 4a4721cf7662..cd3deb5459bb 100644
--- a/sw/source/core/crsr/contentcontrolbutton.cxx
+++ b/sw/source/core/crsr/contentcontrolbutton.cxx
@@ -9,6 +9,7 @@
#include <contentcontrolbutton.hxx>
+#include <utility>
#include <vcl/weldutils.hxx>
#include <vcl/event.hxx>
#include <vcl/decoview.hxx>
@@ -16,10 +17,10 @@
#include <edtwin.hxx>
#include <dview.hxx>
-SwContentControlButton::SwContentControlButton(
- SwEditWin* pEditWin, const std::shared_ptr<SwContentControl>&
pContentControl)
+SwContentControlButton::SwContentControlButton(SwEditWin* pEditWin,
+
std::shared_ptr<SwContentControl> pContentControl)
: Control(pEditWin, WB_DIALOGCONTROL)
- , m_pContentControl(pContentControl)
+ , m_pContentControl(std::move(pContentControl))
{
assert(GetParent());
assert(dynamic_cast<SwEditWin*>(GetParent()));
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 7015d5069917..b4db9c4275cd 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -45,6 +45,7 @@
#include <hints.hxx>
#include <txatbase.hxx>
#include <osl/diagnose.h>
+#include <utility>
#include <xmloff/odffields.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index eb52f7c22f45..4aa07130b804 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -45,6 +45,7 @@
#include <tools/urlobj.hxx>
#include <unotools/charclass.hxx>
#include <unotools/securityoptions.hxx>
+#include <utility>
using namespace ::com::sun::star;
@@ -57,8 +58,8 @@ namespace
SwTableNode* pTableNd;
SwSectionNode* pSectNd;
- explicit FindItem(const OUString& rS)
- : m_Item(rS), pTableNd(nullptr), pSectNd(nullptr)
+ explicit FindItem(OUString aS)
+ : m_Item(std::move(aS)), pTableNd(nullptr), pSectNd(nullptr)
{}
};
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index bdc8b0c9f22d..8f50b72ced7b 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -58,6 +58,7 @@
#include <authfld.hxx>
#include <txtinet.hxx>
#include <fmtcntnt.hxx>
+#include <utility>
using namespace ::com::sun::star::uno;
@@ -363,9 +364,9 @@ sal_Int32 SetGetExpField::GetCntPosFromContent() const
return nRet;
}
-HashStr::HashStr( const OUString& rName, const OUString& rText,
+HashStr::HashStr( const OUString& rName, OUString aText,
HashStr* pNxt )
- : SwHash( rName ), aSetStr( rText )
+ : SwHash( rName ), aSetStr(std::move( aText ))
{
pNext.reset( pNxt );
}
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 0f76346217d9..4213ae9019a0 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -47,6 +47,7 @@
#include <hints.hxx>
#include <pamtyp.hxx>
#include <poolfmt.hxx>
+#include <utility>
#include <view.hxx>
#include <viewopt.hxx>
#include <usrpref.hxx>
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index c21da4c8017a..3fdc83bfcdfb 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -33,6 +33,7 @@
#include <rootfrm.hxx>
#include <flyfrm.hxx>
#include <poolfmt.hxx>
+#include <utility>
#include <viewsh.hxx>
#include <tabfrm.hxx>
#include <viewopt.hxx>
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index 706ba19ce40f..aa4c06f473aa 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -22,6 +22,7 @@
#include <numrule.hxx>
#include <ndarr.hxx>
#include <node.hxx>
+#include <utility>
SwList::SwList( OUString sListId,
SwNumRule& rDefaultListStyle,
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 9a62e8603388..968734f907b2 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <hintids.hxx>
+#include <utility>
#include <vcl/font.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/numitem.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 9a8cd8bff543..901b472fa74b 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -64,6 +64,7 @@
#include <legacyitem.hxx>
#include <memory>
+#include <utility>
#include <vector>
/*
diff --git a/sw/source/core/docnode/cancellablejob.cxx
b/sw/source/core/docnode/cancellablejob.cxx
index eecd1d33683d..d636078e2c1d 100644
--- a/sw/source/core/docnode/cancellablejob.cxx
+++ b/sw/source/core/docnode/cancellablejob.cxx
@@ -18,9 +18,10 @@
*/
#include "cancellablejob.hxx"
#include <observablethread.hxx>
+#include <utility>
-CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >&
rThread ) :
- mrThread( rThread )
+CancellableJob::CancellableJob( rtl::Reference< ObservableThread > xThread ) :
+ mrThread(std::move( xThread ))
{
}
diff --git a/sw/source/core/docnode/cancellablejob.hxx
b/sw/source/core/docnode/cancellablejob.hxx
index 010e1f4dec6f..3cd2119299a4 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -31,7 +31,7 @@
class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable>
{
public:
- explicit CancellableJob(const ::rtl::Reference<ObservableThread>& rThread);
+ explicit CancellableJob(::rtl::Reference<ObservableThread> xThread);
// css::util::XCancellable:
virtual void SAL_CALL cancel() override;
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index 4eb80a07168b..9d293b05492f 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -29,6 +29,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <mutex>
+#include <utility>
/** thread to cancel a give list of cancellable jobs
@@ -145,10 +146,10 @@ class TerminateOfficeThread : public osl::Thread
{
public:
TerminateOfficeThread( CancelJobsThread const & rCancelJobsThread,
- css::uno::Reference<
css::uno::XComponentContext > const & xContext )
+ css::uno::Reference<
css::uno::XComponentContext > xContext )
: mrCancelJobsThread( rCancelJobsThread ),
mbStopOfficeTermination( false ),
- mxContext( xContext )
+ mxContext(std::move( xContext ))
{
}
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx
b/sw/source/core/docnode/retrieveinputstream.cxx
index 8054e341b7bb..cc4e60758c3a 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -23,6 +23,7 @@
#include <unotools/mediadescriptor.hxx>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <utility>
/* class for a thread to retrieve an input stream given by a URL
@@ -39,11 +40,11 @@
SwAsyncRetrieveInputStreamThread::SwAsyncRetrieveInputStreamThread(
const SwRetrievedInputStreamDataManager::tDataKey
nDataKey,
- const OUString& rLinkedURL,
- const OUString& rReferer )
+ OUString aLinkedURL,
+ OUString aReferer )
: mnDataKey( nDataKey ),
- mrLinkedURL( rLinkedURL ),
- mrReferer( rReferer )
+ mrLinkedURL(std::move( aLinkedURL )),
+ mrReferer(std::move( aReferer ))
{
}
diff --git a/sw/source/core/docnode/section.cxx
b/sw/source/core/docnode/section.cxx
index b112595a84c1..96f448b3d0f5 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -61,6 +61,7 @@
#include <calbck.hxx>
#include <fmtclds.hxx>
#include <algorithm>
+#include <utility>
#include "ndsect.hxx"
using namespace ::com::sun::star;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index fccdbcc25398..fc35471c63c8 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -64,6 +64,7 @@
#include <itabenum.hxx>
#include <memory>
+#include <utility>
using namespace ::com::sun::star;
@@ -218,7 +219,7 @@ class SwAutoFormat
}
public:
- SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & rFlags,
+ SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags aFlags,
SwNodeIndex const * pSttNd = nullptr, SwNodeIndex const *
pEndNd = nullptr );
};
@@ -2227,9 +2228,9 @@ void SwAutoFormat::AutoCorrect(TextFrameIndex nPos)
ClearRedlineText();
}
-SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const
& rFlags,
+SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags aFlags,
SwNodeIndex const * pSttNd, SwNodeIndex const *
pEndNd )
- : m_aFlags( rFlags ),
+ : m_aFlags(std::move( aFlags )),
m_aDelPam( pEdShell->GetDoc()->GetNodes().GetEndOfExtras() ),
m_aNdIdx( pEdShell->GetDoc()->GetNodes().GetEndOfExtras(),
SwNodeOffset(+1) ),
m_aEndNdIdx( pEdShell->GetDoc()->GetNodes().GetEndOfContent() ),
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 0b25bf75e90d..02ecda68477d 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -48,6 +48,7 @@
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
#include <svl/numformat.hxx>
+#include <utility>
namespace
{
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index b6c622b087ae..867aac13c209 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -33,6 +33,7 @@
#include <dbmgr.hxx>
#include <unofldmid.h>
#include <o3tl/string_view.hxx>
+#include <utility>
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index c80e514593ce..19efa6a207ea 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -36,6 +36,7 @@
#include <swbaslnk.hxx>
#include <unofldmid.h>
#include <hints.hxx>
+#include <utility>
using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index ac638bfadd58..76e32a6aeb73 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -69,6 +69,7 @@
#include <pagefrm.hxx>
#include <cntfrm.hxx>
#include <pam.hxx>
+#include <utility>
#include <viewsh.hxx>
#include <dbmgr.hxx>
#include <shellres.hxx>
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index a7434fbc5234..6923eb6ae5f6 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -58,6 +58,7 @@
#include <SwStyleNameMapper.hxx>
#include <unofldmid.h>
#include <numrule.hxx>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
diff --git a/sw/source/core/fields/macrofld.cxx
b/sw/source/core/fields/macrofld.cxx
index efab24d877cf..244edae398d1 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
#include <comphelper/processfactory.hxx>
+#include <utility>
#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c304f311df7f..c5a2902cfa2b 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -47,6 +47,7 @@
#include <IMark.hxx>
#include <crossrefbookmark.hxx>
#include <ftnidx.hxx>
+#include <utility>
#include <viewsh.hxx>
#include <unofldmid.h>
#include <SwStyleNameMapper.hxx>
@@ -1307,7 +1308,7 @@ private:
static sal_uInt16 GetFirstUnusedId( std::set<sal_uInt16> &rIds );
public:
- explicit RefIdsMap( const OUString& rName ) : aName( rName ), bInit( false
) {}
+ explicit RefIdsMap( OUString _aName ) : aName(std::move( _aName )), bInit(
false ) {}
void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, bool
bField );
diff --git a/sw/source/core/fields/scrptfld.cxx
b/sw/source/core/fields/scrptfld.cxx
index eb2e8609ffd8..302845281d36 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -22,6 +22,7 @@
#include <strings.hrc>
#include <o3tl/any.hxx>
#include <swtypes.hxx>
+#include <utility>
using namespace ::com::sun::star;
diff --git a/sw/source/core/inc/SearchResultLocator.hxx
b/sw/source/core/inc/SearchResultLocator.hxx
index f8c30b77df5f..ad48e075d27d 100644
--- a/sw/source/core/inc/SearchResultLocator.hxx
+++ b/sw/source/core/inc/SearchResultLocator.hxx
@@ -13,6 +13,7 @@
#include <swdllapi.h>
#include <doc.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <utility>
namespace sw::search
{
@@ -31,11 +32,10 @@ struct SearchIndexData
SearchIndexData() {}
- SearchIndexData(NodeType eType, SwNodeOffset nNodeIndex,
- OUString const& aObjectName = OUString())
+ SearchIndexData(NodeType eType, SwNodeOffset nNodeIndex, OUString
aObjectName = OUString())
: meType(eType)
, mnNodeIndex(nNodeIndex)
- , maObjectName(aObjectName)
+ , maObjectName(std::move(aObjectName))
{
}
};
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 499a6fcd65b3..c3f0a256f16c 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -87,8 +87,8 @@ protected:
SwDoc& m_rDoc;
public:
- SwUndoRenameFormat(SwUndoId nUndoId, const OUString & sOldName,
- const OUString & sNewName,
+ SwUndoRenameFormat(SwUndoId nUndoId, OUString sOldName,
+ OUString sNewName,
SwDoc& rDoc);
virtual ~SwUndoRenameFormat() override;
@@ -243,7 +243,7 @@ class SwUndoNumruleRename final : public SwUndo
SwDoc& m_rDoc;
public:
- SwUndoNumruleRename(const OUString & aOldName, const OUString & aNewName,
+ SwUndoNumruleRename(OUString aOldName, OUString aNewName,
SwDoc& rDoc);
virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
diff --git a/sw/source/core/inc/UndoAttribute.hxx
b/sw/source/core/inc/UndoAttribute.hxx
index ffe4c4f3206d..c3cf4925d95a 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -47,7 +47,7 @@ class SwUndoAttr final : public SwUndo, private SwUndRng
void RemoveIdx( SwDoc& rDoc );
public:
- SwUndoAttr( const SwPaM&, const SfxItemSet &, const SetAttrMode nFlags );
+ SwUndoAttr( const SwPaM&, SfxItemSet, const SetAttrMode nFlags );
SwUndoAttr( const SwPaM&, const SfxPoolItem&, const SetAttrMode nFlags );
virtual ~SwUndoAttr() override;
@@ -216,7 +216,7 @@ class SwUndoChangeFootNote final : public SwUndo, private
SwUndRng
const bool m_bEndNote;
public:
- SwUndoChangeFootNote( const SwPaM& rRange, const OUString& rText,
+ SwUndoChangeFootNote( const SwPaM& rRange, OUString aText,
bool bIsEndNote );
virtual ~SwUndoChangeFootNote() override;
diff --git a/sw/source/core/inc/UndoBookmark.hxx
b/sw/source/core/inc/UndoBookmark.hxx
index dc57ad300635..368a99757167 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -88,7 +88,7 @@ class SwUndoRenameBookmark final : public SwUndo
const OUString m_sNewName;
public:
- SwUndoRenameBookmark(const OUString& rOldName, const OUString& rNewName,
const SwDoc& rDoc);
+ SwUndoRenameBookmark(OUString aOldName, OUString aNewName, const SwDoc&
rDoc);
virtual ~SwUndoRenameBookmark() override;
private:
diff --git a/sw/source/core/inc/UndoInsert.hxx
b/sw/source/core/inc/UndoInsert.hxx
index 20bc4be7fdc5..82c89d710728 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -185,12 +185,12 @@ class SwUndoInsertLabel final : public SwUndo
bool m_bCopyBorder :1;
public:
- SwUndoInsertLabel( const SwLabelType eTyp, const OUString &rText,
+ SwUndoInsertLabel( const SwLabelType eTyp, OUString rText,
// #i39983# the separator is drawn with a character style
- const OUString& rSeparator,
- const OUString& rNumberSeparator, //#i61007# order of
captions
+ OUString aSeparator,
+ OUString aNumberSeparator, //#i61007# order of captions
const bool bBefore, const sal_uInt16 nId,
- const OUString& rCharacterStyle,
+ OUString aCharacterStyle,
const bool bCpyBrd,
const SwDoc* pDoc );
virtual ~SwUndoInsertLabel() override;
diff --git a/sw/source/core/inc/UndoManager.hxx
b/sw/source/core/inc/UndoManager.hxx
index aa66acf3ad2d..3376393573e6 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC UndoManager final
, public SdrUndoManager
{
public:
- UndoManager(std::shared_ptr<SwNodes> const & pUndoNodes,
+ UndoManager(std::shared_ptr<SwNodes> pUndoNodes,
IDocumentDrawModelAccess & rDrawModelAccess,
IDocumentRedlineAccess & rRedlineAccess,
IDocumentState & rState);
diff --git a/sw/source/core/inc/UndoNumbering.hxx
b/sw/source/core/inc/UndoNumbering.hxx
index c5914fbd01ac..3c04ed9c91a6 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -39,7 +39,7 @@ public:
SwUndoInsNum( const SwNumRule& rOldRule, const SwNumRule& rNewRule,
const SwDoc& rDoc, SwUndoId nUndoId = SwUndoId::INSFMTATTR );
SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule,
- const OUString& rReplaceRule );
+ OUString aReplaceRule );
virtual ~SwUndoInsNum() override;
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index dc6a8f4cd89a..0507f531ae12 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -385,7 +385,7 @@ class SwUndoTableStyleMake final : public SwUndo
OUString m_sName;
std::unique_ptr<SwTableAutoFormat> m_pAutoFormat;
public:
- SwUndoTableStyleMake(const OUString& rName, const SwDoc& rDoc);
+ SwUndoTableStyleMake(OUString aName, const SwDoc& rDoc);
virtual ~SwUndoTableStyleMake() override;
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 16df1c6a0b45..0b9fce178739 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -26,6 +26,7 @@
#include <editeng/svxacorr.hxx>
#include <nodeoffset.hxx>
#include <ndindex.hxx>
+#include <utility>
class SwEditShell;
class SwPaM;
@@ -104,9 +105,9 @@ class SwAutoCorrExceptWord
public:
SwAutoCorrExceptWord(ACFlags nAFlags, SwNodeOffset nNd, sal_Int32 nContent,
- const OUString& rWord, sal_Unicode cChr,
+ OUString aWord, sal_Unicode cChr,
LanguageType eLang)
- : m_sWord(rWord), m_nNode(nNd), m_nFlags(nAFlags),
m_nContent(nContent),
+ : m_sWord(std::move(aWord)), m_nNode(nNd), m_nFlags(nAFlags),
m_nContent(nContent),
m_cChar(cChr), m_eLanguage(eLang), m_bDeleted(false)
{}
diff --git a/sw/source/core/inc/bookmark.hxx b/sw/source/core/inc/bookmark.hxx
index 4413137bcb37..bf2e98488f3e 100644
--- a/sw/source/core/inc/bookmark.hxx
+++ b/sw/source/core/inc/bookmark.hxx
@@ -110,7 +110,7 @@ namespace sw::mark {
// SwClient
virtual void SwClientNotify(const SwModify&, const SfxHint&)
override;
- MarkBase(const SwPaM& rPaM, const OUString& rName);
+ MarkBase(const SwPaM& rPaM, OUString aName);
std::optional<SwPosition> m_oPos1;
std::optional<SwPosition> m_oPos2;
OUString m_aName;
diff --git a/sw/source/core/inc/contentcontrolbutton.hxx
b/sw/source/core/inc/contentcontrolbutton.hxx
index cd63bddd4e69..37da5ece669e 100644
--- a/sw/source/core/inc/contentcontrolbutton.hxx
+++ b/sw/source/core/inc/contentcontrolbutton.hxx
@@ -20,8 +20,7 @@ class SwContentControl;
class SwContentControlButton : public Control
{
public:
- SwContentControlButton(SwEditWin* pEditWin,
- const std::shared_ptr<SwContentControl>&
pContentControl);
+ SwContentControlButton(SwEditWin* pEditWin,
std::shared_ptr<SwContentControl> pContentControl);
virtual ~SwContentControlButton() override;
virtual void dispose() override;
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index badae79afc47..8cc339accb01 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -121,7 +121,7 @@ class SetGetExpFields : public
o3tl::sorted_vector<std::unique_ptr<SetGetExpFiel
struct HashStr final : public SwHash
{
OUString aSetStr;
- HashStr( const OUString& rName, const OUString& rText, HashStr* );
+ HashStr( const OUString& rName, OUString aText, HashStr* );
};
struct SwCalcFieldType final : public SwHash
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx
b/sw/source/core/inc/retrievedinputstreamdata.hxx
index 4a958b31bf19..ddb2c564a12a 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -26,6 +26,7 @@
#include <map>
#include <memory>
+#include <utility>
namespace com::sun::star::io { class XInputStream; }
@@ -58,7 +59,7 @@ class SwRetrievedInputStreamDataManager
{};
tData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer >
pThreadConsumer )
- : mpThreadConsumer( pThreadConsumer ),
+ : mpThreadConsumer(std::move( pThreadConsumer )),
mbIsStreamReadOnly( false )
{};
};
diff --git a/sw/source/core/inc/retrieveinputstream.hxx
b/sw/source/core/inc/retrieveinputstream.hxx
index 5f8f3df3b9b9..b030ed0fc54d 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -43,8 +43,8 @@ class SwAsyncRetrieveInputStreamThread final : public
ObservableThread
virtual void threadFunction() override;
SwAsyncRetrieveInputStreamThread( const
SwRetrievedInputStreamDataManager::tDataKey nDataKey,
- const OUString& rLinkedURL,
- const OUString& rReferer );
+ OUString aLinkedURL,
+ OUString aReferer );
const SwRetrievedInputStreamDataManager::tDataKey mnDataKey;
const OUString mrLinkedURL;
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index d92328344d3b..1497da7e7b89 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -343,7 +343,7 @@ class SwHistoryChangeCharFormat final : public SwHistoryHint
const OUString m_Format;
public:
- SwHistoryChangeCharFormat( const SfxItemSet& rSet, const OUString &
sFormat);
+ SwHistoryChangeCharFormat( SfxItemSet aSet, OUString sFormat);
virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override;
};
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 31f70945718b..38cede12f5fa 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -43,7 +43,7 @@ public:
bool m_bIsOnlyText : 1; /// Unformatted text
SwBlockName( const OUString& rShort, const OUString& rLong );
- SwBlockName( const OUString& rShort, const OUString& rLong, const
OUString& rPackageName );
+ SwBlockName( const OUString& rShort, const OUString& rLong, OUString
aPackageName );
/// For sorting in the array
bool operator< ( const SwBlockName& r ) const { return m_aShort <
r.m_aShort; }
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index fba72413c829..f5a01643771a 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -87,7 +87,7 @@ public:
// Only add sal_uInt8!!!
#ifdef DBG_UTIL
- SwCache( const sal_uInt16 nInitSize, const OString &rNm );
+ SwCache( const sal_uInt16 nInitSize, OString aNm );
#else
SwCache( const sal_uInt16 nInitSize );
#endif
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index fe8125942f0f..ff592655f445 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -24,6 +24,7 @@
#include <tox.hxx>
#include <com/sun/star/lang/Locale.hpp>
+#include <utility>
class CharClass;
class SwContentNode;
@@ -63,9 +64,9 @@ struct TextAndReading
TextAndReading() {}
- TextAndReading(const OUString& rText, const OUString& rReading)
- : sText(rText)
- , sReading(rReading)
+ TextAndReading(OUString aText, OUString aReading)
+ : sText(std::move(aText))
+ , sReading(std::move(aReading))
{}
};
@@ -81,7 +82,7 @@ class SwTOXInternational
public:
SwTOXInternational( LanguageType nLang, SwTOIOptions nOptions,
- const OUString& rSortAlgorithm );
+ OUString aSortAlgorithm );
SwTOXInternational( const SwTOXInternational& );
~SwTOXInternational();
@@ -208,7 +209,7 @@ private:
struct SwTOXCustom final : public SwTOXSortTabBase
{
- SwTOXCustom( const TextAndReading& rKey, sal_uInt16 nLevel,
+ SwTOXCustom( TextAndReading aKey, sal_uInt16 nLevel,
const SwTOXInternational& rIntl,
const css::lang::Locale& rLocale );
@@ -243,7 +244,7 @@ struct SwTOXPara final : public SwTOXSortTabBase
{
SwTOXPara(SwContentNode&, SwTOXElement,
sal_uInt16 nLevel = FORM_ALPHA_DELIMITER,
- const OUString& sSeqName = OUString());
+ OUString sSeqName = OUString());
void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; }
void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; }
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 9109e949bd80..b0c2771d1d2e 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -25,6 +25,7 @@
#include <nodeoffset.hxx>
#include <set>
+#include <utility>
namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
@@ -972,10 +973,10 @@ struct MergedPara
/// mainly for sanity checks
SwTextNode const* pLastNode;
MergedPara(SwTextFrame & rFrame, std::vector<Extent>&& rExtents,
- OUString const& rText,
+ OUString aText,
SwTextNode *const pProps, SwTextNode *const pFirst,
SwTextNode const*const pLast)
- : listener(rFrame), extents(std::move(rExtents)), mergedText(rText)
+ : listener(rFrame), extents(std::move(rExtents)),
mergedText(std::move(aText))
, pParaPropsNode(pProps), pFirstNode(pFirst), pLastNode(pLast)
{
assert(pParaPropsNode);
diff --git a/sw/source/core/inc/undoflystrattr.hxx
b/sw/source/core/inc/undoflystrattr.hxx
index 5032c26c14b6..069c0aca5f12 100644
--- a/sw/source/core/inc/undoflystrattr.hxx
+++ b/sw/source/core/inc/undoflystrattr.hxx
@@ -29,8 +29,8 @@ class SwUndoFlyStrAttr final : public SwUndo
public:
SwUndoFlyStrAttr( SwFlyFrameFormat& rFlyFrameFormat,
const SwUndoId eUndoId,
- const OUString& sOldStr,
- const OUString& sNewStr );
+ OUString sOldStr,
+ OUString sNewStr );
virtual ~SwUndoFlyStrAttr() override;
virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
diff --git a/sw/source/core/inc/unoflatpara.hxx
b/sw/source/core/inc/unoflatpara.hxx
index 4c53f7fd63aa..6523609a6a5c 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -49,7 +49,7 @@ class SwXFlatParagraph final
: public SwXFlatParagraph_Base
{
public:
- SwXFlatParagraph( SwTextNode& rTextNode, const OUString& aExpandText,
const ModelToViewHelper& rConversionMap );
+ SwXFlatParagraph( SwTextNode& rTextNode, OUString aExpandText, const
ModelToViewHelper& rConversionMap );
virtual ~SwXFlatParagraph() override;
// XPropertySet
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index da718a05032b..d0d9b5b64176 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -152,13 +152,13 @@ protected:
virtual void Notify(const SfxHint& rHint) override;
public:
- SwXTextPortion(const SwUnoCursor* pPortionCursor, css::uno::Reference<
css::text::XText > const& rParent, SwTextPortionType eType );
- SwXTextPortion(const SwUnoCursor* pPortionCursor, css::uno::Reference<
css::text::XText > const& rParent, SwFrameFormat& rFormat );
+ SwXTextPortion(const SwUnoCursor* pPortionCursor, css::uno::Reference<
css::text::XText > xParent, SwTextPortionType eType );
+ SwXTextPortion(const SwUnoCursor* pPortionCursor, css::uno::Reference<
css::text::XText > xParent, SwFrameFormat& rFormat );
// for Ruby
SwXTextPortion(const SwUnoCursor* pPortionCursor,
SwTextRuby const& rAttr,
- css::uno::Reference< css::text::XText > const& xParent,
+ css::uno::Reference< css::text::XText > xParent,
bool bIsEnd );
//XTextRange
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index b05fe074ce71..df658cbfa50e 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -74,13 +74,13 @@ public:
Color mColor;
WrongAreaLineType mLineType;
- SwWrongArea( const OUString& rType,
+ SwWrongArea( OUString aType,
WrongListType listType,
css::uno::Reference< css::container::XStringKeyMap > const &
xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen);
- SwWrongArea( const OUString& rType,
+ SwWrongArea( OUString aType,
css::uno::Reference< css::container::XStringKeyMap > const &
xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen,
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 35e79908546a..1c9fde902730 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <utility>
#include <vcl/lazydelete.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
@@ -4689,7 +4690,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
SwBorderRectanglePrimitive2D(
- const basegfx::B2DHomMatrix& rB2DHomMatrix,
+ basegfx::B2DHomMatrix aB2DHomMatrix,
const svx::frame::Style& rStyleTop,
const svx::frame::Style& rStyleRight,
const svx::frame::Style& rStyleBottom,
@@ -4866,12 +4867,12 @@ namespace drawinglayer::primitive2d
}
SwBorderRectanglePrimitive2D::SwBorderRectanglePrimitive2D(
- const basegfx::B2DHomMatrix& rB2DHomMatrix,
+ basegfx::B2DHomMatrix aB2DHomMatrix,
const svx::frame::Style& rStyleTop,
const svx::frame::Style& rStyleRight,
const svx::frame::Style& rStyleBottom,
const svx::frame::Style& rStyleLeft)
- : maB2DHomMatrix(rB2DHomMatrix),
+ : maB2DHomMatrix(std::move(aB2DHomMatrix)),
maStyleTop(rStyleTop),
maStyleRight(rStyleRight),
maStyleBottom(rStyleBottom),
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 8e0187470146..4a86c6f425e2 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -31,6 +31,7 @@
#include <tools/globname.hxx>
#include <sfx2/linkmgr.hxx>
#include <unotools/configitem.hxx>
+#include <utility>
#include <vcl/outdev.hxx>
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
@@ -695,8 +696,8 @@ private:
std::shared_ptr<comphelper::ThreadTaskTag> mpTag;
public:
- explicit DeflateData(const uno::Reference< frame::XModel >& rXModel)
- : maXModel(rXModel),
+ explicit DeflateData(uno::Reference< frame::XModel > xXModel)
+ : maXModel(std::move(xXModel)),
mbKilled(false),
mpTag( comphelper::ThreadPool::createThreadTaskTag() )
{
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index e805cf096c0a..1707c43d02ea 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -29,6 +29,7 @@
#include <shellio.hxx>
#include <swblocks.hxx>
#include <SwXMLTextBlocks.hxx>
+#include <utility>
#include <swerror.h>
@@ -55,8 +56,8 @@ SwBlockName::SwBlockName( const OUString& rShort, const
OUString& rLong )
m_nHashL = SwImpBlocks::Hash( rLong );
}
-SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong, const
OUString& rPackageName)
- : m_aShort( rShort ), m_aLong( rLong ), m_aPackageName (rPackageName),
+SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong,
OUString aPackageName)
+ : m_aShort( rShort ), m_aLong( rLong ), m_aPackageName
(std::move(aPackageName)),
m_bIsOnlyTextFlagInit( false ), m_bIsOnlyText( false )
{
m_nHashS = SwImpBlocks::Hash( rShort );
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index e0e75780cdb7..accc179aa67d 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <utility>
#include <vcl/graph.hxx>
#include <editeng/brushitem.hxx>
#include <vcl/metric.hxx>
@@ -72,8 +73,8 @@ void SwFieldPortion::TakeNextOffset( const SwFieldPortion*
pField )
m_bFollow = true;
}
-SwFieldPortion::SwFieldPortion(const OUString &rExpand,
std::unique_ptr<SwFont> pFont, bool bPlaceHold, TextFrameIndex const nFieldLen)
- : m_aExpand(rExpand), m_pFont(std::move(pFont)), m_nNextOffset(0)
+SwFieldPortion::SwFieldPortion(OUString aExpand, std::unique_ptr<SwFont>
pFont, bool bPlaceHold, TextFrameIndex const nFieldLen)
+ : m_aExpand(std::move(aExpand)), m_pFont(std::move(pFont)),
m_nNextOffset(0)
, m_nNextScriptChg(COMPLETE_STRING), m_nFieldLen(nFieldLen),
m_nViewWidth(0)
, m_bFollow( false ), m_bLeft( false), m_bHide( false)
, m_bCenter (false), m_bHasFollow( false )
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 45a2027b4e74..cbdee76b548c 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -60,7 +60,7 @@ protected:
public:
SwFieldPortion( const SwFieldPortion& rField );
- SwFieldPortion(const OUString &rExpand, std::unique_ptr<SwFont> pFnt =
nullptr, bool bPlaceHolder = false, TextFrameIndex nLen = TextFrameIndex(1));
+ SwFieldPortion(OUString aExpand, std::unique_ptr<SwFont> pFnt = nullptr,
bool bPlaceHolder = false, TextFrameIndex nLen = TextFrameIndex(1));
virtual ~SwFieldPortion() override;
sal_uInt16 m_nAttrFieldType;
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index a5ecda64d072..925a04f7793b 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -68,7 +68,7 @@ class SwQuoVadisPortion : public SwFieldPortion
{
OUString m_aErgo;
public:
- SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
+ SwQuoVadisPortion( const OUString &rExp, OUString aStr );
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 64d0f0418286..c86c1bc4ab0d 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -21,6 +21,7 @@
#include <string_view>
+#include <utility>
#include <viewsh.hxx>
#include <doc.hxx>
#include <IDocumentLayoutAccess.hxx>
@@ -1442,8 +1443,8 @@ SwFieldPortion *SwQuoVadisPortion::Clone( const OUString
&rExpand ) const
return new SwQuoVadisPortion( rExpand, m_aErgo );
}
-SwQuoVadisPortion::SwQuoVadisPortion( const OUString &rExp, const OUString&
rStr )
- : SwFieldPortion( rExp ), m_aErgo(rStr)
+SwQuoVadisPortion::SwQuoVadisPortion( const OUString &rExp, OUString aStr )
+ : SwFieldPortion( rExp ), m_aErgo(std::move(aStr))
{
SetLen(TextFrameIndex(0));
SetWhichPor( PortionType::QuoVadis );
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 6240716c2968..00be8d5fac4f 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -22,25 +22,26 @@
#include <SwGrammarMarkUp.hxx>
#include <ndtxt.hxx>
#include <txtfrm.hxx>
+#include <utility>
#include <osl/diagnose.h>
-SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType,
+SwWrongArea::SwWrongArea( OUString aType, WrongListType listType,
css::uno::Reference< css::container::XStringKeyMap > const &
xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen)
-: maType(rType), mxPropertyBag(xPropertyBag), mnPos(nPos), mnLen(nLen),
mpSubList(nullptr)
+: maType(std::move(aType)), mxPropertyBag(xPropertyBag), mnPos(nPos),
mnLen(nLen), mpSubList(nullptr)
{
mColor = getWrongAreaColor(listType, xPropertyBag);
mLineType = getWrongAreaLineType(listType, xPropertyBag);
}
-SwWrongArea::SwWrongArea( const OUString& rType,
+SwWrongArea::SwWrongArea( OUString aType,
css::uno::Reference< css::container::XStringKeyMap > const &
xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen,
SwWrongList* pSubList)
-: maType(rType), mxPropertyBag(xPropertyBag), mnPos(nPos), mnLen(nLen),
mpSubList(pSubList), mLineType(WRONGAREA_NONE)
+: maType(std::move(aType)), mxPropertyBag(xPropertyBag), mnPos(nPos),
mnLen(nLen), mpSubList(pSubList), mLineType(WRONGAREA_NONE)
{
if (pSubList != nullptr)
{
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx
b/sw/source/core/tox/ToxTextGenerator.cxx
index 8a92bbf1762f..97ca39666391 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -46,6 +46,7 @@
#include <cassert>
#include <memory>
+#include <utility>
namespace {
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index df70997cab75..ee91b1ad6ae6 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -41,6 +41,7 @@
#include <algorithm>
#include <string_view>
+#include <utility>
const sal_Unicode C_NUM_REPL = '@';
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index e197e18267f8..5205b580aaeb 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -47,6 +47,7 @@
#include <strings.hrc>
#include <reffld.hxx>
#include <docsh.hxx>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -55,9 +56,9 @@ using namespace ::com::sun::star::uno;
SwTOIOptions SwTOXSortTabBase::nOpt = SwTOIOptions::NONE;
SwTOXInternational::SwTOXInternational( LanguageType nLang, SwTOIOptions nOpt,
- const OUString& rSortAlgorithm ) :
+ OUString aSortAlgorithm ) :
m_eLang( nLang ),
- m_sSortAlgorithm(rSortAlgorithm),
+ m_sSortAlgorithm(std::move(aSortAlgorithm)),
m_nOptions( nOpt )
{
Init();
@@ -441,12 +442,12 @@ sal_uInt16 SwTOXIndex::GetLevel() const
}
// Key and separator
-SwTOXCustom::SwTOXCustom(const TextAndReading& rKey,
+SwTOXCustom::SwTOXCustom(TextAndReading aKey,
sal_uInt16 nLevel,
const SwTOXInternational& rIntl,
const lang::Locale& rLocale )
: SwTOXSortTabBase( TOX_SORT_CUSTOM, nullptr, nullptr, &rIntl, &rLocale ),
- m_aKey(rKey), nLev(nLevel)
+ m_aKey(std::move(aKey)), nLev(nLevel)
{
}
@@ -530,13 +531,13 @@ sal_uInt16 SwTOXContent::GetLevel() const
// TOX assembled from paragraphs
// Watch out for OLE/graphics when sorting!
// The position must not come from the document, but from the "anchor"!
-SwTOXPara::SwTOXPara(SwContentNode& rNd, SwTOXElement eT, sal_uInt16 nLevel,
const OUString& sSeqName)
+SwTOXPara::SwTOXPara(SwContentNode& rNd, SwTOXElement eT, sal_uInt16 nLevel,
OUString sSeqName)
: SwTOXSortTabBase( TOX_SORT_PARA, &rNd, nullptr, nullptr ),
eType( eT ),
m_nLevel(nLevel),
nStartIndex(0),
nEndIndex(-1),
- m_sSequenceName( sSeqName )
+ m_sSequenceName(std::move( sSeqName ))
{
// tdf#123313 create any missing bookmarks *before* generating ToX nodes!
switch (eType)
diff --git a/sw/source/core/txtnode/atrref.cxx
b/sw/source/core/txtnode/atrref.cxx
index 2c82e1403503..51f913c49236 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -23,6 +23,7 @@
#include <hints.hxx>
#include <txtrfmrk.hxx>
#include <unorefmark.hxx>
+#include <utility>
SwFormatRefMark::~SwFormatRefMark( )
{
diff --git a/sw/source/core/txtnode/fmtatr2.cxx
b/sw/source/core/txtnode/fmtatr2.cxx
index 900a4ea3b036..a18231ef56bd 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -50,6 +50,7 @@
#include <osl/diagnose.h>
#include <algorithm>
+#include <utility>
using namespace ::com::sun::star;
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 2e524e116921..e03e517ff46f 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -20,6 +20,7 @@
#include <config_wasm_strip.h>
#include <hintids.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <svl/itemiter.hxx>
#include <svl/languageoptions.hxx>
diff --git a/sw/source/core/undo/SwUndoField.cxx
b/sw/source/core/undo/SwUndoField.cxx
index ca9456057dbd..f7c23e3cbe30 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -28,6 +28,7 @@
#include <fmtfld.hxx>
#include <docsh.hxx>
#include <pam.hxx>
+#include <utility>
#include <osl/diagnose.h>
using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/undo/SwUndoFmt.cxx
b/sw/source/core/undo/SwUndoFmt.cxx
index 110f138f5f3b..3493ad56f31e 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -27,6 +27,7 @@
#include <fmtcol.hxx>
#include <doc.hxx>
#include <strings.hrc>
+#include <utility>
SwUndoFormatCreate::SwUndoFormatCreate
(SwUndoId nUndoId, SwFormat * _pNew, SwFormat const * _pDerivedFrom, SwDoc&
rDoc)
@@ -144,11 +145,11 @@ SwRewriter SwUndoFormatDelete::GetRewriter() const
}
SwUndoRenameFormat::SwUndoRenameFormat(SwUndoId nUndoId,
- const OUString & _sOldName,
- const OUString & _sNewName,
+ OUString _sOldName,
+ OUString _sNewName,
SwDoc& rDoc)
- : SwUndo(nUndoId, &rDoc), m_sOldName(_sOldName),
- m_sNewName(_sNewName), m_rDoc(rDoc)
+ : SwUndo(nUndoId, &rDoc), m_sOldName(std::move(_sOldName)),
+ m_sNewName(std::move(_sNewName)), m_rDoc(rDoc)
{
}
@@ -434,10 +435,10 @@ SwRewriter SwUndoNumruleDelete::GetRewriter() const
return aResult;
}
-SwUndoNumruleRename::SwUndoNumruleRename(const OUString & _aOldName,
- const OUString & _aNewName,
+SwUndoNumruleRename::SwUndoNumruleRename(OUString _aOldName,
+ OUString _aNewName,
SwDoc& rDoc)
- : SwUndo(SwUndoId::NUMRULE_RENAME, &rDoc), m_aOldName(_aOldName),
m_aNewName(_aNewName),
+ : SwUndo(SwUndoId::NUMRULE_RENAME, &rDoc),
m_aOldName(std::move(_aOldName)), m_aNewName(std::move(_aNewName)),
m_rDoc(rDoc)
{
}
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 07998e9404ef..c474dd679214 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -23,6 +23,7 @@
#include <doc.hxx>
#include <docsh.hxx>
+#include <utility>
#include <view.hxx>
#include <drawdoc.hxx>
#include <ndarr.hxx>
@@ -51,14 +52,14 @@ using namespace ::com::sun::star;
namespace sw {
-UndoManager::UndoManager(std::shared_ptr<SwNodes> const & xUndoNodes,
+UndoManager::UndoManager(std::shared_ptr<SwNodes> xUndoNodes,
IDocumentDrawModelAccess & rDrawModelAccess,
IDocumentRedlineAccess & rRedlineAccess,
IDocumentState & rState)
: m_rDrawModelAccess(rDrawModelAccess)
, m_rRedlineAccess(rRedlineAccess)
, m_rState(rState)
- , m_xUndoNodes(xUndoNodes)
+ , m_xUndoNodes(std::move(xUndoNodes))
, m_bGroupUndo(true)
, m_bDrawUndo(true)
, m_bRepair(false)
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 69ac6d1571cd..ae537a16926f 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -58,6 +58,7 @@
#include <bookmark.hxx>
#include <frameformats.hxx>
#include <memory>
+#include <utility>
OUString SwHistoryHint::GetDescription() const
{
@@ -1003,10 +1004,10 @@ void SwHistoryChangeFlyChain::SetInDoc( SwDoc* pDoc,
bool )
}
// -> #i27615#
-SwHistoryChangeCharFormat::SwHistoryChangeCharFormat(const SfxItemSet & rSet,
- const OUString & sFormat)
+SwHistoryChangeCharFormat::SwHistoryChangeCharFormat(SfxItemSet aSet,
+ OUString sFormat)
: SwHistoryHint(HSTRY_CHGCHARFMT)
- , m_OldSet(rSet), m_Format(sFormat)
+ , m_OldSet(std::move(aSet)), m_Format(std::move(sFormat))
{
}
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 9d4660336745..ce05b7e1c341 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -672,10 +672,10 @@ SwUndoAttr::SwUndoAttr( const SwPaM& rRange, const
SfxPoolItem& rAttr,
}
}
-SwUndoAttr::SwUndoAttr( const SwPaM& rRange, const SfxItemSet& rSet,
+SwUndoAttr::SwUndoAttr( const SwPaM& rRange, SfxItemSet aSet,
const SetAttrMode nFlags )
: SwUndo( SwUndoId::INSATTR, &rRange.GetDoc() ), SwUndRng( rRange )
- , m_AttrSet( rSet )
+ , m_AttrSet(std::move( aSet ))
, m_pHistory( new SwHistory )
, m_nNodeIndex( NODE_OFFSET_MAX )
, m_nInsertFlags( nFlags )
@@ -935,11 +935,11 @@ void SwUndoMoveLeftMargin::RepeatImpl(::sw::RepeatContext
& rContext)
}
SwUndoChangeFootNote::SwUndoChangeFootNote(
- const SwPaM& rRange, const OUString& rText,
+ const SwPaM& rRange, OUString aText,
bool const bIsEndNote)
: SwUndo( SwUndoId::CHGFTN, &rRange.GetDoc() ), SwUndRng( rRange )
, m_pHistory( new SwHistory() )
- , m_Text( rText )
+ , m_Text(std::move( aText ))
, m_bEndNote( bIsEndNote )
{
}
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index f7d55c2d2c88..8288453307a4 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -33,6 +33,7 @@
#include <rolbck.hxx>
#include <SwRewriter.hxx>
+#include <utility>
SwUndoBookmark::SwUndoBookmark( SwUndoId nUndoId,
const ::sw::mark::IMark& rBkmk )
@@ -104,10 +105,10 @@ void SwUndoDeleteBookmark::RedoImpl(::sw::UndoRedoContext
& rContext)
ResetInDoc( rContext.GetDoc() );
}
-SwUndoRenameBookmark::SwUndoRenameBookmark( const OUString& rOldName, const
OUString& rNewName, const SwDoc& rDoc )
+SwUndoRenameBookmark::SwUndoRenameBookmark( OUString aOldName, OUString
aNewName, const SwDoc& rDoc )
: SwUndo( SwUndoId::BOOKMARK_RENAME, &rDoc )
- , m_sOldName( rOldName )
- , m_sNewName( rNewName )
+ , m_sOldName(std::move( aOldName ))
+ , m_sNewName(std::move( aNewName ))
{
}
diff --git a/sw/source/core/undo/undoflystrattr.cxx
b/sw/source/core/undo/undoflystrattr.cxx
index 1a811ad21716..89c9467958ae 100644
--- a/sw/source/core/undo/undoflystrattr.cxx
+++ b/sw/source/core/undo/undoflystrattr.cxx
@@ -19,16 +19,17 @@
#include <undoflystrattr.hxx>
#include <frmfmt.hxx>
+#include <utility>
SwUndoFlyStrAttr::SwUndoFlyStrAttr( SwFlyFrameFormat& rFlyFrameFormat,
const SwUndoId eUndoId,
- const OUString& sOldStr,
- const OUString& sNewStr )
+ OUString sOldStr,
+ OUString sNewStr )
: SwUndo( eUndoId, rFlyFrameFormat.GetDoc() ),
mrFlyFrameFormat( rFlyFrameFormat ),
- msOldStr( sOldStr ),
- msNewStr( sNewStr )
+ msOldStr(std::move( sOldStr )),
+ msNewStr(std::move( sNewStr ))
{
assert(eUndoId == SwUndoId::FLYFRMFMT_TITLE
|| eUndoId == SwUndoId::FLYFRMFMT_DESCRIPTION);
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index e923db1f2fe9..0247bfdab876 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -52,6 +52,7 @@
#include <acorrect.hxx>
#include <strings.hrc>
+#include <utility>
using namespace ::com::sun::star;
@@ -492,7 +493,7 @@ class SwUndoReplace::Impl
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
public:
- Impl(SwPaM const& rPam, OUString const& rIns, bool const bRegExp);
+ Impl(SwPaM const& rPam, OUString aIns, bool const bRegExp);
void UndoImpl( ::sw::UndoRedoContext & );
void RedoImpl( ::sw::UndoRedoContext & );
@@ -578,8 +579,8 @@ void SwUndoReplace::SetEnd(SwPaM const& rPam)
}
SwUndoReplace::Impl::Impl(
- SwPaM const& rPam, OUString const& rIns, bool const bRegExp)
- : m_sIns( rIns )
+ SwPaM const& rPam, OUString aIns, bool const bRegExp)
+ : m_sIns(std::move( aIns ))
, m_nOffset( 0 )
, m_bRegExp(bRegExp)
{
@@ -837,19 +838,19 @@ void SwUndoReRead::SaveGraphicData( const SwGrfNode&
rGrfNd )
}
SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType eTyp,
- const OUString &rText,
- const OUString& rSeparator,
- const OUString& rNumberSeparator,
+ OUString aText,
+ OUString aSeparator,
+ OUString aNumberSeparator,
const bool bBef,
const sal_uInt16 nInitId,
- const OUString& rCharacterStyle,
+ OUString aCharacterStyle,
const bool bCpyBorder,
const SwDoc* pDoc )
: SwUndo( SwUndoId::INSERTLABEL, pDoc ),
- m_sText( rText ),
- m_sSeparator( rSeparator ),
- m_sNumberSeparator( rNumberSeparator ),//#i61007# order of captions
- m_sCharacterStyle( rCharacterStyle ),
+ m_sText(std::move( aText )),
+ m_sSeparator(std::move( aSeparator )),
+ m_sNumberSeparator(std::move( aNumberSeparator )),//#i61007# order of
captions
+ m_sCharacterStyle(std::move( aCharacterStyle )),
m_nFieldId( nInitId ),
m_eType( eTyp ),
m_nLayerId( 0 ),
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 2cb0a306c8b2..dafd89fee788 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -24,6 +24,7 @@
#include <ndtxt.hxx>
#include <UndoCore.hxx>
#include <rolbck.hxx>
+#include <utility>
#include <osl/diagnose.h>
SwUndoInsNum::SwUndoInsNum( const SwNumRule& rOldRule,
@@ -44,10 +45,10 @@ SwUndoInsNum::SwUndoInsNum( const SwPaM& rPam, const
SwNumRule& rRule )
}
SwUndoInsNum::SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule,
- const OUString& rReplaceRule )
+ OUString aReplaceRule )
: SwUndo( SwUndoId::INSNUM, &rPos.GetNode().GetDoc() ),
m_aNumRule( rRule ),
- m_sReplaceRule( rReplaceRule ), m_nLRSavePos( 0 )
+ m_sReplaceRule(std::move( aReplaceRule )), m_nLRSavePos( 0 )
{
// No selection!
m_nEndNode = SwNodeOffset(0);
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 81fe4c70ac38..a4d959e1837e 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -34,6 +34,7 @@
#include <acorrect.hxx>
#include <docary.hxx>
#include <strings.hrc>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::i18n;
@@ -330,8 +331,8 @@ struct UndoTransliterate_Data
SwNodeOffset nNdIdx;
sal_Int32 nStart, nLen;
- UndoTransliterate_Data( SwNodeOffset nNd, sal_Int32 nStt, sal_Int32
nStrLen, const OUString& rText )
- : sText( rText ),
+ UndoTransliterate_Data( SwNodeOffset nNd, sal_Int32 nStt, sal_Int32
nStrLen, OUString aText )
+ : sText(std::move( aText )),
nNdIdx( nNd ), nStart( nStt ), nLen( nStrLen )
{}
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 477ed55200c5..7e96d8fe04bb 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -3103,9 +3103,9 @@ void CheckTable( const SwTable& rTable )
}
#endif
-SwUndoTableStyleMake::SwUndoTableStyleMake(const OUString& rName, const SwDoc&
rDoc)
+SwUndoTableStyleMake::SwUndoTableStyleMake(OUString aName, const SwDoc& rDoc)
: SwUndo(SwUndoId::TBLSTYLE_CREATE, &rDoc),
- m_sName(rName)
+ m_sName(std::move(aName))
{ }
SwUndoTableStyleMake::~SwUndoTableStyleMake()
diff --git a/sw/source/core/unocore/unocontentcontrol.cxx
b/sw/source/core/unocore/unocontentcontrol.cxx
index 4bbc3e242e98..be9974617566 100644
--- a/sw/source/core/unocore/unocontentcontrol.cxx
+++ b/sw/source/core/unocore/unocontentcontrol.cxx
@@ -37,6 +37,7 @@
#include <unoport.hxx>
#include <unomap.hxx>
#include <unoprnms.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -174,12 +175,11 @@ public:
OUString m_aColor;
Impl(SwXContentControl& rThis, SwDoc& rDoc, SwContentControl*
pContentControl,
- const uno::Reference<text::XText>& xParentText,
- std::unique_ptr<const TextRangeList_t> pPortions)
+ uno::Reference<text::XText> xParentText, std::unique_ptr<const
TextRangeList_t> pPortions)
: m_pTextPortions(std::move(pPortions))
, m_bIsDisposed(false)
, m_bIsDescriptor(pContentControl == nullptr)
- , m_xParentText(xParentText)
+ , m_xParentText(std::move(xParentText))
, m_xText(new SwXContentControlText(rDoc, rThis))
, m_pContentControl(pContentControl)
, m_bShowingPlaceHolder(false)
diff --git a/sw/source/core/unocore/unoflatpara.cxx
b/sw/source/core/unocore/unoflatpara.cxx
index 5d628d680540..a417e4384182 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -22,6 +22,7 @@
#include <unoflatpara.hxx>
#include <o3tl/safeint.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -64,9 +65,9 @@ CreateFlatParagraphIterator(SwDoc & rDoc, sal_Int32 const
nTextMarkupType,
}
-SwXFlatParagraph::SwXFlatParagraph( SwTextNode& rTextNode, const OUString&
aExpandText, const ModelToViewHelper& rMap )
+SwXFlatParagraph::SwXFlatParagraph( SwTextNode& rTextNode, OUString
aExpandText, const ModelToViewHelper& rMap )
: SwXFlatParagraph_Base(& rTextNode, rMap)
- , maExpandText(aExpandText)
+ , maExpandText(std::move(aExpandText))
{
}
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 34b594a0d1d7..c8092e713abf 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -57,6 +57,7 @@
#include <unocontentcontrol.hxx>
#include <unotext.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
+#include <utility>
#include <vcl/svapp.hxx>
#include <unotools/syslocale.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index 4980208bb1ca..ea529a09b1f1 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -24,6 +24,7 @@
#include <o3tl/safeint.hxx>
#include <svl/listener.hxx>
#include <svx/svdobj.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <anchoredobject.hxx>
@@ -376,11 +377,11 @@ struct SwXParagraphEnumerationImpl final : public
SwXParagraphEnumeration
sw::UnoCursorPointer m_pCursor;
SwXParagraphEnumerationImpl(
- uno::Reference< text::XText > const& xParent,
+ uno::Reference< text::XText > xParent,
const std::shared_ptr<SwUnoCursor>& pCursor,
const CursorType eType,
SwStartNode const*const pStartNode, SwTable const*const pTable)
- : m_xParentText( xParent )
+ : m_xParentText(std::move( xParent ))
, m_eCursorType( eType )
// remember table and start node for later travelling
// (used in export of tables in tables)
@@ -674,11 +675,11 @@ public:
Impl(SwDoc& rDoc, const enum RangePosition eRange,
SwFrameFormat* const pTableOrSectionFormat,
- const uno::Reference<text::XText>& xParent = nullptr)
+ uno::Reference<text::XText> xParent = nullptr)
: m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
, m_eRangePosition(eRange)
, m_rDoc(rDoc)
- , m_xParentText(xParent)
+ , m_xParentText(std::move(xParent))
, m_pTableOrSectionFormat(pTableOrSectionFormat)
, m_pMark(nullptr)
{
diff --git a/sw/source/core/unocore/unoparagraph.cxx
b/sw/source/core/unocore/unoparagraph.cxx
index 45ef0e53165e..8e60a7cb394c 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -37,6 +37,7 @@
#include <unocrsrhelper.hxx>
#include <doc.hxx>
#include <ndtxt.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <docsh.hxx>
#include <swunohelper.hxx>
@@ -125,14 +126,14 @@ public:
SwTextNode* m_pTextNode;
Impl(SwXParagraph& rThis,
- SwTextNode* const pTextNode = nullptr, uno::Reference<text::XText>
const& xParent = nullptr,
+ SwTextNode* const pTextNode = nullptr, uno::Reference<text::XText>
xParent = nullptr,
const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = -1)
: m_rThis(rThis)
, m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH))
, m_bIsDescriptor(nullptr == pTextNode)
, m_nSelectionStartPos(nSelStart)
, m_nSelectionEndPos(nSelEnd)
- , m_xParentText(xParent)
+ , m_xParentText(std::move(xParent))
, m_pTextNode(pTextNode)
{
m_pTextNode && StartListening(m_pTextNode->GetNotifier());
diff --git a/sw/source/core/unocore/unoport.cxx
b/sw/source/core/unocore/unoport.cxx
index dea28ee3a9a7..a10da8a9c35f 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -21,6 +21,7 @@
#include <cmdid.h>
#include <cppuhelper/exc_hlp.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <svl/itemprop.hxx>
#include <tools/diagnose_ex.h>
@@ -61,14 +62,14 @@ void SwXTextPortion::init(const SwUnoCursor* pPortionCursor)
SwXTextPortion::SwXTextPortion(
const SwUnoCursor* pPortionCursor,
- uno::Reference< text::XText > const& rParent,
+ uno::Reference< text::XText > xParent,
SwTextPortionType eType)
: m_pPropSet(aSwMapProvider.GetPropertySet(
(PORTION_REDLINE_START == eType ||
PORTION_REDLINE_END == eType)
? PROPERTY_MAP_REDLINE_PORTION
: PROPERTY_MAP_TEXTPORTION_EXTENSIONS))
- , m_xParentText(rParent)
+ , m_xParentText(std::move(xParent))
, m_pFrameFormat(nullptr)
, m_ePortionType(eType)
, m_bIsCollapsed(false)
@@ -78,11 +79,11 @@ SwXTextPortion::SwXTextPortion(
SwXTextPortion::SwXTextPortion(
const SwUnoCursor* pPortionCursor,
- uno::Reference< text::XText > const& rParent,
+ uno::Reference< text::XText > xParent,
SwFrameFormat& rFormat )
: m_pPropSet(aSwMapProvider.GetPropertySet(
PROPERTY_MAP_TEXTPORTION_EXTENSIONS))
- , m_xParentText(rParent)
+ , m_xParentText(std::move(xParent))
, m_pFrameFormat(&rFormat)
, m_ePortionType(PORTION_FRAME)
, m_bIsCollapsed(false)
@@ -94,11 +95,11 @@ SwXTextPortion::SwXTextPortion(
SwXTextPortion::SwXTextPortion(
const SwUnoCursor* pPortionCursor,
SwTextRuby const& rAttr,
- uno::Reference< text::XText > const& xParent,
+ uno::Reference< text::XText > xParent,
bool bIsEnd )
: m_pPropSet(aSwMapProvider.GetPropertySet(
PROPERTY_MAP_TEXTPORTION_EXTENSIONS))
- , m_xParentText(xParent)
+ , m_xParentText(std::move(xParent))
, m_pRubyText ( bIsEnd ? nullptr : new uno::Any )
, m_pRubyStyle ( bIsEnd ? nullptr : new uno::Any )
, m_pRubyAdjust ( bIsEnd ? nullptr : new uno::Any )
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index f8e2df566283..44b152d8c7fc 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -92,11 +92,11 @@ namespace
BkmType nBkmType;
const SwPosition aPosition;
- SwXBookmarkPortion_Impl(uno::Reference<text::XTextContent> const&
xMark,
- const BkmType nType, SwPosition const& rPosition)
- : xBookmark ( xMark )
+ SwXBookmarkPortion_Impl(uno::Reference<text::XTextContent> xMark,
+ const BkmType nType, SwPosition _aPosition)
+ : xBookmark (std::move( xMark ))
, nBkmType ( nType )
- , aPosition ( rPosition )
+ , aPosition (std::move( _aPosition ))
{
}
sal_Int32 getIndex () const
@@ -207,10 +207,10 @@ namespace
const SwPosition maPosition;
SwAnnotationStartPortion_Impl(
- uno::Reference< text::XTextField > const& xAnnotationField,
- SwPosition const& rPosition)
- : mxAnnotationField ( xAnnotationField )
- , maPosition ( rPosition )
+ uno::Reference< text::XTextField > xAnnotationField,
+ SwPosition aPosition)
+ : mxAnnotationField (std::move( xAnnotationField ))
+ , maPosition (std::move( aPosition ))
{
}
diff --git a/sw/source/core/unocore/unorefmk.cxx
b/sw/source/core/unocore/unorefmk.cxx
index 39c9b15162d6..8b2e570b1f37 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -618,12 +618,12 @@ public:
Impl(SwXMeta& rThis, SwDoc& rDoc,
::sw::Meta* const pMeta,
- uno::Reference<text::XText> const& xParentText,
+ uno::Reference<text::XText> xParentText,
std::unique_ptr<TextRangeList_t const> pPortions)
: m_pTextPortions(std::move(pPortions))
, m_bIsDisposed(false)
, m_bIsDescriptor(nullptr == pMeta)
- , m_xParentText(xParentText)
+ , m_xParentText(std::move(xParentText))
, m_xText(new SwXMetaText(rDoc, rThis))
, m_pMeta(pMeta)
{
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index c2ca14ae1c84..5929d632ab3a 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -23,6 +23,7 @@
#include <o3tl/string_view.hxx>
#include <comphelper/propertysequence.hxx>
#include <hintids.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <svl/hint.hxx>
#include <svtools/ctrltool.hxx>
@@ -145,16 +146,16 @@ class SwStyleProperties_Impl;
GetCountOrName_t m_fGetCountOrName;
CreateStyle_t m_fCreateStyle;
TranslateIndex_t m_fTranslateIndex;
- StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType,
SwGetPoolIdFromName aPoolId, OUString const& sName, TranslateId pResId,
GetCountOrName_t const & fGetCountOrName, CreateStyle_t const & fCreateStyle,
TranslateIndex_t const & fTranslateIndex)
+ StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType,
SwGetPoolIdFromName aPoolId, OUString sName, TranslateId pResId,
GetCountOrName_t fGetCountOrName, CreateStyle_t fCreateStyle,
TranslateIndex_t fTranslateIndex)
: m_eFamily(eFamily)
, m_nPropMapType(nPropMapType)
,
m_xPSInfo(aSwMapProvider.GetPropertySet(nPropMapType)->getPropertySetInfo())
, m_aPoolId(aPoolId)
- , m_sName(sName)
+ , m_sName(std::move(sName))
, m_pResId(pResId)
- , m_fGetCountOrName(fGetCountOrName)
- , m_fCreateStyle(fCreateStyle)
- , m_fTranslateIndex(fTranslateIndex)
+ , m_fGetCountOrName(std::move(fGetCountOrName))
+ , m_fCreateStyle(std::move(fCreateStyle))
+ , m_fTranslateIndex(std::move(fTranslateIndex))
{ }
};
const std::vector<StyleFamilyEntry>* our_pStyleFamilyEntries;
@@ -1485,11 +1486,11 @@ private:
OUString m_rStyleName;
const SwAttrSet* m_pParentStyle;
public:
- SwStyleBase_Impl(SwDoc& rSwDoc, const OUString& rName, const SwAttrSet*
pParentStyle)
+ SwStyleBase_Impl(SwDoc& rSwDoc, OUString aName, const SwAttrSet*
pParentStyle)
: m_rDoc(rSwDoc)
, m_pOldPageDesc(nullptr)
, m_pItemSet(nullptr)
- , m_rStyleName(rName)
+ , m_rStyleName(std::move(aName))
, m_pParentStyle(pParentStyle)
{ }
diff --git a/sw/source/core/unocore/unotextmarkup.cxx
b/sw/source/core/unocore/unotextmarkup.cxx
index d77e9c0ff758..8160da91a8ae 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -23,6 +23,7 @@
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
#include <svl/listener.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <SwSmartTagMgr.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -52,9 +53,9 @@ struct SwXTextMarkup::Impl
SwTextNode* m_pTextNode;
ModelToViewHelper const m_ConversionMap;
- Impl(SwTextNode* const pTextNode, const ModelToViewHelper& rMap)
+ Impl(SwTextNode* const pTextNode, ModelToViewHelper aMap)
: m_pTextNode(pTextNode)
- , m_ConversionMap(rMap)
+ , m_ConversionMap(std::move(aMap))
{
if(m_pTextNode)
StartListening(pTextNode->GetNotifier());
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index b00ad5b1fdff..545eb4ed0779 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -47,6 +47,7 @@
#include <bookmark.hxx>
#include <fltshell.hxx>
#include <rdfhelper.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -924,12 +925,12 @@ SwFltRedline* SwFltRedline::Clone( SfxItemPool* ) const
}
// methods of SwFltBookmark follow
-SwFltBookmark::SwFltBookmark( const OUString& rNa, const OUString& rVa,
+SwFltBookmark::SwFltBookmark( const OUString& rNa, OUString aVa,
tools::Long nHand, const bool bIsTOCBookmark )
: SfxPoolItem( RES_FLTR_BOOKMARK )
, mnHandle( nHand )
, maName( rNa )
- , maVal( rVa )
+ , maVal(std::move( aVa ))
, mbIsTOCBookmark( bIsTOCBookmark )
{
// eSrc: CHARSET_DONTKNOW for no transform at operator <<
diff --git a/sw/source/filter/basflt/shellio.cxx
b/sw/source/filter/basflt/shellio.cxx
index 87d71d4b0e4f..bf47344ae59e 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -63,6 +63,7 @@
#include <swerror.h>
#include <pausethreadstarting.hxx>
#include <frameformats.hxx>
+#include <utility>
using namespace ::com::sun::star;
diff --git a/sw/source/filter/html/htmlctxt.cxx
b/sw/source/filter/html/htmlctxt.cxx
index b7d5283fc4ed..a7b775c1dc86 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -40,6 +40,7 @@
#include "swhtml.hxx"
#include <memory>
+#include <utility>
using namespace ::com::sun::star;
@@ -116,9 +117,9 @@ HTMLAttrContext_SaveDoc
*HTMLAttrContext::GetSaveDocContext( bool bCreate )
return m_pSaveDocContext.get();
}
-HTMLAttrContext::HTMLAttrContext( HtmlTokenId nTokn, sal_uInt16 nPoolId, const
OUString& rClass,
+HTMLAttrContext::HTMLAttrContext( HtmlTokenId nTokn, sal_uInt16 nPoolId,
OUString aClass,
bool bDfltColl ) :
- m_aClass( rClass ),
+ m_aClass(std::move( aClass )),
m_nToken( nTokn ),
m_nTextFormatColl( nPoolId ),
m_nLeftMargin( 0 ),
diff --git a/sw/source/filter/html/htmlform.cxx
b/sw/source/filter/html/htmlform.cxx
index e4ea32230b79..952c36289ed1 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -24,6 +24,7 @@
#include <hintids.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/string.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <tools/UnitConversion.hxx>
@@ -382,7 +383,7 @@ class SwHTMLImageWatcher :
void clear();
public:
- SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape,
+ SwHTMLImageWatcher( uno::Reference< drawing::XShape > xShape,
bool bWidth, bool bHeight );
// startProduction can not be called in the constructor because it can
@@ -416,9 +417,9 @@ public:
}
SwHTMLImageWatcher::SwHTMLImageWatcher(
- const uno::Reference< drawing::XShape >& rShape,
+ uno::Reference< drawing::XShape > xShape,
bool bWidth, bool bHeight ) :
- m_xShape( rShape ),
+ m_xShape(std::move( xShape )),
m_bSetWidth( bWidth ), m_bSetHeight( bHeight )
{
// Remember the source of the image
diff --git a/sw/source/filter/html/htmlforw.cxx
b/sw/source/filter/html/htmlforw.cxx
index 72c9e351a67e..51d2a62198a5 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -31,6 +31,7 @@
#include <hintids.hxx>
#include <o3tl/any.hxx>
#include <rtl/math.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <svl/macitem.hxx>
#include <svtools/htmlout.hxx>
@@ -1343,9 +1344,9 @@ void SwHTMLWriter::GetControls()
}
HTMLControl::HTMLControl(
- const uno::Reference< container::XIndexContainer > & rFormComps,
+ uno::Reference< container::XIndexContainer > _xFormComps,
SwNodeOffset nIdx ) :
- xFormComps( rFormComps ), nNdIdx( nIdx ), nCount( 1 )
+ xFormComps(std::move( _xFormComps )), nNdIdx( nIdx ), nCount( 1 )
{}
HTMLControl::~HTMLControl()
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 74f956cc3c79..000e0b8081cb 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <hintids.hxx>
#include <comphelper/flagguard.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
@@ -191,7 +192,7 @@ class HTMLTableCnts
public:
explicit HTMLTableCnts(const SwStartNode* pStNd);
- explicit HTMLTableCnts(const std::shared_ptr<HTMLTable>& rTab);
+ explicit HTMLTableCnts(std::shared_ptr<HTMLTable> xTab);
~HTMLTableCnts(); // only allowed in ~HTMLTableCell
@@ -649,9 +650,9 @@ HTMLTableCnts::HTMLTableCnts(const SwStartNode* pStNd)
InitCtor();
}
-HTMLTableCnts::HTMLTableCnts(const std::shared_ptr<HTMLTable>& rTab)
+HTMLTableCnts::HTMLTableCnts(std::shared_ptr<HTMLTable> xTab)
: m_pStartNode(nullptr)
- , m_xTable(rTab)
+ , m_xTable(std::move(xTab))
{
InitCtor();
}
@@ -4480,8 +4481,8 @@ public:
std::shared_ptr<HTMLAttrTable> m_xAttrTab; // attributes
- CaptionSaveStruct( SwHTMLParser& rParser, const SwPosition& rPos ) :
- SectionSaveStruct( rParser ), m_aSavePos( rPos ),
+ CaptionSaveStruct( SwHTMLParser& rParser, SwPosition aPos ) :
+ SectionSaveStruct( rParser ), m_aSavePos(std::move( aPos )),
m_xAttrTab(std::make_shared<HTMLAttrTable>())
{
rParser.SaveAttrTab(m_xAttrTab);
@@ -4693,8 +4694,8 @@ class TableSaveStruct : public SwPendingData
public:
std::shared_ptr<HTMLTable> m_xCurrentTable;
- explicit TableSaveStruct(const std::shared_ptr<HTMLTable>& rCurTable)
- : m_xCurrentTable(rCurTable)
+ explicit TableSaveStruct(std::shared_ptr<HTMLTable> xCurTable)
+ : m_xCurrentTable(std::move(xCurTable))
{
}
diff --git a/sw/source/filter/html/parcss1.hxx
b/sw/source/filter/html/parcss1.hxx
index 355ef2cf2097..3ab9638741e9 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -24,6 +24,7 @@
#include <tools/color.hxx>
#include <memory>
+#include <utility>
// tokens of the CSS1 parser
enum CSS1Token
@@ -95,8 +96,8 @@ class CSS1Selector
CSS1Selector *m_pNext; // the following component
public:
- CSS1Selector( CSS1SelectorType eTyp, const OUString &rSel )
- : m_eType(eTyp), m_aSelector( rSel ), m_pNext( nullptr )
+ CSS1Selector( CSS1SelectorType eTyp, OUString aSel )
+ : m_eType(eTyp), m_aSelector(std::move( aSel )), m_pNext( nullptr )
{}
~CSS1Selector();
@@ -124,9 +125,9 @@ struct CSS1Expression
CSS1Expression *pNext; // the following component
public:
- CSS1Expression( CSS1Token eTyp, const OUString &rVal,
+ CSS1Expression( CSS1Token eTyp, OUString aVal,
double nVal, sal_Unicode cO = 0 )
- : cOp(cO), eType(eTyp), aValue(rVal), nValue(nVal), pNext(nullptr)
+ : cOp(cO), eType(eTyp), aValue(std::move(aVal)), nValue(nVal),
pNext(nullptr)
{}
~CSS1Expression();
diff --git a/sw/source/filter/html/svxcss1.cxx
b/sw/source/filter/html/svxcss1.cxx
index 7edbfbb7bf10..c241690761c9 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -52,6 +52,7 @@
#include <editeng/widwitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/orphitem.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
@@ -661,9 +662,9 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet,
DestroyBorderInfos();
}
-SvxCSS1MapEntry::SvxCSS1MapEntry( const SfxItemSet& rItemSet,
+SvxCSS1MapEntry::SvxCSS1MapEntry( SfxItemSet aItemSet,
const SvxCSS1PropertyInfo& rProp ) :
- m_aItemSet( rItemSet ),
+ m_aItemSet(std::move( aItemSet )),
m_aPropInfo( rProp )
{}
@@ -694,9 +695,9 @@ void SvxCSS1Parser::SelectorParsed(
std::unique_ptr<CSS1Selector> pSelector, boo
m_Selectors.push_back(std::move(pSelector));
}
-SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL,
+SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, OUString aBaseURL,
sal_uInt16 const *pWhichIds, sal_uInt16
nWhichIds ) :
- m_sBaseURL( rBaseURL ),
+ m_sBaseURL(std::move( aBaseURL )),
m_pItemSet(nullptr),
m_pPropInfo( nullptr ),
m_eDefaultEnc( RTL_TEXTENCODING_DONTKNOW ),
diff --git a/sw/source/filter/html/svxcss1.hxx
b/sw/source/filter/html/svxcss1.hxx
index f4b7c38fffe1..0ca92f314ea9 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -167,7 +167,7 @@ class SvxCSS1MapEntry
SvxCSS1PropertyInfo m_aPropInfo;
public:
- SvxCSS1MapEntry( const SfxItemSet& rItemSet,
+ SvxCSS1MapEntry( SfxItemSet aItemSet,
const SvxCSS1PropertyInfo& rProp );
const SfxItemSet& GetItemSet() const { return m_aItemSet; }
@@ -239,7 +239,7 @@ protected:
public:
SvxCSS1Parser( SfxItemPool& rPool,
- const OUString& rBaseURL,
+ OUString aBaseURL,
sal_uInt16 const *pWhichIds, sal_uInt16 nWhichIds );
virtual ~SvxCSS1Parser() override;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index a15d23317dab..126013a65415 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -36,6 +36,7 @@
#endif
#include <hintids.hxx>
+#include <utility>
#include <vcl/errinf.hxx>
#include <svl/stritem.hxx>
#include <vcl/imap.hxx>
@@ -252,15 +253,15 @@ ErrCode HTMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPam, co
}
SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
- const OUString& rPath,
- const OUString& rBaseURL,
+ OUString aPath,
+ OUString aBaseURL,
bool bReadNewDoc,
SfxMedium* pMed, bool bReadUTF8,
bool bNoHTMLComments,
const OUString& rNamespace )
: SfxHTMLParser( rIn, bReadNewDoc, pMed ),
- m_aPathToFile( rPath ),
- m_sBaseURL( rBaseURL ),
+ m_aPathToFile(std::move( aPath )),
+ m_sBaseURL(std::move( aBaseURL )),
m_xAttrTab(std::make_shared<HTMLAttrTable>()),
m_pNumRuleInfo( new SwHTMLNumRuleInfo ),
m_xDoc( pD ),
@@ -5441,7 +5442,7 @@ void SwHTMLParser::ParseMoreMetaOptions()
}
HTMLAttr::HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
- HTMLAttr **ppHd, const std::shared_ptr<HTMLAttrTable>&
rAttrTab ) :
+ HTMLAttr **ppHd, std::shared_ptr<HTMLAttrTable> xAttrTab
) :
m_nStartPara( rPos.nNode ),
m_nEndPara( rPos.nNode ),
m_nStartContent( rPos.GetContentIndex() ),
@@ -5450,7 +5451,7 @@ HTMLAttr::HTMLAttr( const SwPosition& rPos, const
SfxPoolItem& rItem,
m_bLikePara( false ),
m_bValid( true ),
m_pItem( rItem.Clone() ),
- m_xAttrTab( rAttrTab ),
+ m_xAttrTab(std::move( xAttrTab )),
m_pNext( nullptr ),
m_pPrev( nullptr ),
m_ppHead( ppHd )
@@ -5458,7 +5459,7 @@ HTMLAttr::HTMLAttr( const SwPosition& rPos, const
SfxPoolItem& rItem,
}
HTMLAttr::HTMLAttr( const HTMLAttr &rAttr, const SwNodeIndex &rEndPara,
- sal_Int32 nEndCnt, HTMLAttr **ppHd, const
std::shared_ptr<HTMLAttrTable>& rAttrTab ) :
+ sal_Int32 nEndCnt, HTMLAttr **ppHd,
std::shared_ptr<HTMLAttrTable> xAttrTab ) :
m_nStartPara( rAttr.m_nStartPara ),
m_nEndPara( rEndPara ),
m_nStartContent( rAttr.m_nStartContent ),
@@ -5467,7 +5468,7 @@ HTMLAttr::HTMLAttr( const HTMLAttr &rAttr, const
SwNodeIndex &rEndPara,
m_bLikePara( rAttr.m_bLikePara ),
m_bValid( rAttr.m_bValid ),
m_pItem( rAttr.m_pItem->Clone() ),
- m_xAttrTab( rAttrTab ),
+ m_xAttrTab(std::move( xAttrTab )),
m_pNext( nullptr ),
m_pPrev( nullptr ),
m_ppHead( ppHd )
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 7e25f4f0ef0a..da215233e2af 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -35,6 +35,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <memory>
+#include <utility>
#include <vector>
#include <deque>
#include <stack>
@@ -143,10 +144,10 @@ class HTMLAttr
HTMLAttr **m_ppHead; // list head
HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
- HTMLAttr **pHd, const std::shared_ptr<HTMLAttrTable>& rAttrTab
);
+ HTMLAttr **pHd, std::shared_ptr<HTMLAttrTable> xAttrTab );
HTMLAttr( const HTMLAttr &rAttr, const SwNodeIndex &rEndPara,
- sal_Int32 nEndCnt, HTMLAttr **pHd, const
std::shared_ptr<HTMLAttrTable>& rAttrTab );
+ sal_Int32 nEndCnt, HTMLAttr **pHd,
std::shared_ptr<HTMLAttrTable> xAttrTab );
public:
@@ -240,7 +241,7 @@ class HTMLAttrContext
public:
void ClearSaveDocContext();
- HTMLAttrContext( HtmlTokenId nTokn, sal_uInt16 nPoolId, const OUString&
rClass,
+ HTMLAttrContext( HtmlTokenId nTokn, sal_uInt16 nPoolId, OUString aClass,
bool bDfltColl=false );
explicit HTMLAttrContext( HtmlTokenId nTokn );
~HTMLAttrContext();
@@ -916,8 +917,8 @@ protected:
public:
SwHTMLParser( SwDoc* pD, SwPaM & rCursor, SvStream& rIn,
- const OUString& rFileName,
- const OUString& rBaseURL,
+ OUString aFileName,
+ OUString aBaseURL,
bool bReadNewDoc,
SfxMedium* pMed, bool bReadUTF8,
bool bIgnoreHTMLComments,
@@ -1030,8 +1031,8 @@ struct SwHTMLTextFootnote
{
OUString sName;
SwTextFootnote* pTextFootnote;
- SwHTMLTextFootnote(const OUString &rName, SwTextFootnote* pInTextFootnote)
- : sName(rName)
+ SwHTMLTextFootnote(OUString rName, SwTextFootnote* pInTextFootnote)
+ : sName(std::move(rName))
, pTextFootnote(pInTextFootnote)
{
}
diff --git a/sw/source/filter/html/wrthtml.hxx
b/sw/source/filter/html/wrthtml.hxx
index 5db3c3c2849a..44fc97572342 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -194,7 +194,7 @@ struct HTMLControl
SwNodeOffset nNdIdx; // the node in which it's anchored
sal_Int32 nCount; // how many controls are on the node
- HTMLControl( const css::uno::Reference<css::container::XIndexContainer>&
rForm, SwNodeOffset nIdx );
+ HTMLControl( css::uno::Reference<css::container::XIndexContainer> xForm,
SwNodeOffset nIdx );
~HTMLControl();
// operators for the sort array
diff --git a/sw/source/filter/inc/fltshell.hxx
b/sw/source/filter/inc/fltshell.hxx
index e4041d2da09a..2d3661e84b64 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -222,7 +222,7 @@ private:
public:
SwFltBookmark( const OUString& rNa,
- const OUString& rVa,
+ OUString aVa,
tools::Long nHand,
const bool bIsTOCBookmark = false );
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 35ac50057786..a7740970347d 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <swtypes.hxx>
#include <fldbas.hxx>
+#include <utility>
class Point;
class SvxCaseMapItem;
@@ -652,8 +653,8 @@ protected:
virtual void SectionRtlGutter(const SfxBoolItem& rRtlGutter) = 0;
public:
- AttributeOutputBase(const OUString& sBaseURL)
- : m_sBaseURL(sBaseURL)
+ AttributeOutputBase(OUString sBaseURL)
+ : m_sBaseURL(std::move(sBaseURL))
{
}
virtual ~AttributeOutputBase() {}
diff --git a/sw/source/filter/ww8/writerhelper.cxx
b/sw/source/filter/ww8/writerhelper.cxx
index c3abd77a18b3..3b5f44ae1a7e 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -50,6 +50,7 @@
#include "types.hxx"
#include <svtools/embedhlp.hxx>
#include <numrule.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentLayoutAccess.hxx>
@@ -146,9 +147,9 @@ namespace
namespace ww8
{
//For i120928,size conversion before exporting graphic of bullet
- Frame::Frame(const Graphic &rGrf, const SwPosition &rPos)
+ Frame::Frame(const Graphic &rGrf, SwPosition aPos)
: mpFlyFrame(nullptr)
- , maPos(rPos)
+ , maPos(std::move(aPos))
, meWriterType(eBulletGrf)
, mpStartFrameContent(nullptr)
, mbIsInline(true)
@@ -169,9 +170,9 @@ namespace ww8
maLayoutSize = maSize;
}
- Frame::Frame(const SwFrameFormat &rFormat, const SwPosition &rPos)
+ Frame::Frame(const SwFrameFormat &rFormat, SwPosition aPos)
: mpFlyFrame(&rFormat)
- , maPos(rPos)
+ , maPos(std::move(aPos))
, meWriterType(eTextBox)
, mpStartFrameContent(nullptr)
// #i43447# - move to initialization list
diff --git a/sw/source/filter/ww8/writerhelper.hxx
b/sw/source/filter/ww8/writerhelper.hxx
index 12b949184baa..632d1cb3a639 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -100,8 +100,8 @@ namespace ww8
bool mbForBullet:1;
Graphic maGrf;
public:
- Frame(const SwFrameFormat &rFlyFrame, const SwPosition &rPos);
- Frame(const Graphic&, const SwPosition &);
+ Frame(const SwFrameFormat &rFlyFrame, SwPosition aPos);
+ Frame(const Graphic&, SwPosition );
/** Get the writer SwFrameFormat that this object describes
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 0a4e8d93925c..52b864d57728 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -39,6 +39,7 @@
#include <calbck.hxx>
#include <IDocumentRedlineAccess.hxx>
+#include <utility>
#include <vcl/graph.hxx>
#include <optional>
@@ -350,9 +351,9 @@ public:
unsigned int mnHdFtIndex; // 0 for main text, +1 for each subsequent
// msword hd/ft
- DrawObj(const ww8::Frame &rContent, WW8_CP nCp, Point aParentPos,
SvxFrameDirection nDir,
+ DrawObj(ww8::Frame rContent, WW8_CP nCp, Point aParentPos,
SvxFrameDirection nDir,
unsigned int nHdFtIndex)
- : mnCp(nCp), mnShapeId(0), maContent(rContent),
maParentPos(aParentPos),
+ : mnCp(nCp), mnShapeId(0), maContent(std::move(rContent)),
maParentPos(aParentPos),
mnThick(0), mnDirection(nDir), mnHdFtIndex(nHdFtIndex) {}
void SetShapeDetails(sal_uInt32 nId, sal_Int32 nThick);
};
@@ -1392,8 +1393,8 @@ public:
sal_uInt16 mnWid; // Width of the graphics
sal_uInt16 mnHei; // Height of the graphics
- GraphicDetails(const ww8::Frame &rFly, sal_uInt16 nWid, sal_uInt16 nHei)
- : maFly(rFly), mnPos(0), mnWid(nWid), mnHei(nHei)
+ GraphicDetails(ww8::Frame aFly, sal_uInt16 nWid, sal_uInt16 nHei)
+ : maFly(std::move(aFly)), mnPos(0), mnWid(nWid), mnHei(nHei)
{}
bool operator==(const GraphicDetails& rIn) const
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 141c5c3260a9..730c3171ae46 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -101,6 +101,7 @@
#include <memory>
#include <optional>
#include <filter/msfilter/escherex.hxx>
+#include <utility>
#include "sprmids.hxx"
using ::editeng::SvxBorderLine;
@@ -566,8 +567,8 @@ private:
tools::Long mnStartPos; // 0x13
tools::Long mnEndPos; // 0x15
public:
- explicit Chunk(tools::Long nStart, const OUString &rURL)
- : msURL(rURL), mnStartPos(nStart), mnEndPos(0) {}
+ explicit Chunk(tools::Long nStart, OUString aURL)
+ : msURL(std::move(aURL)), mnStartPos(nStart), mnEndPos(0) {}
void SetEndPos(tools::Long nEnd) { mnEndPos = nEnd; }
tools::Long GetStartPos() const {return mnStartPos;}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1da871b4c9d1..d40ff1948480 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -96,6 +96,7 @@
#include <../../core/inc/DocumentRedlineManager.hxx>
#include <docufld.hxx>
#include <swfltopt.hxx>
+#include <utility>
#include <viewsh.hxx>
#include <shellres.hxx>
#include <swerror.h>
@@ -4231,7 +4232,7 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP
nTextLen, ManTypes nType)
}
SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
- SvStream* pSt, SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool
bSkipImages, SwPosition const &rPos)
+ SvStream* pSt, SwDoc& rD, OUString aBaseURL, bool bNewDoc, bool
bSkipImages, SwPosition const &rPos)
: m_pDocShell(rD.GetDocShell())
, m_pStg(pStorage)
, m_pStrm(pSt)
@@ -4255,7 +4256,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara,
SotStorage* pStorage,
, m_pDrawModel(nullptr)
, m_pDrawPg(nullptr)
, m_pNumFieldType(nullptr)
- , m_sBaseURL(rBaseURL)
+ , m_sBaseURL(std::move(aBaseURL))
, m_nIniFlags(0)
, m_nIniFlags1(0)
, m_nFieldFlags(0)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index f6c6e2fd9548..68bd5861d38a 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -29,6 +29,7 @@
#include <svx/svdobj.hxx>
+#include <utility>
#include <vector>
#include <stack>
#include <string_view>
@@ -648,11 +649,11 @@ protected:
WW8FormulaControl& operator=(WW8FormulaControl const&) = delete;
public:
- WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rRdr)
+ WW8FormulaControl(OUString aN, SwWW8ImplReader &rRdr)
: mrRdr(rRdr), mfUnknown(0), mfDropdownIndex(0),
mfToolTip(0), mfNoMark(0), mfType(0),
mfUnused(0), mhpsCheckBox(20), mnChecked(0), mnMaxLen(0),
- mbHelp(false), msName( rN )
+ mbHelp(false), msName(std::move( aN ))
{
}
sal_uInt8 mfUnknown:2;
@@ -971,8 +972,8 @@ private:
public:
void SetUniqueGraphName(SwFrameFormat *pFrameFormat, std::u16string_view
rFixedPart);
- wwFrameNamer(bool bIsDisabled, const OUString &rSeed)
- : msSeed(rSeed), mnImportedGraphicsCount(0), mbIsDisabled(bIsDisabled)
+ wwFrameNamer(bool bIsDisabled, OUString aSeed)
+ : msSeed(std::move(aSeed)), mnImportedGraphicsCount(0),
mbIsDisabled(bIsDisabled)
{
}
};
@@ -987,8 +988,8 @@ private:
wwSectionNamer& operator=(const wwSectionNamer&) = delete;
public:
OUString UniqueName();
- wwSectionNamer(const SwDoc &rDoc, const OUString &rSeed)
- : mrDoc(rDoc), msFileLinkSeed(rSeed), mnFileSectionNo(0)
+ wwSectionNamer(const SwDoc &rDoc, OUString aSeed)
+ : mrDoc(rDoc), msFileLinkSeed(std::move(aSeed)), mnFileSectionNo(0)
{ }
};
@@ -1930,7 +1931,7 @@ public: // really private, but can only be done public
static Color GetCol(sal_uInt8 nIco);
SwWW8ImplReader( sal_uInt8 nVersionPara, SotStorage* pStorage, SvStream*
pSt,
- SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages,
SwPosition const &rPos );
+ SwDoc& rD, OUString aBaseURL, bool bNewDoc, bool bSkipImages,
SwPosition const &rPos );
const OUString& GetBaseURL() const { return m_sBaseURL; }
// load a complete doc file
diff --git a/sw/source/filter/xml/xmlimpit.cxx
b/sw/source/filter/xml/xmlimpit.cxx
index f60d78f83810..067ebc41fb90 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -62,8 +62,8 @@ using uno::Any;
constexpr sal_uInt16 nUnknownWhich = RES_UNKNOWNATR_CONTAINER;
SvXMLImportItemMapper::SvXMLImportItemMapper(
- SvXMLItemMapEntriesRef const & rMapEntries ) :
- mrMapEntries( rMapEntries )
+ SvXMLItemMapEntriesRef aMapEntries ) :
+ mrMapEntries(std::move( aMapEntries ))
{
}
diff --git a/sw/source/filter/xml/xmlimpit.hxx
b/sw/source/filter/xml/xmlimpit.hxx
index 3973623515d7..c54b7b470591 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -35,7 +35,7 @@ protected:
SvXMLItemMapEntriesRef mrMapEntries;
public:
- explicit SvXMLImportItemMapper( SvXMLItemMapEntriesRef const & rMapEntries
);
+ explicit SvXMLImportItemMapper( SvXMLItemMapEntriesRef aMapEntries );
virtual ~SvXMLImportItemMapper();
/** fills the given itemset with the attributes in the given list */
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index beb61656223e..625d491785fd 100644
... etc. - the rest is truncated
