filter/source/svg/svgexport.cxx | 4 ++-- filter/source/svg/svgfontexport.cxx | 4 ++-- filter/source/svg/svgfontexport.hxx | 2 +- lotuswordpro/inc/xfilter/xfinputlist.hxx | 4 ++-- lotuswordpro/source/filter/lwpmarker.cxx | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit a514c3966381fdb13f9789745359522ef5509c8b Author: Noel Grandin <[email protected]> AuthorDate: Mon Oct 11 18:53:13 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Oct 11 21:05:55 2021 +0200 loplugin:moveparam in lotuswordpro Change-Id: I122fc96930021dd3127d9c991e7dac3140b612f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123427 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/lotuswordpro/inc/xfilter/xfinputlist.hxx b/lotuswordpro/inc/xfilter/xfinputlist.hxx index 8a5a70e1c13d..6e9719f21155 100644 --- a/lotuswordpro/inc/xfilter/xfinputlist.hxx +++ b/lotuswordpro/inc/xfilter/xfinputlist.hxx @@ -76,9 +76,9 @@ public: m_strName = sName; } - void SetLabels(const std::vector<OUString>& list) + void SetLabels(std::vector<OUString>&& list) { - m_list=list; + m_list=std::move(list); } virtual void ToXml(IXFStream *pStrm) override; diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx index 653121532a09..86591fd8917e 100644 --- a/lotuswordpro/source/filter/lwpmarker.cxx +++ b/lotuswordpro/source/filter/lwpmarker.cxx @@ -257,7 +257,7 @@ void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType) EnumAllKeywords();//traverse the proplist to find all keywords XFInputList* pList = new XFInputList; pList->SetName(LwpDLNFPVList::m_Name.str()); - pList->SetLabels(m_Keylist); + pList->SetLabels(std::vector(m_Keylist)); pXFPara->Add(pList); } // else skip MARKER_END @@ -269,7 +269,7 @@ void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType) EnumAllKeywords(); XFInputList* pList = new XFInputList; pList->SetName(LwpDLNFPVList::m_Name.str()); - pList->SetLabels(m_Keylist); + pList->SetLabels(std::vector(m_Keylist)); pXFPara->Add(pList); XFHolderStart* pHolder= new XFHolderStart; commit 7d6352b6561c50b7622cfd4314ffcd2766a31108 Author: Noel Grandin <[email protected]> AuthorDate: Mon Oct 11 18:50:00 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Oct 11 21:05:40 2021 +0200 loplugin:moveparam in filter Change-Id: I4f41f834035fcefc22486723c971929890143dd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123423 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 6b9d0cdb8f5b..0e0ba464e762 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -957,7 +957,7 @@ bool SVGFilter::implExportDocument() aObjects[ nPos++ ] = elem.second; } - mpSVGFontExport = new SVGFontExport( *mpSVGExport, aObjects ); + mpSVGFontExport = new SVGFontExport( *mpSVGExport, std::move(aObjects) ); mpSVGWriter = new SVGActionWriter( *mpSVGExport, *mpSVGFontExport ); if( mpSVGExport->IsEmbedFonts() ) @@ -2851,7 +2851,7 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf ) std::vector< ObjectRepresentation > aObjects; aObjects.emplace_back( Reference< XInterface >(), rMtf ); - SVGFontExport aSVGFontExport( *this, aObjects ); + SVGFontExport aSVGFontExport( *this, std::move(aObjects) ); Point aPoint100thmm( OutputDevice::LogicToLogic(rMtf.GetPrefMapMode().GetOrigin(), rMtf.GetPrefMapMode(), MapMode(MapUnit::Map100thMM)) ); Size aSize100thmm( OutputDevice::LogicToLogic(rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MapMode(MapUnit::Map100thMM)) ); diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index ab730d3d2774..b0cbed97e4e7 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -36,9 +36,9 @@ const sal_Int32 nFontEM = 2048; -SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ) : +SVGFontExport::SVGFontExport( SVGExport& rExport, ::std::vector< ObjectRepresentation >&& rObjects ) : mrExport( rExport ), - maObjects( rObjects ), + maObjects( std::move(rObjects) ), mnCurFontId( 0 ) { } diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx index c5f6bd2411db..6492ebd9c04c 100644 --- a/filter/source/svg/svgfontexport.hxx +++ b/filter/source/svg/svgfontexport.hxx @@ -62,7 +62,7 @@ private: public: - SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ); + SVGFontExport( SVGExport& rExport, ::std::vector< ObjectRepresentation >&& rObjects ); ~SVGFontExport(); void EmbedFonts();
