diff options
-rw-r--r-- | forms/source/component/Columns.cxx | 5 | ||||
-rw-r--r-- | forms/source/component/Columns.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.hxx | 7 | ||||
-rw-r--r-- | forms/source/component/GroupManager.cxx | 9 | ||||
-rw-r--r-- | forms/source/component/GroupManager.hxx | 4 | ||||
-rw-r--r-- | forms/source/component/imgprod.cxx | 7 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.cxx | 6 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.hxx | 2 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.hxx | 13 | ||||
-rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 9 | ||||
-rw-r--r-- | forms/source/solar/inc/navtoolbar.hxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/datatypes.cxx | 5 | ||||
-rw-r--r-- | forms/source/xforms/datatypes.hxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/evaluationcontext.hxx | 13 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission.hxx | 5 |
15 files changed, 52 insertions, 41 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 7ab2e08019b4..c14b96191be6 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -36,6 +36,7 @@ #include <services.hxx> #include <tools/debug.hxx> #include <o3tl/sorted_vector.hxx> +#include <utility> namespace frm @@ -186,11 +187,11 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) } -OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const OUString& _sModelName ) +OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, OUString _sModelName ) :OGridColumn_BASE(m_aMutex) ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper) ,m_aHidden( Any( false ) ) - ,m_aModelName(_sModelName) + ,m_aModelName(std::move(_sModelName)) { // Create the UnoControlModel diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index fd2caa3b979d..6c12197b90a5 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -60,7 +60,7 @@ class OGridColumn :public ::cppu::BaseMutex // [properties] public: - OGridColumn(const css::uno::Reference<css::uno::XComponentContext>& _rContext, const OUString& _sModelName); + OGridColumn(const css::uno::Reference<css::uno::XComponentContext>& _rContext, OUString _sModelName); explicit OGridColumn(const OGridColumn* _pOriginal ); virtual ~OGridColumn() override; diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 7d6b86e03277..73831a9c67ba 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <string_view> +#include <utility> #include <vector> #include <propertybaghelper.hxx> @@ -94,10 +95,10 @@ public: OUString aValue; sal_uInt16 nRepresentation; - HtmlSuccessfulObj( const OUString& _rName, const OUString& _rValue, + HtmlSuccessfulObj( OUString _aName, OUString _aValue, sal_uInt16 _nRepresent = SUCCESSFUL_REPRESENT_TEXT ) - :aName( _rName ) - ,aValue( _rValue ) + :aName(std::move( _aName )) + ,aValue(std::move( _aValue )) ,nRepresentation( _nRepresent ) { } diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index deec1bcd572c..edd296d6c77a 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -27,6 +27,7 @@ #include <frm_strings.hxx> #include <algorithm> +#include <utility> namespace frm { @@ -54,9 +55,9 @@ namespace } } -OGroupCompAcc::OGroupCompAcc(const Reference<XPropertySet>& rxElement, const OGroupComp& _rGroupComp ) +OGroupCompAcc::OGroupCompAcc(const Reference<XPropertySet>& rxElement, OGroupComp _aGroupComp ) :m_xComponent( rxElement ) - ,m_aGroupComp( _rGroupComp ) + ,m_aGroupComp(std::move( _aGroupComp )) { } @@ -118,8 +119,8 @@ public: } }; -OGroup::OGroup( const OUString& rGroupName ) - :m_aGroupName( rGroupName ) +OGroup::OGroup( OUString sGroupName ) + :m_aGroupName(std::move( sGroupName )) ,m_nInsertPos(0) { } diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index 9365d1b44ea8..4cefd7ac3a12 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -114,7 +114,7 @@ class OGroupCompAcc friend class OGroupCompAccLess; public: - OGroupCompAcc(const css::uno::Reference< css::beans::XPropertySet>& rxElement, const OGroupComp& _rGroupComp ); + OGroupCompAcc(const css::uno::Reference< css::beans::XPropertySet>& rxElement, OGroupComp _aGroupComp ); bool operator==( const OGroupCompAcc& rCompAcc ) const; @@ -132,7 +132,7 @@ class OGroup final friend class OGroupLess; public: - explicit OGroup(const OUString& rGroupName); + explicit OGroup(OUString sGroupName); const OUString& GetGroupName() const { return m_aGroupName; } css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> > GetControlModels() const; diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 5446b2082af7..ce88a85c0c24 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -21,6 +21,7 @@ #include <osl/diagnose.h> #include <tools/debug.hxx> +#include <utility> #include <vcl/BitmapReadAccess.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/svapp.hxx> @@ -42,7 +43,7 @@ class ImgProdLockBytes : public SvLockBytes public: ImgProdLockBytes( SvStream* pStm, bool bOwner ); - explicit ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > const & rStreamRef ); + explicit ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > xStreamRef ); virtual ErrCode ReadAt( sal_uInt64 nPos, void* pBuffer, std::size_t nCount, std::size_t * pRead ) const override; virtual ErrCode WriteAt( sal_uInt64 nPos, const void* pBuffer, std::size_t nCount, std::size_t * pWritten ) override; @@ -59,8 +60,8 @@ ImgProdLockBytes::ImgProdLockBytes( SvStream* pStm, bool bOwner ) : } -ImgProdLockBytes::ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > const & rStmRef ) : - xStmRef( rStmRef ) +ImgProdLockBytes::ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > _xStmRef ) : + xStmRef(std::move( _xStmRef )) { if( !xStmRef.is() ) return; diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 93f163d4379a..be60c1ffc003 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -21,6 +21,8 @@ #include <osl/diagnose.h> #include <tools/diagnose_ex.h> +#include <utility> + namespace frm { @@ -31,8 +33,8 @@ namespace frm using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; - ORichTextFeatureDispatcher::ORichTextFeatureDispatcher( EditView& _rView, const URL& _rURL ) - :m_aFeatureURL( _rURL ) + ORichTextFeatureDispatcher::ORichTextFeatureDispatcher( EditView& _rView, URL _aURL ) + :m_aFeatureURL(std::move( _aURL )) ,m_aStatusListeners( m_aMutex ) ,m_pEditView( &_rView ) ,m_bDisposed( false ) diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 53be887a4c40..5c863f10f8eb 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -53,7 +53,7 @@ namespace frm void checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); } protected: - ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL& _rURL ); + ORichTextFeatureDispatcher( EditView& _rView, css::util::URL _aURL ); virtual ~ORichTextFeatureDispatcher( ) override; public: diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 182b0a7e0958..a8d0ec45a432 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -36,6 +36,7 @@ #include <connectivity/dbtools.hxx> #include <tools/long.hxx> #include <unotools/resmgr.hxx> +#include <utility> namespace frm { @@ -301,10 +302,10 @@ namespace frm { public: impl_appendOrderByColumn_throw(const FormOperations *pFO, - css::uno::Reference< css::beans::XPropertySet > const & xField, + css::uno::Reference< css::beans::XPropertySet > xField, bool bUp) : m_pFO(pFO) - , m_xField(xField) + , m_xField(std::move(xField)) , m_bUp(bUp) {}; @@ -320,11 +321,11 @@ namespace frm { public: impl_appendFilterByColumn_throw(const FormOperations *pFO, - css::uno::Reference< css::sdb::XSingleSelectQueryComposer > const & xParser, - css::uno::Reference< css::beans::XPropertySet > const & xField) + css::uno::Reference< css::sdb::XSingleSelectQueryComposer > xParser, + css::uno::Reference< css::beans::XPropertySet > xField) : m_pFO(pFO) - , m_xParser(xParser) - , m_xField(xField) + , m_xParser(std::move(xParser)) + , m_xField(std::move(xField)) {}; void operator()() { diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 11ba237dea0a..217a9d55d0d3 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -29,6 +29,7 @@ #include <svx/labelitemwindow.hxx> +#include <utility> #include <vcl/commandinfoprovider.hxx> #include <vcl/toolbox.hxx> @@ -134,14 +135,14 @@ namespace frm } NavigationToolBar::NavigationToolBar( vcl::Window* _pParent, WinBits _nStyle, - const PCommandImageProvider& _pImageProvider, - const OUString & sModuleId ) + PCommandImageProvider _pImageProvider, + OUString sModuleId ) :Window( _pParent, _nStyle ) ,m_pDispatcher( nullptr ) - ,m_pImageProvider( _pImageProvider ) + ,m_pImageProvider(std::move( _pImageProvider )) ,m_eImageSize( eSmall ) ,m_pToolbar( nullptr ) - ,m_sModuleId( sModuleId ) + ,m_sModuleId(std::move( sModuleId )) { implInit( ); } diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index 8d5113357e5f..18e0e806df34 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -60,8 +60,8 @@ namespace frm NavigationToolBar( vcl::Window* _pParent, WinBits _nStyle, - const PCommandImageProvider& _pImageProvider, - const OUString & sModuleId + PCommandImageProvider _pImageProvider, + OUString sModuleId ); virtual ~NavigationToolBar( ) override; virtual void dispose() override; diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index d4578013cff8..92e0c3ec781b 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -30,6 +30,7 @@ #include <tools/datetime.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> +#include <utility> namespace xforms @@ -52,11 +53,11 @@ namespace xforms using namespace ::frm; U_NAMESPACE_USE - OXSDDataType::OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ) + OXSDDataType::OXSDDataType( OUString _aName, sal_Int16 _nTypeClass ) :OXSDDataType_PBase( m_aBHelper ) ,m_bIsBasic( true ) ,m_nTypeClass( _nTypeClass ) - ,m_sName( _rName ) + ,m_sName(std::move( _aName )) ,m_nWST( WhiteSpaceTreatment::Preserve ) ,m_bPatternMatcherDirty( true ) { diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index bed7f2d3aa3b..d640d566c83f 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -74,7 +74,7 @@ namespace xforms protected: // create basic data type - OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ); + OXSDDataType( OUString _aName, sal_Int16 _nTypeClass ); virtual ~OXSDDataType() override; public: diff --git a/forms/source/xforms/evaluationcontext.hxx b/forms/source/xforms/evaluationcontext.hxx index 145a1f2d25f0..e25c8524042c 100644 --- a/forms/source/xforms/evaluationcontext.hxx +++ b/forms/source/xforms/evaluationcontext.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/xforms/XModel.hpp> +#include <utility> namespace xforms { @@ -38,12 +39,12 @@ public: { } EvaluationContext( - const css::uno::Reference<css::xml::dom::XNode>& xContextNode, - const css::uno::Reference<css::xforms::XModel>& xModel, - const css::uno::Reference<css::container::XNameContainer>& xNamespaces ) - : mxContextNode( xContextNode ), - mxModel( xModel ), - mxNamespaces( xNamespaces ) + css::uno::Reference<css::xml::dom::XNode> xContextNode, + css::uno::Reference<css::xforms::XModel> xModel, + css::uno::Reference<css::container::XNameContainer> xNamespaces ) + : mxContextNode(std::move( xContextNode )), + mxModel(std::move( xModel )), + mxNamespaces(std::move( xNamespaces )) { } css::uno::Reference<css::xml::dom::XNode> mxContextNode; diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index ac80947aad27..42469336ccdc 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -39,6 +39,7 @@ #include "serialization.hxx" #include <memory> +#include <utility> class CSubmissionPut; class CSubmissionPost; @@ -114,9 +115,9 @@ public: UNKNOWN_ERROR }; - CSubmission(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment) + CSubmission(std::u16string_view aURL, css::uno::Reference< css::xml::dom::XDocumentFragment > aFragment) : m_aURLObj(aURL) - , m_aFragment(aFragment) + , m_aFragment(std::move(aFragment)) , m_xContext(::comphelper::getProcessComponentContext()) {} |