diff options
Diffstat (limited to 'xmloff')
85 files changed, 357 insertions, 296 deletions
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 8b122fd0f9bc..5cea47b24159 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -24,6 +24,7 @@ #include <cppuhelper/implbase.hxx> #include <o3tl/hash_combine.hxx> #include <unordered_map> +#include <utility> enum class XmlStyleFamily; @@ -33,9 +34,9 @@ struct StyleNameKey_Impl OUString m_aName; StyleNameKey_Impl( XmlStyleFamily nFamily, - const OUString& rName ) : + OUString sName ) : m_nFamily( nFamily ), - m_aName( rName ) + m_aName(std::move( sName )) { } }; diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index bf75533922ec..70b915f17f59 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -39,7 +39,7 @@ protected: public: XMLElementPropertyContext( SvXMLImport& rImport, sal_Int32 nElement, - const XMLPropertyState& rProp, + XMLPropertyState aProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLElementPropertyContext() override; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index f6f27d633f96..243feb630fc8 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -65,7 +65,7 @@ public: XMLTextFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper - const OUString& pService); /// name of SO API service + OUString aService); /// name of SO API service /// process character data: will be collected in member sContentBuffer virtual void SAL_CALL characters( const OUString& sContent ) override; diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index c40629f3a61c..9136e620fa9d 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -89,7 +89,7 @@ class SdXMLImExViewBox public: SdXMLImExViewBox(double fX, double fY, double fW, double fH); - SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverter& rConv); + SdXMLImExViewBox(OUString aNew, const SvXMLUnitConverter& rConv); double GetX() const { return mfX; } double GetY() const { return mfY; } diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index d47b942f0fe0..b4bac7128aed 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -26,6 +26,7 @@ #include <rtl/ustring.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <utility> /** @descr MultiPropertySetHandler handles the two slightly different interfaces XPropertySet and XMultiPropertySet for accessing @@ -48,8 +49,8 @@ public: /** @descr Create a class instance and store the given name. @param rName The name of the property. */ - explicit PropertyWrapperBase (const OUString & rName) - : msName (rName) + explicit PropertyWrapperBase (OUString aName) + : msName (std::move(aName)) {} virtual ~PropertyWrapperBase() {} @@ -125,7 +126,7 @@ public: is casted later to one of the two of them. */ explicit MultiPropertySetHandler (css::uno::Reference< - css::uno::XInterface> const & xObject); + css::uno::XInterface> xObject); /** @descr Add a property to handle. The type given implicitly by the reference to a variable is used to create an instance of the PropertyWrapper template class. @@ -177,8 +178,8 @@ private: }; MultiPropertySetHandler::MultiPropertySetHandler (css::uno::Reference< - css::uno::XInterface> const & xObject) - : mxObject (xObject) + css::uno::XInterface> xObject) + : mxObject (std::move(xObject)) { } diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 23ea2f780041..7d1a767e784f 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -29,6 +29,7 @@ #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <unotools/mediadescriptor.hxx> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/namespacemap.hxx> @@ -448,8 +449,8 @@ struct NewDonutSeries ::std::vector< OUString > m_aSeriesStyles; ::std::vector< OUString > m_aPointStyles; - NewDonutSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) - : m_xSeries( xSeries ) + NewDonutSeries( css::uno::Reference< css::chart2::XDataSeries > xSeries, sal_Int32 nPointCount ) + : m_xSeries(std::move( xSeries )) , mnAttachedAxis( 1 ) { m_aPointStyles.resize(nPointCount); @@ -1159,11 +1160,11 @@ void SchXMLChartContext::InitChart( SchXMLTitleContext::SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, OUString& rTitle, - uno::Reference< drawing::XShape > const & xTitleShape ) : + uno::Reference< drawing::XShape > xTitleShape ) : SvXMLImportContext( rImport ), mrImportHelper( rImpHelper ), mrTitle( rTitle ), - mxTitleShape( xTitleShape ) + mxTitleShape(std::move( xTitleShape )) { } diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 53402168b36d..40ba13e0177c 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -135,7 +135,7 @@ public: SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, OUString& rTitle, - css::uno::Reference< css::drawing::XShape > const & xTitleShape ); + css::uno::Reference< css::drawing::XShape > xTitleShape ); virtual ~SchXMLTitleContext() override; virtual void SAL_CALL startFastElement( sal_Int32 nElement, diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index fc0a24a8e451..533fcb569c33 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -23,6 +23,7 @@ #include <sax/tools/converter.hxx> +#include <utility> #include <xmloff/xmlprmap.hxx> #include <SchXMLExport.hxx> @@ -372,8 +373,8 @@ css::chart2::RelativePosition lcl_getCustomLabelPosition( class lcl_MatchesRole { public: - explicit lcl_MatchesRole( const OUString & aRole ) : - m_aRole( aRole ) + explicit lcl_MatchesRole( OUString aRole ) : + m_aRole(std::move( aRole )) {} bool operator () ( const Reference< chart2::data::XLabeledDataSequence > & xSeq ) const @@ -2620,10 +2621,10 @@ void lcl_createDataLabelProperties( OUString sAPIName; sal_uInt16 nNameSpace; // from include/xmloff/xmlnamespace.hxx OUString sLocalName; - API2ODFMapItem(const OUString& sAPI, const sal_uInt16 nNS, const OUString& sLocal) - : sAPIName(sAPI) + API2ODFMapItem(OUString sAPI, const sal_uInt16 nNS, OUString sLocal) + : sAPIName(std::move(sAPI)) , nNameSpace(nNS) - , sLocalName(sLocal) + , sLocalName(std::move(sLocal)) { } }; diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index a39f822450c0..bca50a445af9 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -24,6 +24,7 @@ #include <sal/log.hxx> #include <comphelper/processfactory.hxx> +#include <utility> #include <xmloff/namespacemap.hxx> #include <xmloff/prstylei.hxx> #include <xmloff/xmlnamespace.hxx> @@ -56,8 +57,8 @@ namespace class lcl_MatchesChartType { public: - explicit lcl_MatchesChartType( const OUString & aChartTypeName ) : - m_aChartTypeName( aChartTypeName ) + explicit lcl_MatchesChartType( OUString aChartTypeName ) : + m_aChartTypeName(std::move( aChartTypeName )) {} bool operator () ( const Reference< chart2::XChartType > & xChartType ) const diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 7418b92fa064..2f3a08acec85 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -27,6 +27,7 @@ #include <comphelper/sequence.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmluconv.hxx> @@ -130,7 +131,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( bool & rRowHasLabels, chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, - const OUString& aChartTypeServiceName, + OUString aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const awt::Size & rChartSize ) : SvXMLImportContext( rImport ), @@ -152,7 +153,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( mrColHasLabels( rColHasLabels ), mrRowHasLabels( rRowHasLabels ), mrDataRowSource( rDataRowSource ), - maChartTypeServiceName( aChartTypeServiceName ), + maChartTypeServiceName(std::move( aChartTypeServiceName )), mrLSequencesPerIndex( rLSequencesPerIndex ), mbGlobalChartTypeUsedBySeries( false ), maChartSize( rChartSize ) @@ -1049,18 +1050,18 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const OUString &rSeriesStyleName, + OUString sSeriesStyleName, ::std::vector< DataRowPointStyle >& rStyleVector, - const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + css::uno::Reference< css::chart2::XDataSeries > xSeries, ContextType eContextType, tSchXMLLSequencesPerIndex & rLSequencesPerIndex) : SvXMLImportContext( rImport ), mrImportHelper( rImpHelper ), mrStyleVector( rStyleVector ), - m_xSeries( xSeries ), + m_xSeries(std::move( xSeries )), meContextType( eContextType ), - maSeriesStyleName( rSeriesStyleName), + maSeriesStyleName(std::move( sSeriesStyleName)), mrLSequencesPerIndex(rLSequencesPerIndex) {} diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index a1de29e187e1..c6b74f0e0389 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -93,7 +93,7 @@ public: bool & rRowHasLabels, css::chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, - const OUString& aChartTypeServiceName, + OUString aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const css::awt::Size & rChartSize ); virtual ~SchXMLPlotAreaContext() override; @@ -281,9 +281,9 @@ public: SchXMLStatisticsObjectContext( SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, - const OUString &rSeriesStyleName, + OUString aSeriesStyleName, ::std::vector< DataRowPointStyle >& rStyleVector, - const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + css::uno::Reference< css::chart2::XDataSeries > xSeries, ContextType eContextType, tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx index 40c3d045271e..e48cc684aa14 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx @@ -9,6 +9,7 @@ #include "SchXMLPropertyMappingContext.hxx" #include "SchXMLTools.hxx" +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/namespacemap.hxx> @@ -66,9 +67,9 @@ SchXMLPropertyMappingContext::SchXMLPropertyMappingContext( SvXMLImport& rImport, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, uno::Reference< - chart2::XDataSeries > const & xSeries ): + chart2::XDataSeries > xSeries ): SvXMLImportContext( rImport ), - mxDataSeries(xSeries), + mxDataSeries(std::move(xSeries)), mrLSequencesPerIndex(rLSequencesPerIndex) { diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx index 1696a32f36a0..ec9010a6c69a 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx @@ -28,7 +28,7 @@ public: SvXMLImport& rImport, tSchXMLLSequencesPerIndex& rLSequencesPerIndex, css::uno::Reference< - css::chart2::XDataSeries > const & xSeries ); + css::chart2::XDataSeries > xSeries ); virtual ~SchXMLPropertyMappingContext() override; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 16bec57fea20..434459813bc4 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -24,6 +24,7 @@ #include <sax/tools/converter.hxx> #include <sal/log.hxx> +#include <utility> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmluconv.hxx> @@ -44,12 +45,12 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, std::vector< RegressionStyle >& rRegressionStyleVector, - const css::uno::Reference< - css::chart2::XDataSeries >& xSeries, + css::uno::Reference< + css::chart2::XDataSeries > xSeries, const awt::Size & rChartSize) : SvXMLImportContext( rImport ), mrImportHelper( rImpHelper ), - mxSeries( xSeries ), + mxSeries(std::move( xSeries )), maChartSize( rChartSize ), mrRegressionStyleVector( rRegressionStyleVector ) { diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index 13b796cd24e0..9d24143aca51 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -31,7 +31,7 @@ public: SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, std::vector< RegressionStyle >& rRegressionStyleVector, - const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + css::uno::Reference< css::chart2::XDataSeries > xSeries, const css::awt::Size & rChartSize ); virtual ~SchXMLRegressionCurveObjectContext() override; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 56b98304870e..8ecc32c22573 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -47,6 +47,7 @@ #include <comphelper/processfactory.hxx> #include <sal/log.hxx> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/namespacemap.hxx> @@ -529,8 +530,8 @@ namespace { struct DomainInfo { - DomainInfo( const OUString& rRole, const OUString& rRange, sal_Int32 nIndex ) - : aRole(rRole), aRange(rRange), nIndexForLocalData(nIndex) + DomainInfo( OUString _aRole, OUString _aRange, sal_Int32 nIndex ) + : aRole(std::move(_aRole)), aRange(std::move(_aRange)), nIndexForLocalData(nIndex) {} OUString aRole; diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index 7053d20c84c0..81d5de8cdb8a 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -21,6 +21,7 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> +#include <utility> #include <vector> #include <map> #include <optional> @@ -137,11 +138,11 @@ struct RegressionStyle OUString msStyleName; - RegressionStyle(const css::uno::Reference< - css::chart2::XDataSeries >& xSeries, - const OUString& sStyleName) : - m_xSeries ( xSeries ), - msStyleName ( sStyleName ) + RegressionStyle(css::uno::Reference< + css::chart2::XDataSeries > xSeries, + OUString sStyleName) : + m_xSeries (std::move( xSeries )), + msStyleName (std::move( sStyleName )) {} }; @@ -199,26 +200,26 @@ struct DataRowPointStyle bool mbSymbolSizeForSeriesIsMissingInFile; DataRowPointStyle( StyleType eType - , const css::uno::Reference< css::chart2::XDataSeries >& xSeries + , css::uno::Reference< css::chart2::XDataSeries > xSeries , sal_Int32 nPointIndex , sal_Int32 nPointRepeat - , const OUString& sStyleName + , OUString sStyleName , sal_Int32 nAttachedAxis = 0 ) : meType( eType ), - m_xSeries( xSeries ), + m_xSeries(std::move( xSeries )), m_nPointIndex( nPointIndex ), m_nPointRepeat( nPointRepeat ), - msStyleName( sStyleName ), + msStyleName(std::move( sStyleName )), mnAttachedAxis( nAttachedAxis ), mbSymbolSizeForSeriesIsMissingInFile( false ) {} // ctor for use in import of <chart:data-label> as child of <chart:series> - DataRowPointStyle(StyleType eType, const OUString& sStyleName, sal_Int32 nAttachedAxis = 0) + DataRowPointStyle(StyleType eType, OUString sStyleName, sal_Int32 nAttachedAxis = 0) : meType(eType) , m_nPointIndex(0) , m_nPointRepeat(0) - , msStyleName(sStyleName) + , msStyleName(std::move(sStyleName)) , mnAttachedAxis(nAttachedAxis) , mbSymbolSizeForSeriesIsMissingInFile(false) { diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 9052a8dbaa81..e5af9f17bc13 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> +#include <utility> #include <xmloff/DocumentSettingsContext.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> @@ -63,7 +64,7 @@ class XMLMyList css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - explicit XMLMyList(const uno::Reference<uno::XComponentContext>& rxContext); + explicit XMLMyList(uno::Reference<uno::XComponentContext> xContext); void push_back(beans::PropertyValue const & aProp) { aProps.push_back(aProp); nCount++; } uno::Sequence<beans::PropertyValue> GetSequence(); @@ -73,9 +74,9 @@ public: } -XMLMyList::XMLMyList(const uno::Reference<uno::XComponentContext>& rxContext) +XMLMyList::XMLMyList(uno::Reference<uno::XComponentContext> xContext) : nCount(0), - m_xContext(rxContext) + m_xContext(std::move(xContext)) { assert(m_xContext.is()); } @@ -150,7 +151,7 @@ public: XMLConfigItemContext(SvXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, css::uno::Any& rAny, - const OUString& rItemName, + OUString aItemName, XMLConfigBaseContext* pBaseContext); virtual void SAL_CALL characters( const OUString& rChars ) override; @@ -194,7 +195,7 @@ private: public: XMLConfigItemMapIndexedContext(SvXMLImport& rImport, css::uno::Any& rAny, - const OUString& rConfigItemName, + OUString aConfigItemName, XMLConfigBaseContext* pBaseContext); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( @@ -384,11 +385,11 @@ void XMLConfigItemSetContext::endFastElement(sal_Int32 ) XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, css::uno::Any& rTempAny, - const OUString& rTempItemName, + OUString aTempItemName, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext(rImport), mrAny(rTempAny), - mrItemName(rTempItemName), + mrItemName(std::move(aTempItemName)), mpBaseContext(pTempBaseContext) { for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList )) @@ -556,10 +557,10 @@ void XMLConfigItemMapNamedContext::endFastElement(sal_Int32 ) XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, css::uno::Any& rAny, - const OUString& rConfigItemName, + OUString aConfigItemName, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext(rImport, rAny, pBaseContext), - maConfigItemName( rConfigItemName ) + maConfigItemName(std::move( aConfigItemName )) { } diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index fd5c295a6d5d..61248c06e8df 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <xmloff/ProgressBarHelper.hxx> #include <osl/diagnose.h> @@ -26,9 +27,9 @@ using namespace ::com::sun::star; const sal_Int32 nDefaultProgressBarRange = 1000000; const float fProgressStep = 0.5; -ProgressBarHelper::ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xTempStatusIndicator, +ProgressBarHelper::ProgressBarHelper(css::uno::Reference < css::task::XStatusIndicator> xTempStatusIndicator, const bool bTempStrict) -: xStatusIndicator(xTempStatusIndicator) +: xStatusIndicator(std::move(xTempStatusIndicator)) , nRange(nDefaultProgressBarRange) , nReference(100) , nValue(0) diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 0dddb882207a..fc80a24e1701 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -19,6 +19,7 @@ #include <RDFaImportHelper.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/namespacemap.hxx> @@ -86,10 +87,10 @@ class RDFaInserter BlankNodeMap_t m_BlankNodeMap; public: - RDFaInserter(uno::Reference<uno::XComponentContext> const & i_xContext, - uno::Reference< rdf::XDocumentRepository > const & i_xRepository) - : m_xContext(i_xContext) - , m_xRepository(i_xRepository) + RDFaInserter(uno::Reference<uno::XComponentContext> i_xContext, + uno::Reference< rdf::XDocumentRepository > i_xRepository) + : m_xContext(std::move(i_xContext)) + , m_xRepository(std::move(i_xRepository)) {} uno::Reference< rdf::XBlankNode > @@ -115,14 +116,14 @@ struct ParsedRDFaAttributes OUString m_Datatype; ParsedRDFaAttributes( - OUString const & i_rAbout, + OUString i_sAbout, ::std::vector< OUString >&& i_rProperties, - OUString const & i_rContent, - OUString const & i_rDatatype) - : m_About(i_rAbout) + OUString i_sContent, + OUString i_sDatatype) + : m_About(std::move(i_sAbout)) , m_Properties(std::move(i_rProperties)) - , m_Content(i_rContent) - , m_Datatype(i_rDatatype) + , m_Content(std::move(i_sContent)) + , m_Datatype(std::move(i_sDatatype)) { } }; @@ -132,10 +133,10 @@ struct RDFaEntry uno::Reference<rdf::XMetadatable> m_xObject; std::shared_ptr<ParsedRDFaAttributes> m_xRDFaAttributes; - RDFaEntry(uno::Reference<rdf::XMetadatable> const & i_xObject, - std::shared_ptr<ParsedRDFaAttributes> const& i_pRDFaAttributes) - : m_xObject(i_xObject) - , m_xRDFaAttributes(i_pRDFaAttributes) + RDFaEntry(uno::Reference<rdf::XMetadatable> i_xObject, + std::shared_ptr<ParsedRDFaAttributes> i_pRDFaAttributes) + : m_xObject(std::move(i_xObject)) + , m_xRDFaAttributes(std::move(i_pRDFaAttributes)) { } }; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 5fa0f5ce5ce4..72809c7a0fd0 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -8,22 +8,24 @@ */ #include <limits.h> + +#include <utility> #include "SvXMLAttr.hxx" -SvXMLAttr::SvXMLAttr( const OUString& rLName, - const OUString& rValue ) : +SvXMLAttr::SvXMLAttr( OUString _aLName, + OUString _aValue ) : aPrefixPos(USHRT_MAX), - aLName(rLName), - aValue(rValue) + aLName(std::move(_aLName)), + aValue(std::move(_aValue)) { } SvXMLAttr::SvXMLAttr( const sal_uInt16 nPos, - const OUString& rLName, - const OUString& rValue ) : + OUString _aLName, + OUString _aValue ) : aPrefixPos(nPos), - aLName(rLName), - aValue(rValue) + aLName(std::move(_aLName)), + aValue(std::move(_aValue)) { } diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index bdfc279835e0..e9f19e54018a 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -19,11 +19,11 @@ private: public: // Assuming OUString is well behaved, the default copy constructor and // assignment operator are fine. - SvXMLAttr( const OUString& rLName, - const OUString& rValue ); + SvXMLAttr( OUString aLName, + OUString aValue ); SvXMLAttr( const sal_uInt16 nPos, - const OUString& rLName, - const OUString& rValue ); + OUString aLName, + OUString aValue ); bool operator== (const SvXMLAttr &rCmp) const; sal_uInt16 getPrefixPos() const { return aPrefixPos;} diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 8b070c7f53c8..a3ace36f71d2 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <xmloff/xmlerror.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> @@ -44,11 +45,11 @@ public: ErrorRecord( sal_Int32 nId, const Sequence<OUString>& rParams, - const OUString& rExceptionMessage, + OUString aExceptionMessage, sal_Int32 nRow, sal_Int32 nColumn, - const OUString& rPublicId, - const OUString& rSystemId); + OUString aPublicId, + OUString aSystemId); sal_Int32 nId; /// error ID @@ -66,14 +67,14 @@ public: ErrorRecord::ErrorRecord( sal_Int32 nID, const Sequence<OUString>& rParams, - const OUString& rExceptionMessage, sal_Int32 nRowNumber, sal_Int32 nCol, - const OUString& rPublicId, const OUString& rSystemId) : + OUString aExceptionMessage, sal_Int32 nRowNumber, sal_Int32 nCol, + OUString aPublicId, OUString aSystemId) : nId(nID), - sExceptionMessage(rExceptionMessage), + sExceptionMessage(std::move(aExceptionMessage)), nRow(nRowNumber), nColumn(nCol), - sPublicId(rPublicId), - sSystemId(rSystemId), + sPublicId(std::move(aPublicId)), + sSystemId(std::move(aSystemId)), aParams(rParams) { } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 55e9b1956560..552b6edf8073 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -436,11 +436,11 @@ void SvXMLExport::DetermineModelType_() SvXMLExport::SvXMLExport( const uno::Reference< uno::XComponentContext >& xContext, - OUString const & implementationName, + OUString implementationName, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const enum XMLTokenEnum eClass, SvXMLExportFlags nExportFlags ) : mpImpl( new SvXMLExport_Impl ), - m_xContext(xContext), m_implementationName(implementationName), + m_xContext(xContext), m_implementationName(std::move(implementationName)), mxAttrList( new SvXMLAttributeList ), mpNamespaceMap( new SvXMLNamespaceMap ), mpAuthorIDs( new SvtSecurityMapPersonalInfo ), @@ -458,16 +458,16 @@ SvXMLExport::SvXMLExport( SvXMLExport::SvXMLExport( const css::uno::Reference< css::uno::XComponentContext >& xContext, - OUString const & implementationName, - const OUString &rFileName, + OUString implementationName, + OUString fileName, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const uno::Reference< xml::sax::XDocumentHandler > & rHandler) : mpImpl( new SvXMLExport_Impl ), - m_xContext(xContext), m_implementationName(implementationName), + m_xContext(xContext), m_implementationName(std::move(implementationName)), mxHandler( rHandler ), mxExtHandler( rHandler, uno::UNO_QUERY ), mxAttrList( new SvXMLAttributeList ), - msOrigFileName( rFileName ), + msOrigFileName(std::move( fileName )), mpNamespaceMap( new SvXMLNamespaceMap ), mpAuthorIDs( new SvtSecurityMapPersonalInfo ), maUnitConv(xContext, util::MeasureUnit::MM_100TH, eDefaultMeasureUnit, getSaneDefaultVersion()), @@ -488,20 +488,20 @@ SvXMLExport::SvXMLExport( SvXMLExport::SvXMLExport( const css::uno::Reference< css::uno::XComponentContext >& xContext, - OUString const & implementationName, - const OUString &rFileName, + OUString implementationName, + OUString fileName, const uno::Reference< xml::sax::XDocumentHandler > & rHandler, const Reference< XModel >& rModel, FieldUnit const eDefaultFieldUnit, SvXMLExportFlags nExportFlag) : mpImpl( new SvXMLExport_Impl ), - m_xContext(xContext), m_implementationName(implementationName), + m_xContext(xContext), m_implementationName(std::move(implementationName)), mxModel( rModel ), mxHandler( rHandler ), mxExtHandler( rHandler, uno::UNO_QUERY ), mxNumberFormatsSupplier (rModel, uno::UNO_QUERY), mxAttrList( new SvXMLAttributeList ), - msOrigFileName( rFileName ), + msOrigFileName(std::move( fileName )), mpNamespaceMap( new SvXMLNamespaceMap ), mpAuthorIDs( new SvtSecurityMapPersonalInfo ), maUnitConv( xContext, diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 873f557f8982..2cda88aa3bf1 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -26,6 +26,7 @@ #include <sal/log.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <tools/urlobj.hxx> +#include <utility> #include <vcl/embeddedfontshelper.hxx> #include <vcl/graph.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> @@ -312,8 +313,8 @@ public: std::unique_ptr< DocumentInfo > mpDocumentInfo; - SvXMLImport_Impl( const uno::Reference< uno::XComponentContext >& rxContext, - OUString const & theImplementationName, + SvXMLImport_Impl( uno::Reference< uno::XComponentContext > xContext, + OUString theImplementationName, const css::uno::Sequence< OUString > & sSupportedServiceNames = {}) : hBatsFontConv( nullptr ) , hMathFontConv( nullptr ) @@ -323,8 +324,8 @@ public: // Convert drawing object positions from OOo file format to OASIS (#i28749#) , mbShapePositionInHoriL2R( false ) , mbTextDocInOOoFileFormat( false ) - , mxComponentContext( rxContext ) - , implementationName(theImplementationName) + , mxComponentContext(std::move( xContext )) + , implementationName(std::move(theImplementationName)) , maSupportedServiceNames(sSupportedServiceNames) { SAL_WARN_IF(!mxComponentContext.is(), "xmloff.core", "SvXMLImport: no ComponentContext"); @@ -491,9 +492,9 @@ namespace private: css::uno::Reference<css::xml::sax::XFastParser> mxParser; public: - setFastDocumentHandlerGuard(const css::uno::Reference<css::xml::sax::XFastParser>& Parser, + setFastDocumentHandlerGuard(css::uno::Reference<css::xml::sax::XFastParser> Parser, const css::uno::Reference<css::xml::sax::XFastDocumentHandler>& Handler) - : mxParser(Parser) + : mxParser(std::move(Parser)) { mxParser->setFastDocumentHandler(Handler); } @@ -2156,8 +2157,8 @@ OUString SvXMLImportFastNamespaceHandler::getNamespaceURI( const OUString&/* rNa return OUString(); } -SvXMLLegacyToFastDocHandler::SvXMLLegacyToFastDocHandler( const rtl::Reference< SvXMLImport > & rImport ) -: mrImport( rImport ), +SvXMLLegacyToFastDocHandler::SvXMLLegacyToFastDocHandler( rtl::Reference< SvXMLImport > xImport ) +: mrImport(std::move( xImport )), mxFastAttributes( new sax_fastparser::FastAttributeList( SvXMLImport::xTokenHandler.get() ) ) { } diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 07e0e0c0b77c..96bc2f0e4031 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -21,6 +21,7 @@ #include <string_view> +#include <utility> #include <xmloff/xmluconv.hxx> #include <com/sun/star/util/DateTime.hpp> @@ -72,7 +73,7 @@ struct SvXMLUnitConverter::Impl mutable uno::Reference< i18n::XCharacterClassification > m_xCharClass; uno::Reference< uno::XComponentContext > m_xContext; - Impl(uno::Reference<uno::XComponentContext> const& xContext, + Impl(uno::Reference<uno::XComponentContext> xContext, sal_Int16 const eCoreMeasureUnit, sal_Int16 const eXMLMeasureUnit, SvtSaveOptions::ODFSaneDefaultVersion const nODFVersion) @@ -80,7 +81,7 @@ struct SvXMLUnitConverter::Impl , m_eXMLMeasureUnit(eXMLMeasureUnit) , m_eODFVersion(nODFVersion) , m_aNullDate(30, 12, 1899) - , m_xContext(xContext) + , m_xContext(std::move(xContext)) { OSL_ENSURE( m_xContext.is(), "got no service manager" ); } diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 48bf04c82419..e97414b914a2 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -19,6 +19,7 @@ #include "XMLNumberStylesExport.hxx" #include <XMLNumberStylesImport.hxx> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/namespacemap.hxx> @@ -501,7 +502,7 @@ public: sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, - const SvXMLImportContextRef& rSlaveContext ); + SvXMLImportContextRef xSlaveContext ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; @@ -520,11 +521,11 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, - const SvXMLImportContextRef& rSlaveContext ) + SvXMLImportContextRef xSlaveContext ) : SvXMLImportContext(rImport), mpParent( pParent ), maNumberStyle( SvXMLImport::getNameFromToken(nElement) ), - mxSlaveContext( rSlaveContext ) + mxSlaveContext(std::move( xSlaveContext )) { mbLong = false; mbTextual = false; diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index 078ef4826084..4797f6edf9ef 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> + #include "numithdl.hxx" using namespace ::com::sun::star; @@ -24,8 +26,8 @@ using namespace ::com::sun::star; -XMLNumRulePropHdl::XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > const & xNumRuleCompare ) -: mxNumRuleCompare( xNumRuleCompare ) +XMLNumRulePropHdl::XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > xNumRuleCompare ) +: mxNumRuleCompare(std::move( xNumRuleCompare )) { } diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx index 91db9c17e948..503c4c7b6c40 100644 --- a/xmloff/source/draw/numithdl.hxx +++ b/xmloff/source/draw/numithdl.hxx @@ -30,7 +30,7 @@ class XMLNumRulePropHdl : public XMLPropertyHandler private: css::uno::Reference< css::ucb::XAnyCompare > mxNumRuleCompare; public: - explicit XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > const & xNumRuleCompare ); + explicit XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > xNumRuleCompare ); virtual ~XMLNumRulePropHdl() override; virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 5e68aa17599d..a72a57261b58 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/text/WritingMode2.hpp> +#include <utility> #include <xmloff/EnumPropertyHdl.hxx> #include <xmloff/NamedBoolPropertyHdl.hxx> #include <WordWrapPropertyHdl.hxx> @@ -974,13 +975,13 @@ public: } -XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > const & xModel, SvXMLImport& rImport ) -: mxModel( xModel ), mpExport(nullptr), mpImport( &rImport ) +XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > xModel, SvXMLImport& rImport ) +: mxModel(std::move( xModel )), mpExport(nullptr), mpImport( &rImport ) { } -XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > const & xModel, SvXMLExport& rExport ) -: mxModel( xModel ), mpExport( &rExport ), mpImport(nullptr) +XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > xModel, SvXMLExport& rExport ) +: mxModel(std::move( xModel )), mpExport( &rExport ), mpImport(nullptr) { } diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index c73de5d61904..2a2557a2b742 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -58,8 +58,8 @@ private: SvXMLImport* mpImport; public: - XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel > const & xModel, SvXMLExport& rExport ); - XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel > const & xModel, SvXMLImport& rImport ); + XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel > xModel, SvXMLExport& rExport ); + XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel > xModel, SvXMLImport& rImport ); virtual ~XMLSdPropHdlFactory() override; virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const override; }; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 538120d2bfaa..f0e150910ae9 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -535,7 +535,7 @@ public: sal_Int32 mnCurrentZ; std::shared_ptr<ShapeGroupContext> mpParentContext; - ShapeGroupContext( uno::Reference< drawing::XShapes > const & rShapes, std::shared_ptr<ShapeGroupContext> pParentContext ); + ShapeGroupContext( uno::Reference< drawing::XShapes > xShapes, std::shared_ptr<ShapeGroupContext> pParentContext ); void popGroupAndPostProcess(); private: @@ -544,8 +544,8 @@ private: } -ShapeGroupContext::ShapeGroupContext( uno::Reference< drawing::XShapes > const & rShapes, std::shared_ptr<ShapeGroupContext> pParentContext ) -: mxShapes( rShapes ), mnCurrentZ( 0 ), mpParentContext( std::move(pParentContext) ) +ShapeGroupContext::ShapeGroupContext( uno::Reference< drawing::XShapes > xShapes, std::shared_ptr<ShapeGroupContext> pParentContext ) +: mxShapes(std::move( xShapes )), mnCurrentZ( 0 ), mpParentContext( std::move(pParentContext) ) { } diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 776401fb2840..8975241f895e 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -21,6 +21,7 @@ #include <string_view> +#include <utility> #include <xexptran.hxx> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> @@ -216,8 +217,8 @@ struct ImpSdXMLExpTransObj2DSkewY : public ImpSdXMLExpTransObj2DBase struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase { ::basegfx::B2DHomMatrix maMatrix; - explicit ImpSdXMLExpTransObj2DMatrix(const ::basegfx::B2DHomMatrix& rNew) - : ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {} + explicit ImpSdXMLExpTransObj2DMatrix(::basegfx::B2DHomMatrix aNew) + : ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(std::move(aNew)) {} }; } @@ -596,8 +597,8 @@ struct ImpSdXMLExpTransObj3DTranslate : public ImpSdXMLExpTransObj3DBase struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase { ::basegfx::B3DHomMatrix maMatrix; - explicit ImpSdXMLExpTransObj3DMatrix(const ::basegfx::B3DHomMatrix& rNew) - : ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {} + explicit ImpSdXMLExpTransObj3DMatrix(::basegfx::B3DHomMatrix aNew) + : ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(std::move(aNew)) {} }; } @@ -992,8 +993,8 @@ SdXMLImExViewBox::SdXMLImExViewBox(double fX, double fY, double fW, double fH) } // #100617# Asked vincent hardy: svg:viewBox values may be double precision. -SdXMLImExViewBox::SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverter& rConv) -: msString(rNew), +SdXMLImExViewBox::SdXMLImExViewBox(OUString aNew, const SvXMLUnitConverter& rConv) +: msString(std::move(aNew)), mfX( 0.0 ), mfY( 0.0 ), mfW( 1000.0 ), diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index 41b236cc8a9c..24672f9a7415 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -18,6 +18,7 @@ */ #include <sal/log.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnamespace.hxx> #include "ximplink.hxx" @@ -27,9 +28,9 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, const uno::Reference< xml::sax::XFastAttributeList>& xAttrList, uno::Reference< drawing::XShapes > const & rShapes) +SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, const uno::Reference< xml::sax::XFastAttributeList>& xAttrList, uno::Reference< drawing::XShapes > xShapes) : SvXMLShapeContext( rImport, false ) -, mxParent( rShapes ) +, mxParent(std::move( xShapes )) { for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList )) { diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index cd5259154361..017c6384028e 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -37,7 +37,7 @@ public: SdXMLShapeLinkContext( SvXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, - css::uno::Reference< css::drawing::XShapes > const & rShapes); + css::uno::Reference< css::drawing::XShapes > xShapes); virtual ~SdXMLShapeLinkContext() override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 9e2973403142..22c302205e02 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <utility> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/drawing/XGluePointsSupplier.hpp> #include <com/sun/star/drawing/GluePoint2.hpp> @@ -143,12 +144,12 @@ static bool ImpIsEmptyURL( std::u16string_view rURL ) SdXMLShapeContext::SdXMLShapeContext( SvXMLImport& rImport, - const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, - uno::Reference< drawing::XShapes > const & rShapes, + css::uno::Reference< css::xml::sax::XFastAttributeList> xAttrList, + uno::Reference< drawing::XShapes > xShapes, bool bTemporaryShape) : SvXMLShapeContext( rImport, bTemporaryShape ) - , mxShapes( rShapes ) - , mxAttrList(xAttrList) + , mxShapes(std::move( xShapes )) + , mxAttrList(std::move(xAttrList)) , mbListContextPushed( false ) , mnStyleFamily(XmlStyleFamily::SD_GRAPHICS_ID) , mbIsPlaceholder(false) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 202de49d7bc9..217c773c9785 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -98,8 +98,8 @@ protected: public: SdXMLShapeContext( SvXMLImport& rImport, - const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, - css::uno::Reference< css::drawing::XShapes > const & rShapes, + css::uno::Reference< css::xml::sax::XFastAttributeList> xAttrList, + css::uno::Reference< css::drawing::XShapes > xShapes, bool bTemporaryShape); virtual ~SdXMLShapeContext() override; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 4befbb00815c..8b818a919129 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -18,6 +18,7 @@ */ #include "ximpstyl.hxx" +#include <utility> #include <xmloff/maptype.hxx> #include <xmloff/XMLDrawingPageStyleContext.hxx> #include <xmloff/XMLShapeStyleContext.hxx> @@ -91,7 +92,7 @@ class XMLThemeContext : public SvXMLImportContext public: XMLThemeContext(SvXMLImport& rImport, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, - const uno::Reference<beans::XPropertySet>& xMasterPage); + uno::Reference<beans::XPropertySet> xMasterPage); ~XMLThemeContext(); uno::Reference<xml::sax::XFastContextHandler> SAL_CALL createFastChildContext( @@ -1488,9 +1489,9 @@ void SdXMLHeaderFooterDeclContext::characters( const OUString& rChars ) XMLThemeContext::XMLThemeContext(SvXMLImport& rImport, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, - const uno::Reference<beans::XPropertySet>& xMasterPage) + uno::Reference<beans::XPropertySet> xMasterPage) : SvXMLImportContext(rImport) - , m_xMasterPage(xMasterPage) + , m_xMasterPage(std::move(xMasterPage)) { for (const auto& rAttribute : sax_fastparser::castToFastAttributeList(xAttrList)) { diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 72cb6e0ef35c..5f283fa8b036 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -20,6 +20,7 @@ #include "elementexport.hxx" #include "strings.hxx" +#include <utility> #include <xmloff/xmlnamespace.hxx> #include "eventexport.hxx" #include "formenums.hxx" @@ -226,11 +227,11 @@ namespace xmloff //= OControlExport OControlExport::OControlExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, - const OUString& _rControlId, const OUString& _rReferringControls, + OUString _sControlId, OUString _sReferringControls, const Sequence< ScriptEventDescriptor >& _rEvents) :OElementExport(_rContext, _rxControl, _rEvents) - ,m_sControlId(_rControlId) - ,m_sReferringControls(_rReferringControls) + ,m_sControlId(std::move(_sControlId)) + ,m_sReferringControls(std::move(_sReferringControls)) ,m_nClassId(FormComponentType::CONTROL) ,m_eType( UNKNOWN ) ,m_nIncludeCommon(CCAFlags::NONE) diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index deb9cfea6b35..e13edcc8c8c2 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -116,8 +116,8 @@ namespace xmloff */ OControlExport(IFormsExportContext& _rContext, const css::uno::Reference< css::beans::XPropertySet >& _rxControl, - const OUString& _rControlId, - const OUString& _rReferringControls, + OUString _sControlId, + OUString _sReferringControls, const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents); protected: diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 19f247aae122..dcfdcc29d1cb 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -18,6 +18,7 @@ */ #include "elementimport.hxx" +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/namespacemap.hxx> #include "strings.hxx" @@ -1680,9 +1681,9 @@ namespace xmloff //= OListOptionImport OListOptionImport::OListOptionImport(SvXMLImport& _rImport, - const OListAndComboImportRef& _rListBox) + OListAndComboImportRef _xListBox) :SvXMLImportContext(_rImport) - ,m_xListBoxImport(_rListBox) + ,m_xListBoxImport(std::move(_xListBox)) { } @@ -1731,9 +1732,9 @@ namespace xmloff //= OComboItemImport OComboItemImport::OComboItemImport(SvXMLImport& _rImport, - const OListAndComboImportRef& _rListBox) + OListAndComboImportRef _xListBox) :SvXMLImportContext(_rImport) - ,m_xListBoxImport(_rListBox) + ,m_xListBoxImport(std::move(_xListBox)) { } diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index dcf4a60437ef..bf91ac02136c 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -501,7 +501,7 @@ namespace xmloff public: OListOptionImport(SvXMLImport& _rImport, - const OListAndComboImportRef& _rListBox); + OListAndComboImportRef _xListBox); virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) override; @@ -517,7 +517,7 @@ namespace xmloff public: OComboItemImport(SvXMLImport& _rImport, - const OListAndComboImportRef& _rListBox); + OListAndComboImportRef _xListBox); protected: // SvXMLImportContext overridables diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index d30afcd299d2..d994c63b3de1 100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -20,6 +20,7 @@ #pragma once #include <forms/property_handler.hxx> +#include <utility> #include <xmloff/xmltoken.hxx> #include <vector> @@ -78,13 +79,13 @@ namespace xmloff } PropertyDescription( - const OUString& i_propertyName, + OUString i_propertyName, const sal_uInt16 i_namespacePrefix, const ::xmloff::token::XMLTokenEnum i_attributeToken, const PropertyHandlerFactory i_factory, const PropertyId i_propertyId ) - :propertyName( i_propertyName ) + :propertyName(std::move( i_propertyName )) ,factory( i_factory ) ,propertyId( i_propertyId ) ,attribute( i_namespacePrefix, i_attributeToken ) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index ded9fa8565b1..81772ac41644 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -25,6 +25,7 @@ #include <sax/tools/converter.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/namespacemap.hxx> @@ -339,9 +340,9 @@ bool OPropertyImport::handleAttribute(sal_Int32 nAttributeToken, const OUString& //= OPropertyElementsContext OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, - const OPropertyImportRef& _rPropertyImporter) + OPropertyImportRef _xPropertyImporter) :SvXMLImportContext(_rImport) - ,m_xPropertyImporter(_rPropertyImporter) + ,m_xPropertyImporter(std::move(_xPropertyImporter)) { } @@ -375,9 +376,9 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OPropertyElementsConte //= OSinglePropertyContext OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, - const OPropertyImportRef& _rPropertyImporter) + OPropertyImportRef _xPropertyImporter) :SvXMLImportContext(_rImport) - ,m_xPropertyImporter(_rPropertyImporter) + ,m_xPropertyImporter(std::move(_xPropertyImporter)) { } @@ -432,9 +433,9 @@ void OSinglePropertyContext::startFastElement( //= OListPropertyContext OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, - const OPropertyImportRef& _rPropertyImporter ) + OPropertyImportRef _rPropertyImporter ) :SvXMLImportContext( _rImport ) - ,m_xPropertyImporter( _rPropertyImporter ) + ,m_xPropertyImporter(std::move( _rPropertyImporter )) { } diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index b4b660d5b22b..07add577922d 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -157,7 +157,7 @@ namespace xmloff public: OPropertyElementsContext(SvXMLImport& _rImport, - const OPropertyImportRef& _rPropertyImporter); + OPropertyImportRef _xPropertyImporter); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; @@ -179,7 +179,7 @@ namespace xmloff public: OSinglePropertyContext(SvXMLImport& _rImport, - const OPropertyImportRef& _rPropertyImporter); + OPropertyImportRef _xPropertyImporter); virtual void SAL_CALL startFastElement( sal_Int32 nElement, @@ -196,7 +196,7 @@ namespace xmloff public: OListPropertyContext( SvXMLImport& _rImport, - const OPropertyImportRef& _rPropertyImporter ); + OPropertyImportRef _xPropertyImporter ); virtual void SAL_CALL startFastElement( sal_Int32 nElement, diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 994610a7f5cb..90de88dbcc93 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -21,6 +21,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <utility> #include <xmloff/xmlmetae.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/namespacemap.hxx> @@ -301,9 +302,9 @@ const char s_href[] = "xlink:href"; SvXMLMetaExport::SvXMLMetaExport( SvXMLExport& i_rExp, - const uno::Reference<document::XDocumentProperties>& i_rDocProps ) : + uno::Reference<document::XDocumentProperties> i_rDocProps ) : mrExport( i_rExp ), - mxDocProps( i_rDocProps ), + mxDocProps(std::move( i_rDocProps )), m_level( 0 ) { assert(mxDocProps.is()); diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 3dc240cd107e..decbf65c5783 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -32,6 +32,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> +#include <utility> #include <xmloff/xmlmetai.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> @@ -52,7 +53,7 @@ private: public: XMLDocumentBuilderContext(SvXMLImport& rImport, sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, - const css::uno::Reference<css::xml::dom::XSAXDocumentBuilder2>& rDocBuilder, + css::uno::Reference<css::xml::dom::XSAXDocumentBuilder2> xDocBuilder, SvXMLMetaDocumentContext * pTopLevel); virtual void SAL_CALL characters( const OUString& aChars ) override; @@ -76,10 +77,10 @@ public: XMLDocumentBuilderContext::XMLDocumentBuilderContext(SvXMLImport& rImport, sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>&, - const uno::Reference<xml::dom::XSAXDocumentBuilder2>& rDocBuilder, + uno::Reference<xml::dom::XSAXDocumentBuilder2> xDocBuilder, SvXMLMetaDocumentContext *const pTopLevel) : SvXMLImportContext(rImport) - , mxDocBuilder(rDocBuilder) + , mxDocBuilder(std::move(xDocBuilder)) , m_pTopLevel(pTopLevel) { } @@ -180,9 +181,9 @@ lcl_initGenerator(SvXMLImport & rImport, } SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport, - const uno::Reference<document::XDocumentProperties>& xDocProps) : + uno::Reference<document::XDocumentProperties> xDocProps) : SvXMLImportContext( rImport ), - mxDocProps(xDocProps), + mxDocProps(std::move(xDocProps)), mxDocBuilder( xml::dom::SAXDocumentBuilder::create( comphelper::getProcessComponentContext())) diff --git a/xmloff/source/script/xmlbasicscript.cxx b/xmloff/source/script/xmlbasicscript.cxx index f619f71c26d0..e81f6867afe4 100644 --- a/xmloff/source/script/xmlbasicscript.cxx +++ b/xmloff/source/script/xmlbasicscript.cxx @@ -22,6 +22,7 @@ #include "xmlbasicscript.hxx" #include <sal/log.hxx> #include <xmlscript/xmlns.h> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltkmap.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -187,10 +188,10 @@ BasicLibrariesElement::createFastChildContext(sal_Int32 nElement, BasicEmbeddedLibraryElement::BasicEmbeddedLibraryElement( SvXMLImport& rImport, const Reference<script::XLibraryContainer2>& rxLibContainer, - const OUString& rLibName, bool bReadOnly) + OUString aLibName, bool bReadOnly) : BasicElementBase(rImport) , m_xLibContainer(rxLibContainer) - , m_aLibName(rLibName) + , m_aLibName(std::move(aLibName)) , m_bReadOnly(bReadOnly) { try @@ -236,10 +237,10 @@ void BasicEmbeddedLibraryElement::endFastElement(sal_Int32) BasicModuleElement::BasicModuleElement(SvXMLImport& rImport, const Reference<container::XNameContainer>& rxLib, - const OUString& rName) + OUString aName) : BasicElementBase(rImport) , m_xLib(rxLib) - , m_aName(rName) + , m_aName(std::move(aName)) { } @@ -276,10 +277,10 @@ BasicModuleElement::createFastChildContext(sal_Int32 nElement, BasicSourceCodeElement::BasicSourceCodeElement(SvXMLImport& rImport, const Reference<container::XNameContainer>& rxLib, - const OUString& rName) + OUString rName) : BasicElementBase(rImport) , m_xLib(rxLib) - , m_aName(rName) + , m_aName(std::move(rName)) { } diff --git a/xmloff/source/script/xmlbasicscript.hxx b/xmloff/source/script/xmlbasicscript.hxx index 1d94f344b5d6..04dd31211ce5 100644 --- a/xmloff/source/script/xmlbasicscript.hxx +++ b/xmloff/source/script/xmlbasicscript.hxx @@ -66,7 +66,7 @@ public: BasicEmbeddedLibraryElement( SvXMLImport& rImport, const css::uno::Reference<css::script::XLibraryContainer2>& rxLibContainer, - const OUString& rLibName, bool bReadOnly); + OUString aLibName, bool bReadOnly); virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, @@ -83,7 +83,7 @@ private: public: BasicModuleElement(SvXMLImport& rImport, const css::uno::Reference<css::container::XNameContainer>& rxLib, - const OUString& rName); + OUString aName); virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, @@ -100,7 +100,7 @@ private: public: BasicSourceCodeElement(SvXMLImport& rImport, const css::uno::Reference<css::container::XNameContainer>& rxLib, - const OUString& rName); + OUString rName); virtual void SAL_CALL characters(const OUString& rChars) override; virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 73051469b896..7da3607efa00 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <xmloff/xmlscripti.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> @@ -50,7 +51,7 @@ private: public: XMLScriptChildContext( SvXMLImport& rImport, const css::uno::Reference< css::frame::XModel>& rxModel, - const OUString& rLanguage ); + OUString aLanguage ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; @@ -59,11 +60,11 @@ public: } XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, - const Reference< frame::XModel >& rxModel, const OUString& rLanguage ) + const Reference< frame::XModel >& rxModel, OUString aLanguage ) :SvXMLImportContext( rImport ) ,m_xModel( rxModel ) ,m_xDocumentScripts( rxModel, UNO_QUERY ) - ,m_aLanguage( rLanguage ) + ,m_aLanguage(std::move( aLanguage )) { } diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 3c9e0993b559..3fac72dbbadb 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -18,6 +18,7 @@ */ #include "PageHeaderFooterContext.hxx" +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmltypes.hxx> @@ -31,14 +32,14 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES; PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, ::std::vector< XMLPropertyState > & rTempProperties, - const rtl::Reference < SvXMLImportPropertyMapper > &rTempMap, + rtl::Reference < SvXMLImportPropertyMapper > xTempMap, sal_Int32 nStart, sal_Int32 nEnd, const bool bTempHeader ) : SvXMLImportContext( rImport ), rProperties(rTempProperties), nStartIndex(nStart), nEndIndex(nEnd), - rMap(rTempMap) + rMap(std::move(xTempMap)) { bHeader = bTempHeader; } diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index a96a8a393b5c..30c2f430a8fe 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -33,7 +33,7 @@ public: PageHeaderFooterContext( SvXMLImport& rImport, ::std::vector< XMLPropertyState > & rProperties, - const rtl::Reference < SvXMLImportPropertyMapper > &rMap, + rtl::Reference < SvXMLImportPropertyMapper > xMap, sal_Int32 nStartIndex, sal_Int32 nEndIndex, const bool bHeader); diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx index f065e081d7e3..6dd9c83ca062 100644 --- a/xmloff/source/style/XMLElementPropertyContext.cxx +++ b/xmloff/source/style/XMLElementPropertyContext.cxx @@ -18,16 +18,17 @@ */ #include <XMLElementPropertyContext.hxx> +#include <utility> XMLElementPropertyContext::XMLElementPropertyContext ( SvXMLImport& rImport, sal_Int32 /*nElement*/, - const XMLPropertyState& rProp, + XMLPropertyState _aProp, ::std::vector< XMLPropertyState > &rProps ) : SvXMLImportContext( rImport ), bInsert( false ), rProperties( rProps ), - aProp( rProp ) + aProp(std::move( _aProp )) { } diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 543b3670fe0f..db51dbc81ff6 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -19,6 +19,7 @@ #include <o3tl/sorted_vector.hxx> #include <tools/fontenum.hxx> +#include <utility> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> @@ -62,16 +63,16 @@ class XMLFontAutoStylePoolEntry_Impl public: inline XMLFontAutoStylePoolEntry_Impl( - const OUString& rName, - const OUString& rFamilyName, - const OUString& rStyleName, + OUString aName, + OUString aFamilyName, + OUString aStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); inline XMLFontAutoStylePoolEntry_Impl( - const OUString& rFamilyName, - const OUString& rStyleName, + OUString aFamilyName, + OUString aStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); @@ -87,15 +88,15 @@ public: } inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( - const OUString& rName, - const OUString& rFamilyName, - const OUString& rStyleName, + OUString aName, + OUString aFamilyName, + OUString aStyleName, FontFamily nFam, FontPitch nP, rtl_TextEncoding eE ) : - sName( rName ), - sFamilyName( rFamilyName ), - sStyleName( rStyleName ), + sName(std::move( aName )), + sFamilyName(std::move( aFamilyName )), + sStyleName(std::move( aStyleName )), nFamily( nFam ), nPitch( nP ), eEnc( eE ) @@ -103,13 +104,13 @@ inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( } inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( - const OUString& rFamilyName, - const OUString& rStyleName, + OUString rFamilyName, + OUString rStyleName, FontFamily nFam, FontPitch nP, rtl_TextEncoding eE ) : - sFamilyName( rFamilyName ), - sStyleName( rStyleName ), + sFamilyName(std::move( rFamilyName )), + sStyleName(std::move( rStyleName )), nFamily( nFam ), nPitch( nP ), eEnc( eE ) diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 399741023dbc..d77d7671b516 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -30,6 +30,7 @@ #include <sax/tools/converter.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> @@ -57,11 +58,11 @@ XMLFootnoteSeparatorImport::XMLFootnoteSeparatorImport( SvXMLImport& rImport, sal_Int32 /*nElement*/, vector<XMLPropertyState> & rProps, - const rtl::Reference<XMLPropertySetMapper> & rMapperRef, + rtl::Reference<XMLPropertySetMapper> xMapperRef, sal_Int32 nIndex) : SvXMLImportContext(rImport), rProperties(rProps), - rMapper(rMapperRef), + rMapper(std::move(xMapperRef)), nPropIndex(nIndex) { } diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index be0289f80503..da1449556346 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx @@ -49,7 +49,7 @@ public: SvXMLImport& rImport, sal_Int32 nElement, ::std::vector<XMLPropertyState> & rProperties, - const rtl::Reference<XMLPropertySetMapper> & rMapperRef, + rtl::Reference<XMLPropertySetMapper> xMapperRef, sal_Int32 nIndex); virtual ~XMLFootnoteSeparatorImport() override; diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 42565e08cf85..40d65ed5dc8c 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -24,6 +24,7 @@ #include <sal/log.hxx> #include <tools/solar.h> #include <PageMasterStyleMap.hxx> +#include <utility> #include <xmloff/families.hxx> #include <xmloff/xmlaustp.hxx> #include <xmloff/xmlexp.hxx> @@ -44,12 +45,12 @@ using namespace ::xmloff::token; XMLAutoStyleFamily::XMLAutoStyleFamily( XmlStyleFamily nFamily, - const OUString& rStrName, - const rtl::Reference < SvXMLExportPropertyMapper > &rMapper, - const OUString& rStrPrefix, + OUString aStrName, + rtl::Reference < SvXMLExportPropertyMapper > xMapper, + OUString aStrPrefix, bool bAsFamily ) : - mnFamily( nFamily ), maStrFamilyName( rStrName), mxMapper( rMapper ), - mnCount( 0 ), mnName( 0 ), maStrPrefix( rStrPrefix ), mbAsFamily( bAsFamily ) + mnFamily( nFamily ), maStrFamilyName(std::move( aStrName)), mxMapper(std::move( xMapper )), + mnCount( 0 ), mnName( 0 ), maStrPrefix(std::move( aStrPrefix )), mbAsFamily( bAsFamily ) {} XMLAutoStyleFamily::XMLAutoStyleFamily( XmlStyleFamily nFamily ) : diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 4645305e1dcb..213fba13774f 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -24,6 +24,7 @@ #include <rtl/ref.hxx> #include <set> #include <memory> +#include <utility> #include <vector> #include <comphelper/stl_types.hxx> @@ -70,8 +71,8 @@ private: public: - explicit XMLAutoStylePoolParent( const OUString & rParent ) : - msParent( rParent ) + explicit XMLAutoStylePoolParent( OUString aParent ) : + msParent(std::move( aParent )) { } @@ -112,9 +113,9 @@ struct XMLAutoStyleFamily OUString maStrPrefix; bool mbAsFamily; - XMLAutoStyleFamily( XmlStyleFamily nFamily, const OUString& rStrName, - const rtl::Reference<SvXMLExportPropertyMapper>& rMapper, - const OUString& rStrPrefix, bool bAsFamily ); + XMLAutoStyleFamily( XmlStyleFamily nFamily, OUString aStrName, + rtl::Reference<SvXMLExportPropertyMapper> xMapper, + OUString aStrPrefix, bool bAsFamily ); explicit XMLAutoStyleFamily( XmlStyleFamily nFamily ); diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index f87f9ae1ece0..5c8310210dd9 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -35,6 +35,7 @@ #include <map> #include <o3tl/sorted_vector.hxx> +#include <utility> #include <xmloff/xmlexppr.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/attrlist.hxx> @@ -132,7 +133,7 @@ class FilterPropertyInfo_Impl public: - FilterPropertyInfo_Impl( const OUString& rApiName, + FilterPropertyInfo_Impl( OUString aApiName, const sal_uInt32 nIndex); const OUString& GetApiName() const { return msApiName; } @@ -146,9 +147,9 @@ public: }; FilterPropertyInfo_Impl::FilterPropertyInfo_Impl( - const OUString& rApiName, + OUString aApiName, const sal_uInt32 nIndex ) : - msApiName( rApiName ) + msApiName(std::move( aApiName )) { maIndexes.push_back(nIndex); } diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index e8ecf4109772..f35a11983554 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -29,6 +29,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> +#include <utility> #include <xmloff/xmlprmap.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlimppr.hxx> @@ -61,10 +62,10 @@ using ::com::sun::star::beans::PropertyVetoException; SvXMLImportPropertyMapper::SvXMLImportPropertyMapper( - const rtl::Reference< XMLPropertySetMapper >& rMapper, + rtl::Reference< XMLPropertySetMapper > xMapper, SvXMLImport& rImp ): rImport(rImp), - maPropMapper ( rMapper ) + maPropMapper (std::move( xMapper )) { } diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index d928f8be2a79..c4350c0db795 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/i18n/NativeNumberXmlAttributes2.hpp> +#include <utility> #include <xmloff/xmlnumfe.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmlnumfi.hxx> @@ -66,8 +67,8 @@ struct SvXMLEmbeddedTextEntry sal_Int32 nFormatPos; // resulting position in embedded-text element OUString aText; - SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const OUString& rT ) : - nSourcePos(nSP), nFormatPos(nFP), aText(rT) {} + SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, OUString aT ) : + nSourcePos(nSP), nFormatPos(nFP), aText(std::move(aT)) {} }; } @@ -238,9 +239,9 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLExport& rExp, const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp, - const OUString& rPrefix ) : + OUString aPrefix ) : rExport( rExp ), - sPrefix( rPrefix ), + sPrefix(std::move( aPrefix )), pFormatter( nullptr ), bHasText( false ) { diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 46ee44b3080f..618232990c96 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -30,6 +30,7 @@ #include <sax/tools/converter.hxx> +#include <utility> #include <xmloff/xmlement.hxx> #include <xmloff/xmlnumfi.hxx> #include <xmloff/xmltkmap.hxx> @@ -57,8 +58,8 @@ struct SvXMLNumFmtEntry sal_uInt32 nKey; bool bRemoveAfterUse; - SvXMLNumFmtEntry( const OUString& rN, sal_uInt32 nK, bool bR ) : - aName(rN), nKey(nK), bRemoveAfterUse(bR) {} + SvXMLNumFmtEntry( OUString aN, sal_uInt32 nK, bool bR ) : + aName(std::move(aN)), nKey(nK), bRemoveAfterUse(bR) {} }; } diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index cb0a6eca9e2f..4788cc4f8c5a 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -18,6 +18,7 @@ */ #include <sal/log.hxx> +#include <utility> #include <xmloff/xmlprcon.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltypes.hxx> @@ -33,14 +34,14 @@ SvXMLPropertySetContext::SvXMLPropertySetContext( const uno::Reference< xml::sax::XFastAttributeList >& xAttrList, sal_uInt32 nFam, vector< XMLPropertyState > &rProps, - const rtl::Reference < SvXMLImportPropertyMapper > &rMap, + rtl::Reference < SvXMLImportPropertyMapper > xMap, sal_Int32 nSIdx, sal_Int32 nEIdx ) : SvXMLImportContext( rImp ) , mnStartIdx( nSIdx ) , mnEndIdx( nEIdx ) , mnFamily( nFam ) , mrProperties( rProps ) -, mxMapper( rMap ) +, mxMapper(std::move( xMap )) { mxMapper->importXML( mrProperties, xAttrList, GetImport().GetMM100UnitConverter(), diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index d46365008f5e..bd4273056c98 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -30,6 +30,7 @@ #include <PageMasterPropMapper.hxx> #include <sal/log.hxx> #include <svl/style.hxx> +#include <utility> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> @@ -159,8 +160,8 @@ class SvXMLStyleIndex_Impl public: - SvXMLStyleIndex_Impl( XmlStyleFamily nFam, const OUString& rName ) : - sName( rName ), + SvXMLStyleIndex_Impl( XmlStyleFamily nFam, OUString aName ) : + sName(std::move( aName )), nFamily( nFam ), mpStyle(nullptr) { diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 47923d66c28d..71c4fd632f89 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -33,6 +33,7 @@ #include <comphelper/sequence.hxx> #include <tools/diagnose_ex.h> +#include <utility> #include <xmloff/table/XMLTableImport.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/txtimp.hxx> @@ -70,7 +71,7 @@ struct ColumnInfo class XMLProxyContext : public SvXMLImportContext { public: - XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent ); + XMLProxyContext( SvXMLImport& rImport, SvXMLImportContextRef xParent ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; @@ -177,9 +178,9 @@ private: } -XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent ) +XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, SvXMLImportContextRef xParent ) : SvXMLImportContext( rImport ) -, mxParent( xParent ) +, mxParent(std::move( xParent )) { } diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index b00cdedb0375..9c521f1601f0 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -21,6 +21,7 @@ #include "XMLChangedRegionImportContext.hxx" #include "XMLChangeInfoContext.hxx" #include <com/sun/star/uno/Reference.h> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> @@ -36,10 +37,10 @@ XMLChangeElementImportContext::XMLChangeElementImportContext( SvXMLImport& rImport, bool bAccContent, XMLChangedRegionImportContext& rParent, - OUString const & rType) : + OUString aType) : SvXMLImportContext(rImport), bAcceptContent(bAccContent), - maType(rType), + maType(std::move(aType)), rChangedRegion(rParent) { } diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index dff7222d7890..7cd7c85975c6 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -65,7 +65,7 @@ public: bool bAcceptContent, /// context of enclosing <text:changed-region> element XMLChangedRegionImportContext& rParent, - OUString const & rType); + OUString aType); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index aa29f4c695e1..5986d83d9e7b 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -19,6 +19,7 @@ #include "XMLIndexSimpleEntryContext.hxx" #include "XMLIndexTemplateContext.hxx" +#include <utility> #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> @@ -41,10 +42,10 @@ using ::xmloff::token::XML_STYLE_NAME; XMLIndexSimpleEntryContext::XMLIndexSimpleEntryContext( SvXMLImport& rImport, - const OUString& rEntry, + OUString aEntry, XMLIndexTemplateContext& rTemplate ) : SvXMLImportContext(rImport) -, m_rEntryType(rEntry) +, m_rEntryType(std::move(aEntry)) , m_bCharStyleNameOK(false) , m_rTemplateContext(rTemplate) , m_nValues(1) diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 1fafb4190574..684245184ed2 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -55,7 +55,7 @@ public: XMLIndexSimpleEntryContext( SvXMLImport& rImport, - const OUString& rEntry, + OUString aEntry, XMLIndexTemplateContext& rTemplate ); virtual ~XMLIndexSimpleEntryContext() override; diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index a2e4ac3a6fc0..fef92ad213cf 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -23,6 +23,7 @@ #include <rtl/ustring.hxx> #include "XMLPropertyBackpatcher.hxx" +#include <utility> #include <xmloff/txtimp.hxx> using ::std::map; @@ -33,8 +34,8 @@ using ::com::sun::star::beans::XPropertySet; template<class A> XMLPropertyBackpatcher<A>::XMLPropertyBackpatcher( - const OUString& sPropName) -: sPropertyName(sPropName) + OUString sPropName) +: sPropertyName(std::move(sPropName)) { } diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 3a243f3bfb79..3b3f2732080c 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -76,7 +76,7 @@ class XMLPropertyBackpatcher public: explicit XMLPropertyBackpatcher( - const OUString& sPropertyName); + OUString sPropertyName); ~XMLPropertyBackpatcher(); diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index 0f4f51e1b4e3..138c3b1a33b8 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/style/NumberingType.hpp> #include <sal/log.hxx> #include <sax/tools/converter.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> @@ -50,10 +51,10 @@ XMLSectionFootnoteConfigImport::XMLSectionFootnoteConfigImport( SvXMLImport& rImport, sal_Int32 /*nElement*/, vector<XMLPropertyState> & rProps, - const rtl::Reference<XMLPropertySetMapper> & rMapperRef) : + rtl::Reference<XMLPropertySetMapper> xMapperRef) : SvXMLImportContext(rImport), rProperties(rProps), - rMapper(rMapperRef) + rMapper(std::move(xMapperRef)) { } diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index dc7bc7c94e60..7a25690334ef 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -49,7 +49,7 @@ public: SvXMLImport& rImport, sal_Int32 nElement, ::std::vector<XMLPropertyState> & rProperties, - const rtl::Reference<XMLPropertySetMapper> & rMapperRef); + rtl::Reference<XMLPropertySetMapper> xMapperRef); virtual ~XMLSectionFootnoteConfigImport() override; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index b248598607a4..a6e7bba52b9f 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <sax/tools/converter.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnamespace.hxx> @@ -95,9 +96,9 @@ class XMLTextFrameContextHyperlink_Impl public: - inline XMLTextFrameContextHyperlink_Impl( const OUString& rHRef, - const OUString& rName, - const OUString& rTargetFrameName, + inline XMLTextFrameContextHyperlink_Impl( OUString aHRef, + OUString aName, + OUString aTargetFrameName, bool bMap ); const OUString& GetHRef() const { return sHRef; } @@ -107,11 +108,11 @@ public: }; inline XMLTextFrameContextHyperlink_Impl::XMLTextFrameContextHyperlink_Impl( - const OUString& rHRef, const OUString& rName, - const OUString& rTargetFrameName, bool bM ) : - sHRef( rHRef ), - sName( rName ), - sTargetFrameName( rTargetFrameName ), + OUString aHRef, OUString aName, + OUString aTargetFrameName, bool bM ) : + sHRef(std::move( aHRef )), + sName(std::move( aName )), + sTargetFrameName(std::move( aTargetFrameName )), bMap( bM ) { } diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index d2744cb18a38..893fdbdc5a4a 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vector> #include <tools/solar.h> @@ -72,8 +73,8 @@ public: } explicit XMLTextListAutoStylePoolEntry_Impl( - const OUString& rInternalName ) : - sInternalName( rInternalName ), + OUString aInternalName ) : + sInternalName(std::move( aInternalName )), nPos( 0 ), bIsNamed( true ) { diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index b886823c2801..b82f7a5af4f4 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -30,6 +30,7 @@ #include <txtfldi.hxx> #include <txtvfldi.hxx> +#include <utility> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/xmlnamespace.hxx> @@ -123,9 +124,9 @@ constexpr OUStringLiteral sAPI_true = u"TRUE"; XMLTextFieldImportContext::XMLTextFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const OUString& pService) + OUString aService) : SvXMLImportContext( rImport ) -, sServiceName(pService) +, sServiceName(std::move(aService)) , rTextImportHelper(rHlp) , sServicePrefix(sAPI_textfield_prefix) , bValid(false) diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index f60b87be5984..5b348807243b 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> #include "XMLTextFrameContext.hxx" #include "XMLTextFrameHyperlinkContext.hxx" +#include <utility> #include <xmloff/XMLEventsImportContext.hxx> enum class XMLHintType @@ -45,10 +46,10 @@ class XMLHint_Impl public: XMLHint_Impl( XMLHintType nTyp, - const css::uno::Reference < css::text::XTextRange > & rS, - const css::uno::Reference < css::text::XTextRange > & rE ) : - xStart( rS ), - xEnd( rE ), + css::uno::Reference < css::text::XTextRange > xS, + css::uno::Reference < css::text::XTextRange > xE ) : + xStart(std::move( xS )), + xEnd(std::move( xE )), nType( nTyp ) { } @@ -71,10 +72,10 @@ class XMLStyleHint_Impl : public XMLHint_Impl public: - XMLStyleHint_Impl( const OUString& rStyleName, + XMLStyleHint_Impl( OUString aStyleName, const css::uno::Reference < css::text::XTextRange > & rPos ) : XMLHint_Impl( XMLHintType::XML_HINT_STYLE, rPos, rPos ), - sStyleName( rStyleName ) + sStyleName(std::move( aStyleName )) { } @@ -87,10 +88,10 @@ class XMLReferenceHint_Impl : public XMLHint_Impl public: - XMLReferenceHint_Impl( const OUString& rRefName, + XMLReferenceHint_Impl( OUString aRefName, const css::uno::Reference < css::text::XTextRange > & rPos ) : XMLHint_Impl( XMLHintType::XML_HINT_REFERENCE, rPos, rPos ), - sRefName( rRefName ) + sRefName(std::move( aRefName )) { } @@ -141,20 +142,20 @@ class XMLIndexMarkHint_Impl : public XMLHint_Impl public: - XMLIndexMarkHint_Impl( const css::uno::Reference < css::beans::XPropertySet > & rPropSet, + XMLIndexMarkHint_Impl( css::uno::Reference < css::beans::XPropertySet > xPropSet, const css::uno::Reference < css::text::XTextRange > & rPos ) : XMLHint_Impl( XMLHintType::XML_HINT_INDEX_MARK, rPos, rPos ), - xIndexMarkPropSet( rPropSet ), + xIndexMarkPropSet(std::move( xPropSet )), sID() { } - XMLIndexMarkHint_Impl( const css::uno::Reference < css::beans::XPropertySet > & rPropSet, + XMLIndexMarkHint_Impl( css::uno::Reference < css::beans::XPropertySet > xPropSet, const css::uno::Reference < css::text::XTextRange > & rPos, - const OUString& sIDString) : + OUString sIDString) : XMLHint_Impl( XMLHintType::XML_HINT_INDEX_MARK, rPos, rPos ), - xIndexMarkPropSet( rPropSet ), - sID(sIDString) + xIndexMarkPropSet(std::move( xPropSet )), + sID(std::move(sIDString)) { } diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 12fe384a579e..24f87a186b48 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -25,6 +25,7 @@ #include <comphelper/base64.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> +#include <utility> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> @@ -1770,12 +1771,12 @@ OUString OOo2OasisTransformer::GetEventName( const OUString& rName, bool ) return aNewName; } -OOo2OasisTransformer::OOo2OasisTransformer( OUString const & rImplName, - OUString const & rSubServiceName ) +OOo2OasisTransformer::OOo2OasisTransformer( OUString aImplName, + OUString aSubServiceName ) noexcept : XMLTransformerBase( aActionTable, aTokenMap ), - m_aImplName(rImplName), - m_aSubServiceName(rSubServiceName), + m_aImplName(std::move(aImplName)), + m_aSubServiceName(std::move(aSubServiceName)), m_pEventMap( nullptr ) { GetNamespaceMap().Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken(XML_N_OFFICE_OOO), XML_NAMESPACE_OFFICE ); diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index 43d69853f4ef..01c5d72b38c3 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -46,8 +46,8 @@ protected: virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ) override; public: - OOo2OasisTransformer( OUString const & rImplName, - OUString const & rSubServiceName ) noexcept; + OOo2OasisTransformer( OUString aImplName, + OUString aSubServiceName ) noexcept; virtual ~OOo2OasisTransformer() noexcept override; // XInterface diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index f892530ac111..844673fa299e 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -22,6 +22,8 @@ #include <osl/diagnose.h> +#include <utility> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -33,7 +35,7 @@ class XMLPersTextTContext_Impl : public XMLTransformerContext public: XMLPersTextTContext_Impl( XMLTransformerBase& rTransformer, - const OUString& rChars ); + OUString aChars ); virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -51,9 +53,9 @@ public: XMLPersTextTContext_Impl::XMLPersTextTContext_Impl( XMLTransformerBase& rImp, - const OUString& rChars ) : + OUString aChars ) : XMLTransformerContext( rImp, OUString() ), - m_aCharacters( rChars ) + m_aCharacters(std::move( aChars )) { } diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index a8bfb77221c9..7f67dca52971 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -20,6 +20,7 @@ #pragma once #include <rtl/ustring.hxx> +#include <utility> #include <xmloff/namespacemap.hxx> #include "TransformerActionInit.hxx" #include "TransformerAction.hxx" @@ -31,9 +32,9 @@ struct NameKey_Impl sal_uInt16 m_nPrefix; OUString m_aLocalName; - NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) : + NameKey_Impl( sal_uInt16 nPrfx, OUString aLclNm ) : m_nPrefix( nPrfx ), - m_aLocalName( rLclNm ) + m_aLocalName(std::move( aLclNm )) { } diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index f4669aac414b..880821aff5a5 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> +#include <utility> #include <osl/diagnose.h> #include "TransformerBase.hxx" @@ -45,9 +46,9 @@ bool XMLTransformerContext::HasNamespace( sal_uInt16 nPrefix ) const } XMLTransformerContext::XMLTransformerContext( XMLTransformerBase& rImp, - const OUString& rQName ) + OUString aQName ) : m_rTransformer(rImp) - , m_aQName(rQName) + , m_aQName(std::move(aQName)) { } diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 97df7498a3a8..d9c1d76aac78 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -61,7 +61,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLTransformerContext( XMLTransformerBase& rTransformer, - const OUString& rQName ); + OUString aQName ); // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 2785ad9e9aaf..3031a815ca17 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -21,6 +21,7 @@ #include "SchemaRestrictionContext.hxx" #include "xformsapi.hxx" +#include <utility> #include <xmloff/xmltoken.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> @@ -56,10 +57,10 @@ using namespace xmloff::token; SchemaRestrictionContext::SchemaRestrictionContext( SvXMLImport& rImport, Reference<css::xforms::XDataTypeRepository> const & rRepository, - const OUString& sTypeName ) : + OUString sTypeName ) : TokenContext( rImport ), mxRepository( rRepository ), - msTypeName( sTypeName ) + msTypeName(std::move( sTypeName )) { SAL_WARN_IF( !mxRepository.is(), "xmloff", "need repository" ); } diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 47cf4b088f44..66a5eb5250fa 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -42,7 +42,7 @@ class SchemaRestrictionContext : public TokenContext public: SchemaRestrictionContext( SvXMLImport& rImport, css::uno::Reference<css::xforms::XDataTypeRepository> const & rRepository, - const OUString& sTypeName ); + OUString sTypeName ); private: // create mxDataType (if not already present) |