diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-08 15:53:34 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-09 07:56:10 +0200 |
commit | 91fef4a47563451e0271784a14b471e4815729d1 (patch) | |
tree | 9d944312070e241978c6e1fd6a342b989c64395e /editeng/source/editeng | |
parent | 66b1ebd4ddc7127a923bf81eb569e7f99dd52022 (diff) |
clang-tidy modernize-pass-by-value in editeng
Change-Id: Ibf912c597896a2ac0bf3ba8108f55c5018115bb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135501
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source/editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 9 | ||||
-rw-r--r-- | editeng/source/editeng/editundo.cxx | 35 | ||||
-rw-r--r-- | editeng/source/editeng/editundo.hxx | 16 | ||||
-rw-r--r-- | editeng/source/editeng/eehtml.cxx | 5 | ||||
-rw-r--r-- | editeng/source/editeng/eehtml.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit5.cxx | 5 |
7 files changed, 39 insertions, 35 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 629f9cdec52a..2793aaee0868 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -65,6 +65,7 @@ #include <memory> #include <set> #include <string_view> +#include <utility> using namespace ::com::sun::star; @@ -803,8 +804,8 @@ ParaPortionList::DbgCheck(ParaPortionList const& rParas, EditDoc const& rDoc) } #endif -ContentAttribsInfo::ContentAttribsInfo( const SfxItemSet& rParaAttribs ) : - aPrevParaAttribs( rParaAttribs) +ContentAttribsInfo::ContentAttribsInfo( SfxItemSet aParaAttribs ) : + aPrevParaAttribs(std::move( aParaAttribs)) { } @@ -1192,8 +1193,8 @@ ContentNode::ContentNode( SfxItemPool& rPool ) : aContentAttribs( rPool ) { } -ContentNode::ContentNode( const OUString& rStr, const ContentAttribs& rContentAttribs ) : - maString(rStr), aContentAttribs(rContentAttribs) +ContentNode::ContentNode( OUString aStr, ContentAttribs _aContentAttribs ) : + maString(std::move(aStr)), aContentAttribs(std::move(_aContentAttribs)) { } diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index dc9c3a104b6c..d957da25a32d 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -22,6 +22,7 @@ #include "editundo.hxx" #include <editeng/editview.hxx> #include <editeng/editeng.hxx> +#include <utility> #include <osl/diagnose.h> @@ -213,13 +214,13 @@ void EditUndoDelContent::Redo() EditUndoConnectParas::EditUndoConnectParas( EditEngine* pEE, sal_Int32 nN, sal_uInt16 nSP, - const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs, + SfxItemSet _aLeftParaAttribs, SfxItemSet _aRightParaAttribs, const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBkwrd) : EditUndo(EDITUNDO_CONNECTPARAS, pEE), nNode(nN), nSepPos(nSP), - aLeftParaAttribs(rLeftParaAttribs), - aRightParaAttribs(rRightParaAttribs), + aLeftParaAttribs(std::move(_aLeftParaAttribs)), + aRightParaAttribs(std::move(_aRightParaAttribs)), eLeftStyleFamily(SfxStyleFamily::All), eRightStyleFamily(SfxStyleFamily::All), bBackward(bBkwrd) @@ -303,10 +304,10 @@ void EditUndoSplitPara::Redo() } EditUndoInsertChars::EditUndoInsertChars( - EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr) : + EditEngine* pEE, const EPaM& rEPaM, OUString aStr) : EditUndo(EDITUNDO_INSERTCHARS, pEE), aEPaM(rEPaM), - aText(rStr) {} + aText(std::move(aStr)) {} void EditUndoInsertChars::Undo() { @@ -346,9 +347,9 @@ bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction ) } EditUndoRemoveChars::EditUndoRemoveChars( - EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr) : + EditEngine* pEE, const EPaM& rEPaM, OUString aStr) : EditUndo(EDITUNDO_REMOVECHARS, pEE), - aEPaM(rEPaM), aText(rStr) {} + aEPaM(rEPaM), aText(std::move(aStr)) {} void EditUndoRemoveChars::Undo() { @@ -444,15 +445,15 @@ void EditUndoMoveParagraphs::Redo() } EditUndoSetStyleSheet::EditUndoSetStyleSheet( - EditEngine* pEE, sal_Int32 nP, const OUString& rPrevName, SfxStyleFamily ePrevFam, - const OUString& rNewName, SfxStyleFamily eNewFam, const SfxItemSet& rPrevParaAttribs) : + EditEngine* pEE, sal_Int32 nP, OUString _aPrevName, SfxStyleFamily ePrevFam, + OUString _aNewName, SfxStyleFamily eNewFam, SfxItemSet _aPrevParaAttribs) : EditUndo(EDITUNDO_STYLESHEET, pEE), nPara(nP), - aPrevName(rPrevName), - aNewName(rNewName), + aPrevName(std::move(_aPrevName)), + aNewName(std::move(_aNewName)), ePrevFamily(ePrevFam), eNewFamily(eNewFam), - aPrevParaAttribs(rPrevParaAttribs) + aPrevParaAttribs(std::move(_aPrevParaAttribs)) { } @@ -476,11 +477,11 @@ void EditUndoSetStyleSheet::Redo() } EditUndoSetParaAttribs::EditUndoSetParaAttribs( - EditEngine* pEE, sal_Int32 nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems) : + EditEngine* pEE, sal_Int32 nP, SfxItemSet _aPrevItems, SfxItemSet _aNewItems) : EditUndo(EDITUNDO_PARAATTRIBS, pEE), nPara(nP), - aPrevItems(rPrevItems), - aNewItems(rNewItems) {} + aPrevItems(std::move(_aPrevItems)), + aNewItems(std::move(_aNewItems)) {} EditUndoSetParaAttribs::~EditUndoSetParaAttribs() {} @@ -498,10 +499,10 @@ void EditUndoSetParaAttribs::Redo() lcl_DoSetSelection( GetEditEngine()->GetActiveView(), nPara ); } -EditUndoSetAttribs::EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, const SfxItemSet& rNewItems) : +EditUndoSetAttribs::EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, SfxItemSet aNewItems) : EditUndo(EDITUNDO_ATTRIBS, pEE), aESel(rESel), - aNewAttribs(rNewItems), + aNewAttribs(std::move(aNewItems)), nSpecial(SetAttribsMode::NONE), m_bSetSelection(true), // When EditUndoSetAttribs actually is a RemoveAttribs this could be diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index f87180ba7dd7..d08bc4810b62 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -70,7 +70,7 @@ private: public: EditUndoConnectParas(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos, - const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs, + SfxItemSet aLeftParaAttribs, SfxItemSet aRightParaAttribs, const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward); virtual ~EditUndoConnectParas() override; @@ -105,7 +105,7 @@ private: OUString aText; public: - EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr); + EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, OUString aStr); virtual void Undo() override; virtual void Redo() override; @@ -123,7 +123,7 @@ private: OUString aText; public: - EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr); + EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, OUString aStr); virtual void Undo() override; virtual void Redo() override; @@ -178,9 +178,9 @@ private: public: EditUndoSetStyleSheet(EditEngine* pEE, sal_Int32 nPara, - const OUString& rPrevName, SfxStyleFamily ePrevFamily, - const OUString& rNewName, SfxStyleFamily eNewFamily, - const SfxItemSet& rPrevParaAttribs); + OUString aPrevName, SfxStyleFamily ePrevFamily, + OUString aNewName, SfxStyleFamily eNewFamily, + SfxItemSet aPrevParaAttribs); virtual ~EditUndoSetStyleSheet() override; virtual void Undo() override; @@ -198,7 +198,7 @@ private: SfxItemSet aNewItems; public: - EditUndoSetParaAttribs(EditEngine* pEE, sal_Int32 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems); + EditUndoSetParaAttribs(EditEngine* pEE, sal_Int32 nPara, SfxItemSet aPrevItems, SfxItemSet aNewItems); virtual ~EditUndoSetParaAttribs() override; virtual void Undo() override; @@ -228,7 +228,7 @@ private: public: - EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, const SfxItemSet& rNewItems); + EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, SfxItemSet aNewItems); virtual ~EditUndoSetAttribs() override; SfxItemSet& GetNewAttribs() { return aNewAttribs; } diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 93740129e9df..0820c48dfd83 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -31,12 +31,13 @@ #include <tools/tenccvt.hxx> #include <editeng/editeng.hxx> +#include <utility> #define STYLE_PRE 101 -EditHTMLParser::EditHTMLParser( SvStream& rIn, const OUString& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ) +EditHTMLParser::EditHTMLParser( SvStream& rIn, OUString _aBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ) : HTMLParser( rIn, true ), - aBaseURL( rBaseURL ), + aBaseURL(std::move( _aBaseURL )), mpEditEngine(nullptr), bInPara(false), bWasInPara(false), diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index a2aa0e0448af..ebcb4def0e02 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -71,7 +71,7 @@ protected: virtual void NextToken( HtmlTokenId nToken ) override; public: - EditHTMLParser(SvStream& rIn, const OUString& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs); + EditHTMLParser(SvStream& rIn, OUString aBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs); virtual ~EditHTMLParser() override; SvParserState CallParser(EditEngine* pEE, const EditPaM& rPaM); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 11993511372d..d11ee008c135 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -143,7 +143,7 @@ struct ImplIMEInfos sal_Int32 nLen; bool bWasCursorOverwrite; - ImplIMEInfos( const EditPaM& rPos, const OUString& rOldTextAfterStartPos ); + ImplIMEInfos( const EditPaM& rPos, OUString aOldTextAfterStartPos ); ~ImplIMEInfos(); void CopyAttribs( const ExtTextInputAttr* pA, sal_uInt16 nL ); diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 1fbb56a6e789..6b20acfd0f87 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -22,6 +22,7 @@ #include <editeng/editeng.hxx> #include <svl/hint.hxx> #include <sfx2/app.hxx> +#include <utility> void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool ) { @@ -816,8 +817,8 @@ void IdleFormattter::ForceTimeout() } } -ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const OUString& rOldTextAfterStartPos ) - : aOldTextAfterStartPos( rOldTextAfterStartPos ), +ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, OUString _aOldTextAfterStartPos ) + : aOldTextAfterStartPos(std::move( _aOldTextAfterStartPos )), aPos(rPos), nLen(0), bWasCursorOverwrite(false) |