chart2/source/controller/inc/CommandDispatchContainer.hxx | 2 chart2/source/controller/main/ChartController.cxx | 2 chart2/source/controller/main/CommandDispatchContainer.cxx | 4 - chart2/source/controller/sidebar/ChartAreaPanel.cxx | 2 chart2/source/controller/sidebar/ChartLinePanel.cxx | 2 chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx | 4 - chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx | 2 chart2/source/inc/InternalData.hxx | 8 +- chart2/source/tools/InternalData.cxx | 16 ++-- chart2/source/tools/InternalDataProvider.cxx | 40 +++++----- chart2/source/view/axes/VPolarAxis.cxx | 4 - chart2/source/view/axes/VPolarAxis.hxx | 2 chart2/source/view/axes/VPolarGrid.cxx | 4 - chart2/source/view/axes/VPolarGrid.hxx | 2 chart2/source/view/axes/VPolarRadiusAxis.cxx | 8 +- chart2/source/view/axes/VPolarRadiusAxis.hxx | 2 chart2/source/view/charttypes/PieChart.cxx | 4 - chart2/source/view/charttypes/PieChart.hxx | 2 chart2/source/view/charttypes/Splines.cxx | 20 ++--- chart2/source/view/inc/PlotterBase.hxx | 2 chart2/source/view/inc/PlottingPositionHelper.hxx | 4 - chart2/source/view/main/ChartView.cxx | 4 - chart2/source/view/main/PlotterBase.cxx | 4 - chart2/source/view/main/PlottingPositionHelper.cxx | 8 +- chart2/source/view/main/VLegend.cxx | 4 - chart2/source/view/main/VLegend.hxx | 2 dbaccess/source/core/api/FilteredContainer.cxx | 10 +- dbaccess/source/core/api/HelperCollections.hxx | 4 - dbaccess/source/core/api/KeySet.cxx | 2 dbaccess/source/core/api/PrivateRow.hxx | 2 dbaccess/source/core/api/RowSet.cxx | 10 +- dbaccess/source/core/api/RowSetBase.cxx | 4 - dbaccess/source/core/api/RowSetBase.hxx | 2 dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2 dbaccess/source/filter/hsqldb/columndef.cxx | 4 - dbaccess/source/filter/hsqldb/columndef.hxx | 2 dbaccess/source/filter/hsqldb/createparser.cxx | 2 dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 5 - dbaccess/source/ui/dlg/indexdialog.cxx | 2 dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 4 - dbaccess/source/ui/dlg/sqlmessage.cxx | 8 +- dbaccess/source/ui/inc/DExport.hxx | 2 dbaccess/source/ui/inc/HtmlReader.hxx | 2 dbaccess/source/ui/inc/RtfReader.hxx | 2 dbaccess/source/ui/inc/TableRowExchange.hxx | 2 dbaccess/source/ui/inc/WCopyTable.hxx | 2 dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2 dbaccess/source/ui/misc/DExport.cxx | 6 - dbaccess/source/ui/misc/HtmlReader.cxx | 4 - dbaccess/source/ui/misc/RtfReader.cxx | 4 - dbaccess/source/ui/misc/WCopyTable.cxx | 4 - dbaccess/source/ui/misc/WExtendPages.cxx | 4 - dbaccess/source/ui/tabledesign/TEditControl.cxx | 4 - dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 4 - dbaccess/source/ui/tabledesign/TableUndo.cxx | 4 - dbaccess/source/ui/tabledesign/TableUndo.hxx | 2 dbaccess/source/ui/uno/copytablewizard.cxx | 6 - 57 files changed, 137 insertions(+), 138 deletions(-)
New commits: commit ea014c324a9f5fff344c3fccdfcb0e5bcbe75d81 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sun Oct 10 20:38:09 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Oct 11 12:18:47 2021 +0200 loplugin:moveparam in chart2 Change-Id: I6a47abf80f0f45bbb55bc9e0fe817f3c3650aff3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123351 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx index 523b798c7893..1ed026597d73 100644 --- a/chart2/source/controller/inc/CommandDispatchContainer.hxx +++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx @@ -80,7 +80,7 @@ public: */ void setChartDispatch( const css::uno::Reference< css::frame::XDispatch >& rChartDispatch, - const o3tl::sorted_vector< OUString > & rChartCommands ); + o3tl::sorted_vector< OUString > && rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if implemented here. If the URL is not implemented here, it should be diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e8551ba211d9..3bd6a5946ddf 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -589,7 +589,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo // the dispatch container will return "this" for all commands returned by // impl_getAvailableCommands(). That means, for those commands dispatch() // is called here at the ChartController. - m_aDispatchContainer.setChartDispatch( pDispatch, impl_getAvailableCommands() ); + m_aDispatchContainer.setChartDispatch( pDispatch, o3tl::sorted_vector(impl_getAvailableCommands()) ); rtl::Reference<DrawCommandDispatch> pDrawDispatch = new DrawCommandDispatch( m_xCC, this ); pDrawDispatch->initialize(); diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index dee4c961358e..daea97d4c7bf 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -59,11 +59,11 @@ void CommandDispatchContainer::setModel( void CommandDispatchContainer::setChartDispatch( const Reference< frame::XDispatch >& rChartDispatch, - const o3tl::sorted_vector< OUString > & rChartCommands ) + o3tl::sorted_vector< OUString > && rChartCommands ) { OSL_ENSURE(rChartDispatch.is(),"Invalid fall back dispatcher!"); m_xChartDispatcher.set( rChartDispatch ); - m_aChartCommands = rChartCommands; + m_aChartCommands = std::move(rChartCommands); m_aToBeDisposedDispatches.push_back( m_xChartDispatcher ); } diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 0378f7bbda6f..c12ece6699b5 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -283,7 +283,7 @@ ChartAreaPanel::ChartAreaPanel(weld::Widget* pParent, std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_DATA_POINT, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND}; - mxSelectionListener->setAcceptedTypes(aAcceptedTypes); + mxSelectionListener->setAcceptedTypes(std::move(aAcceptedTypes)); Initialize(); } diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 1de557ec5aba..f50581a3e04f 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -137,7 +137,7 @@ ChartLinePanel::ChartLinePanel(weld::Widget* pParent, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_DATA_POINT, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE, OBJECTTYPE_AXIS}; - mxSelectionListener->setAcceptedTypes(aAcceptedTypes); + mxSelectionListener->setAcceptedTypes(std::move(aAcceptedTypes)); Initialize(); } diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx index 0c8018eb09c3..c3757a3b877a 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx @@ -74,9 +74,9 @@ void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rE mpParent = nullptr; } -void ChartSidebarSelectionListener::setAcceptedTypes(const std::vector<ObjectType>& aTypes) +void ChartSidebarSelectionListener::setAcceptedTypes(std::vector<ObjectType>&& aTypes) { - maTypes = aTypes; + maTypes = std::move(aTypes); } } diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index 44bae13651e1..e8cea5003fa0 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -40,7 +40,7 @@ public: virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override; - void setAcceptedTypes(const std::vector<ObjectType>& aTypes); + void setAcceptedTypes(std::vector<ObjectType>&& aTypes); private: ChartSidebarSelectionListenerParent* mpParent; diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index c7407d17fb11..9d9abeb3a7c0 100644 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -42,8 +42,8 @@ public: void setColumnValues( sal_Int32 nColumnIndex, const std::vector< double > & rNewData ); void setRowValues( sal_Int32 nRowIndex, const std::vector< double > & rNewData ); - void setComplexColumnLabel( sal_Int32 nColumnIndex, const std::vector< css::uno::Any >& rComplexLabel ); - void setComplexRowLabel( sal_Int32 nRowIndex, const std::vector< css::uno::Any >& rComplexLabel ); + void setComplexColumnLabel( sal_Int32 nColumnIndex, std::vector< css::uno::Any >&& rComplexLabel ); + void setComplexRowLabel( sal_Int32 nRowIndex, std::vector< css::uno::Any >&& rComplexLabel ); std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const; @@ -66,9 +66,9 @@ public: typedef std::vector< std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level - void setComplexRowLabels( const tVecVecAny& rNewRowLabels ); + void setComplexRowLabels( tVecVecAny&& rNewRowLabels ); const tVecVecAny& getComplexRowLabels() const; - void setComplexColumnLabels( const tVecVecAny& rNewColumnLabels ); + void setComplexColumnLabels( tVecVecAny&& rNewColumnLabels ); const tVecVecAny& getComplexColumnLabels() const; void dump() const; diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 1f5bcddc6c82..b93dbe33ae88 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -194,7 +194,7 @@ void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & r m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice; } -void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< uno::Any >& rComplexLabel ) +void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, vector< uno::Any >&& rComplexLabel ) { if( nColumnIndex < 0 ) return; @@ -203,12 +203,12 @@ void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< m_aColumnLabels.resize(nColumnIndex+1); enlargeData( nColumnIndex+1, 0 ); } - m_aColumnLabels[nColumnIndex]=rComplexLabel; + m_aColumnLabels[nColumnIndex] = std::move(rComplexLabel); dump(); } -void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, const vector< uno::Any >& rComplexLabel ) +void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, vector< uno::Any >&& rComplexLabel ) { if( nRowIndex < 0 ) return; @@ -225,7 +225,7 @@ void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, const vector< uno::A } else { - m_aRowLabels[nRowIndex] = rComplexLabel; + m_aRowLabels[nRowIndex] = std::move(rComplexLabel); } } @@ -468,9 +468,9 @@ void InternalData::deleteRow( sal_Int32 nAtIndex ) dump(); } -void InternalData::setComplexRowLabels( const tVecVecAny& rNewRowLabels ) +void InternalData::setComplexRowLabels( tVecVecAny&& rNewRowLabels ) { - m_aRowLabels = rNewRowLabels; + m_aRowLabels = std::move(rNewRowLabels); sal_Int32 nNewRowCount = static_cast< sal_Int32 >( m_aRowLabels.size() ); if( nNewRowCount < m_nRowCount ) m_aRowLabels.resize( m_nRowCount ); @@ -483,9 +483,9 @@ const InternalData::tVecVecAny& InternalData::getComplexRowLabels() const return m_aRowLabels; } -void InternalData::setComplexColumnLabels( const tVecVecAny& rNewColumnLabels ) +void InternalData::setComplexColumnLabels( tVecVecAny&& rNewColumnLabels ) { - m_aColumnLabels = rNewColumnLabels; + m_aColumnLabels = std::move(rNewColumnLabels); sal_Int32 nNewColumnCount = static_cast< sal_Int32 >( m_aColumnLabels.size() ); if( nNewColumnCount < m_nColumnCount ) m_aColumnLabels.resize( m_nColumnCount ); diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index abbcc077e1c0..ccbf8697c638 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -374,9 +374,9 @@ InternalDataProvider::InternalDataProvider( } if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabels( aNewCategories ); + m_aInternalData.setComplexRowLabels( std::move(aNewCategories) ); else - m_aInternalData.setComplexColumnLabels( aNewCategories ); + m_aInternalData.setComplexColumnLabels( std::move(aNewCategories) ); if( bConnectToModel ) DiagramHelper::setCategoriesToDiagram( new LabeledDataSequence( createDataSequenceByRangeRepresentation( lcl_aCategoriesRangeName )), xDiagram ); @@ -633,7 +633,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, st } std::vector<uno::Any> aLabels(1, bStoreNumeric ? uno::Any(fValue) : uno::Any(aRawElems[i])); - m_aInternalData.setComplexRowLabel(i, aLabels); + m_aInternalData.setComplexRowLabel(i, std::move(aLabels)); } xSeq.set(new UncachedDataSequence(this, lcl_aCategoriesRangeName)); @@ -647,7 +647,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, st if (!aRawElems.empty() && nColSize) { std::vector<uno::Any> aLabels(1, uno::Any(aRawElems[0])); - m_aInternalData.setComplexColumnLabel(nColSize-1, aLabels); + m_aInternalData.setComplexColumnLabel(nColSize-1, std::move(aLabels)); OUString aRangeRep = lcl_aLabelRangePrefix + OUString::number(nColSize-1); xSeq.set(new UncachedDataSequence(this, aRangeRep)); @@ -956,17 +956,17 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( { sal_uInt32 nIndex = aRange.copy( strlen(lcl_aLabelRangePrefix)).toInt32(); if( m_bDataInColumns ) - m_aInternalData.setComplexColumnLabel( nIndex, aNewVector ); + m_aInternalData.setComplexColumnLabel( nIndex, std::move(aNewVector) ); else - m_aInternalData.setComplexRowLabel( nIndex, aNewVector ); + m_aInternalData.setComplexRowLabel( nIndex, std::move(aNewVector) ); } else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) ) { sal_Int32 nPointIndex = aRange.copy( strlen(lcl_aCategoriesLevelRangeNamePrefix)).toInt32(); if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabel( nPointIndex, aNewVector ); + m_aInternalData.setComplexRowLabel( nPointIndex, std::move(aNewVector) ); else - m_aInternalData.setComplexColumnLabel( nPointIndex, aNewVector ); + m_aInternalData.setComplexColumnLabel( nPointIndex, std::move(aNewVector) ); } else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) ) { @@ -983,9 +983,9 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( aComplexCategories.begin(), lcl_setAnyAtLevel(nLevel) ); if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabels( aComplexCategories ); + m_aInternalData.setComplexRowLabels( std::move(aComplexCategories) ); else - m_aInternalData.setComplexColumnLabels( aComplexCategories ); + m_aInternalData.setComplexColumnLabels( std::move(aComplexCategories) ); } else if( aRange == lcl_aCategoriesRangeName ) { @@ -994,9 +994,9 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( transform( aComplexCategories.begin(), aComplexCategories.end(), aNewVector.begin(), aComplexCategories.begin(), lcl_setAnyAtLevel(0) ); if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabels( aComplexCategories ); + m_aInternalData.setComplexRowLabels( std::move(aComplexCategories) ); else - m_aInternalData.setComplexColumnLabels( aComplexCategories ); + m_aInternalData.setComplexColumnLabels( std::move(aComplexCategories) ); } else { @@ -1060,9 +1060,9 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels(); std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) ); if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabels( aComplexCategories ); + m_aInternalData.setComplexRowLabels( std::move(aComplexCategories) ); else - m_aInternalData.setComplexColumnLabels( aComplexCategories ); + m_aInternalData.setComplexColumnLabels( std::move(aComplexCategories) ); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); std::for_each( aRange.first, aRange.second, lcl_setModified()); @@ -1076,9 +1076,9 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels(); std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) ); if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabels( aComplexCategories ); + m_aInternalData.setComplexRowLabels( std::move(aComplexCategories) ); else - m_aInternalData.setComplexColumnLabels( aComplexCategories ); + m_aInternalData.setComplexColumnLabels( std::move(aComplexCategories) ); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); std::for_each( aRange.first, aRange.second, lcl_setModified()); @@ -1402,9 +1402,9 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& } if( m_bDataInColumns ) - m_aInternalData.setComplexRowLabels( aNewCategories ); + m_aInternalData.setComplexRowLabels( std::move(aNewCategories) ); else - m_aInternalData.setComplexColumnLabels( aNewCategories ); + m_aInternalData.setComplexColumnLabels( std::move(aNewCategories) ); } // ____ XAnyDescriptionAccess ____ @@ -1459,7 +1459,7 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(), aComplexDescriptions.begin(), lcl_setAnyAtLevelFromStringSequence(0) ); - m_aInternalData.setComplexRowLabels( aComplexDescriptions ); + m_aInternalData.setComplexRowLabels( std::move(aComplexDescriptions) ); } void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions ) @@ -1467,7 +1467,7 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(), aComplexDescriptions.begin(), lcl_setAnyAtLevelFromStringSequence(0) ); - m_aInternalData.setComplexColumnLabels( aComplexDescriptions ); + m_aInternalData.setComplexColumnLabels( std::move(aComplexDescriptions) ); } Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index a12055aa5017..d9dfe08ec6f5 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -49,9 +49,9 @@ VPolarAxis::~VPolarAxis() { } -void VPolarAxis::setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ) +void VPolarAxis::setIncrements( std::vector< ExplicitIncrementData >&& rIncrements ) { - m_aIncrements = rIncrements; + m_aIncrements = std::move(rIncrements); } bool VPolarAxis::isAnythingToDraw() diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index f169f810d804..42e22ae7dfe9 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -33,7 +33,7 @@ public: , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount ); - void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); + void setIncrements( std::vector< ExplicitIncrementData >&& rIncrements ); virtual bool isAnythingToDraw() override; diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 9233fd1d6472..b6a0fef73b8f 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -50,9 +50,9 @@ VPolarGrid::~VPolarGrid() { } -void VPolarGrid::setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ) +void VPolarGrid::setIncrements( std::vector< ExplicitIncrementData >&& rIncrements ) { - m_aIncrements = rIncrements; + m_aIncrements = std::move(rIncrements); } void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 7b39aeadcad2..304cdfe34b87 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -42,7 +42,7 @@ public: virtual void createShapes() override; - void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); + void setIncrements( std::vector< ExplicitIncrementData >&& rIncrements ); static void createLinePointSequence_ForAngleAxis( css::drawing::PointSequenceSequence& rPoints diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 08f30252fc91..0c3e2aaa4d80 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -71,10 +71,10 @@ void VPolarRadiusAxis::initPlotter( const uno::Reference< drawing::XShapes >& x m_apAxisWithLabels->initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); } -void VPolarRadiusAxis::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) +void VPolarRadiusAxis::setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) { - VPolarAxis::setScales( rScales, bSwapXAndYAxis ); - m_apAxisWithLabels->setScales( rScales, bSwapXAndYAxis ); + VPolarAxis::setScales( std::vector(rScales), bSwapXAndYAxis ); + m_apAxisWithLabels->setScales( std::move(rScales), bSwapXAndYAxis ); } void VPolarRadiusAxis::initAxisLabelProperties( const css::awt::Size& rFontReferenceSize @@ -154,7 +154,7 @@ void VPolarRadiusAxis::createShapes() aAxis.setExplicitScaleAndIncrement( m_aScale, m_aIncrement ); aAxis.initPlotter(m_xLogicTarget,m_xFinalTarget,m_xShapeFactory, m_aCID ); aAxis.setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix( m_aMatrixScreenToScene ) ); - aAxis.setScales( m_pPosHelper->getScales(), false ); + aAxis.setScales( std::vector(m_pPosHelper->getScales()), false ); aAxis.initAxisLabelProperties(m_aAxisLabelProperties.m_aFontReferenceSize,m_aAxisLabelProperties.m_aMaximumSpaceForLabels); aAxis.createShapes(); } diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index d0f7b5867c47..3d69154cee07 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -43,7 +43,7 @@ public: virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override; - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; + virtual void setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) override; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 37d0426b4734..4c9dc95634bb 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -229,10 +229,10 @@ PieChart::~PieChart() { } -void PieChart::setScales( const std::vector< ExplicitScaleData >& rScales, bool /* bSwapXAndYAxis */ ) +void PieChart::setScales( std::vector< ExplicitScaleData >&& rScales, bool /* bSwapXAndYAxis */ ) { OSL_ENSURE(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence"); - m_pPosHelper->setScales( rScales, true ); + m_pPosHelper->setScales( std::move(rScales), true ); } drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index d4dd0255af6a..a7bb35827f77 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -44,7 +44,7 @@ public: virtual void createShapes() override; virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ) override; - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; + virtual void setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) override; virtual void addSeries( std::unique_ptr<VDataSeries> pSeries, sal_Int32 zSlot, sal_Int32 xSlot, sal_Int32 ySlot ) override; virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 521b559776ee..f431abdf21b7 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -52,7 +52,7 @@ public: derivation equal to this value at the x-value of the last point of rSortedPoints */ - lcl_SplineCalculation( const tPointVecType & rSortedPoints, + lcl_SplineCalculation( tPointVecType && rSortedPoints, double fY1FirstDerivation, double fYnFirstDerivation ); @@ -62,7 +62,7 @@ public: @param rSortedPoints the points for which splines shall be calculated, they need to be sorted in x values. First and last y value must be equal */ - explicit lcl_SplineCalculation( const tPointVecType & rSortedPoints); + explicit lcl_SplineCalculation( tPointVecType && rSortedPoints); /** @descr this function corresponds to the function splint in [1]. @@ -113,10 +113,10 @@ private: }; lcl_SplineCalculation::lcl_SplineCalculation( - const tPointVecType & rSortedPoints, + tPointVecType && rSortedPoints, double fY1FirstDerivation, double fYnFirstDerivation ) - : m_aPoints( rSortedPoints ), + : m_aPoints( std::move(rSortedPoints) ), m_fYp1( fY1FirstDerivation ), m_fYpN( fYnFirstDerivation ), m_nKLow( 0 ), @@ -127,8 +127,8 @@ lcl_SplineCalculation::lcl_SplineCalculation( } lcl_SplineCalculation::lcl_SplineCalculation( - const tPointVecType & rSortedPoints) - : m_aPoints( rSortedPoints ), + tPointVecType && rSortedPoints) + : m_aPoints( std::move(rSortedPoints) ), m_fYp1( 0.0 ), /*dummy*/ m_fYpN( 0.0 ), /*dummy*/ m_nKLow( 0 ), @@ -593,16 +593,16 @@ void SplineCalculater::CalculateCubicSplines( pOldZ[ 0 ] == pOldZ[nMaxIndexPoints] && nMaxIndexPoints >=2 ) { // periodic spline - aSplineX.reset(new lcl_SplineCalculation( aInputX)); - aSplineY.reset(new lcl_SplineCalculation( aInputY)); + aSplineX.reset(new lcl_SplineCalculation( std::move(aInputX))); + aSplineY.reset(new lcl_SplineCalculation( std::move(aInputY))); // aSplineZ = new lcl_SplineCalculation( aInputZ) ; } else // generate the kind "natural spline" { double fXDerivation = std::numeric_limits<double>::infinity(); double fYDerivation = std::numeric_limits<double>::infinity(); - aSplineX.reset(new lcl_SplineCalculation( aInputX, fXDerivation, fXDerivation )); - aSplineY.reset(new lcl_SplineCalculation( aInputY, fYDerivation, fYDerivation )); + aSplineX.reset(new lcl_SplineCalculation( std::move(aInputX), fXDerivation, fXDerivation )); + aSplineY.reset(new lcl_SplineCalculation( std::move(aInputY), fYDerivation, fYDerivation )); } // fill result polygon with calculated values diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index e14413652f04..187f755f5318 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -53,7 +53,7 @@ public: , const OUString& rCID ); - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ); virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ); diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index d687cb902453..30f1bc9a75c2 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -54,7 +54,7 @@ public: virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix); - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ); const std::vector< ExplicitScaleData >& getScales() const { return m_aScales;} //better performance for big data @@ -149,7 +149,7 @@ public: virtual std::unique_ptr<PlottingPositionHelper> clone() const override; virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix) override; - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; + virtual void setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) override; const ::basegfx::B3DHomMatrix& getUnitCartesianToScene() const { return m_aUnitCartesianToScene;} diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 6c150f3e0abf..72a58f80cc97 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2218,14 +2218,14 @@ bool lcl_createLegend( const uno::Reference< XLegend > & xLegend , awt::Rectangle & rRemainingSpace , const awt::Size & rPageSize , ChartModel& rModel - , const std::vector< LegendEntryProvider* >& rLegendEntryProviderList + , std::vector< LegendEntryProvider* >&& rLegendEntryProviderList , sal_Int16 nDefaultWritingMode ) { if (!VLegend::isVisible(xLegend)) return false; awt::Size rDefaultLegendSize; - VLegend aVLegend( xLegend, xContext, rLegendEntryProviderList, + VLegend aVLegend( xLegend, xContext, std::move(rLegendEntryProviderList), xPageShapes, xShapeFactory, rModel); aVLegend.setDefaultWritingMode( nDefaultWritingMode ); aVLegend.createShapes( awt::Size( rRemainingSpace.Width, rRemainingSpace.Height ), diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index b3311b023cbf..7cf5515fd6bf 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -52,13 +52,13 @@ PlotterBase::~PlotterBase() { } -void PlotterBase::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) +void PlotterBase::setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) { if (!m_pPosHelper) return; OSL_PRECOND(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence"); - m_pPosHelper->setScales( rScales, bSwapXAndYAxis ); + m_pPosHelper->setScales( std::move(rScales), bSwapXAndYAxis ); } void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix) diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index ae499fa82fb9..300ecaddb68b 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -93,9 +93,9 @@ void PlottingPositionHelper::setTransformationSceneToScreen( const drawing::Homo m_xTransformationLogicToScene = nullptr; } -void PlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) +void PlottingPositionHelper::setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) { - m_aScales = rScales; + m_aScales = std::move(rScales); m_bSwapXAndY = bSwapXAndYAxis; m_xTransformationLogicToScene = nullptr; } @@ -340,9 +340,9 @@ void PolarPlottingPositionHelper::setTransformationSceneToScreen( const drawing: PlottingPositionHelper::setTransformationSceneToScreen( rMatrix); m_aUnitCartesianToScene =impl_calculateMatrixUnitCartesianToScene( m_aMatrixScreenToScene ); } -void PolarPlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) +void PolarPlottingPositionHelper::setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis ) { - PlottingPositionHelper::setScales( rScales, bSwapXAndYAxis ); + PlottingPositionHelper::setScales( std::move(rScales), bSwapXAndYAxis ); m_aUnitCartesianToScene =impl_calculateMatrixUnitCartesianToScene( m_aMatrixScreenToScene ); } diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 1cc1303241a0..1f2ef6625c99 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -878,7 +878,7 @@ std::vector<std::shared_ptr<VButton>> lcl_createButtons( VLegend::VLegend( const Reference< XLegend > & xLegend, const Reference< uno::XComponentContext > & xContext, - const std::vector< LegendEntryProvider* >& rLegendEntryProviderList, + std::vector< LegendEntryProvider* >&& rLegendEntryProviderList, const Reference< drawing::XShapes >& xTargetPage, const Reference< lang::XMultiServiceFactory >& xFactory, ChartModel& rModel ) @@ -887,7 +887,7 @@ VLegend::VLegend( , m_xLegend(xLegend) , mrModel(rModel) , m_xContext(xContext) - , m_aLegendEntryProviderList(rLegendEntryProviderList) + , m_aLegendEntryProviderList(std::move(rLegendEntryProviderList)) , m_nDefaultWritingMode(text::WritingMode2::LR_TB) { } diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index ff13d83305fa..c037b38cdefc 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -41,7 +41,7 @@ class VLegend public: VLegend( const css::uno::Reference< css::chart2::XLegend > & xLegend, const css::uno::Reference< css::uno::XComponentContext > & xContext, - const std::vector< LegendEntryProvider* >& rLegendEntryProviderList, + std::vector< LegendEntryProvider* >&& rLegendEntryProviderList, const css::uno::Reference< css::drawing::XShapes >& xTargetPage, const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory, ChartModel& rModel ); commit c7f8a54e05dab430cf2f5b3e1fa90e729c7a5601 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Oct 11 10:45:50 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Oct 11 12:18:34 2021 +0200 loplugin:moveparam in dbaccess Change-Id: Iff4c5069d25dddd58d61b2a09a57a112854144da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123370 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 4d4d367838a1..2e383596f12f 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -168,7 +168,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: _io_tableInfo.sType = OptionalString( sTypeName ); } - static ::std::vector< OUString> lcl_filter( const TableInfos& _unfilteredTables, + static ::std::vector< OUString> lcl_filter( TableInfos&& _unfilteredTables, const Sequence< OUString >& _tableFilter, const Sequence< OUString >& _tableTypeFilter, const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer ) { @@ -179,7 +179,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) && _tableFilter[0] == "%" ); if( dontFilterTableNames ) { - aFilteredTables = _unfilteredTables; + aFilteredTables = std::move(_unfilteredTables); } else { @@ -189,7 +189,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: Sequence< OUString > aNonWildCardTableFilter = _tableFilter; nTableFilterCount = createWildCardVector( aNonWildCardTableFilter, aWildCardTableFilter ); - TableInfos aUnfilteredTables( _unfilteredTables ); + TableInfos aUnfilteredTables( std::move(_unfilteredTables) ); aUnfilteredTables.reserve( nTableFilterCount + ( aWildCardTableFilter.size() * 10 ) ); for (auto & unfilteredTable : aUnfilteredTables) @@ -277,7 +277,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: for ( ; name != nameEnd; ++name ) aUnfilteredTables.emplace_back( *name ); - reFill( lcl_filter( aUnfilteredTables, + reFill( lcl_filter( std::move(aUnfilteredTables), _rTableFilter, _rTableTypeFilter, m_xMetaData, m_xMasterContainer ) ); m_bConstructed = true; @@ -359,7 +359,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: aUnfilteredTables.emplace_back( sCatalog, sSchema, sName, sType ); } - reFill( lcl_filter( aUnfilteredTables, + reFill( lcl_filter( std::move(aUnfilteredTables), _rTableFilter, aTableTypeFilter, m_xMetaData, nullptr ) ); disposeComponent( xTables ); diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 18cf9d15ef93..ed89fc643054 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -87,9 +87,9 @@ namespace dbaccess bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const std::vector< OUString> &_rVector + std::vector< OUString> && _rVector ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) - ,m_aTables(_rTables) + ,m_aTables(std::move(_rTables)) { } virtual void disposing() override diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 8999ded1e3c7..ffca2cb08662 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -782,7 +782,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch) } if ( !bRefetch ) { - m_aKeyIter->second.second.second = new OPrivateRow(*_rInsertRow); + m_aKeyIter->second.second.second = new OPrivateRow(std::vector(*_rInsertRow)); } } diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx index a9bf9e70e0ea..c5ce74f15f43 100644 --- a/dbaccess/source/core/api/PrivateRow.hxx +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -29,7 +29,7 @@ namespace dbaccess ORowSetValueVector::Vector m_aRow; sal_Int32 m_nPos; public: - explicit OPrivateRow(const ORowSetValueVector::Vector& i_aRow) : m_aRow(i_aRow),m_nPos(0) + explicit OPrivateRow(ORowSetValueVector::Vector&& i_aRow) : m_aRow(std::move(i_aRow)),m_nPos(0) { } virtual sal_Bool SAL_CALL wasNull( ) override; diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 6a5af36e205e..4e66304cd367 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -661,7 +661,7 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x) checkUpdateIterator(); ORowSetValueVector::Vector& rRow = **m_aCurrentRow; - ORowSetNotifier aNotify(this,rRow); + ORowSetNotifier aNotify(this, std::vector(rRow)); m_pCache->updateValue(columnIndex,x,rRow,aNotify.getChangedColumns()); m_bModified = m_bModified || !aNotify.getChangedColumns().empty(); aNotify.firePropertyChange(); @@ -677,7 +677,7 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) checkUpdateIterator(); ORowSetValueVector::Vector& rRow = **m_aCurrentRow; - ORowSetNotifier aNotify(this,rRow); + ORowSetNotifier aNotify(this, std::vector(rRow)); m_pCache->updateNull(columnIndex,rRow,aNotify.getChangedColumns()); m_bModified = m_bModified || !aNotify.getChangedColumns().empty(); aNotify.firePropertyChange(); @@ -765,7 +765,7 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer checkUpdateConditions(columnIndex); checkUpdateIterator(); ORowSetValueVector::Vector& rRow = **m_aCurrentRow; - ORowSetNotifier aNotify(this,rRow); + ORowSetNotifier aNotify(this, std::vector(rRow)); m_pCache->updateCharacterStream(columnIndex,x,length,rRow,aNotify.getChangedColumns()); m_bModified = m_bModified || !aNotify.getChangedColumns().empty(); aNotify.firePropertyChange(); @@ -809,7 +809,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) if (!::dbtools::implUpdateObject(this, columnIndex, aNewValue)) { // there is no other updateXXX call which can handle the value in x ORowSetValueVector::Vector& rRow = **m_aCurrentRow; - ORowSetNotifier aNotify(this,rRow); + ORowSetNotifier aNotify(this, std::vector(rRow)); m_pCache->updateObject(columnIndex,aNewValue,rRow,aNotify.getChangedColumns()); m_bModified = m_bModified || !aNotify.getChangedColumns().empty(); aNotify.firePropertyChange(); @@ -823,7 +823,7 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, checkUpdateConditions(columnIndex); checkUpdateIterator(); ORowSetValueVector::Vector& rRow = **m_aCurrentRow; - ORowSetNotifier aNotify(this,rRow); + ORowSetNotifier aNotify(this, std::vector(rRow)); m_pCache->updateNumericObject(columnIndex,x,rRow,aNotify.getChangedColumns()); m_bModified = m_bModified || !aNotify.getChangedColumns().empty(); aNotify.firePropertyChange(); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 4eabb3eb0bee..d1feea15ae59 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -1382,7 +1382,7 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet ) m_pRowSet->doCancelModification( ORowSetBase::GrantNotifierAccess() ); } -ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector::Vector& i_aRow ) +ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet, ORowSetValueVector::Vector&& i_aRow ) :m_pImpl(new ORowSetNotifierImpl) ,m_pRowSet( _pRowSet ) ,m_bWasNew( false ) @@ -1390,7 +1390,7 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector { OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This will crash." ); - m_pImpl->aRow = i_aRow; // yes, create a copy to store the old values + m_pImpl->aRow = std::move(i_aRow); // yes, create a copy to store the old values } ORowSetNotifier::~ORowSetNotifier( ) diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 58087a85bb14..f5443a2afcad 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -367,7 +367,7 @@ namespace dbaccess /** use this one to construct a vector for change value notification */ - ORowSetNotifier( ORowSetBase* m_pRowSet,const ORowSetValueVector::Vector& i_aRow ); + ORowSetNotifier( ORowSetBase* m_pRowSet, ORowSetValueVector::Vector&& i_aRow ); // destructs the object. <member>fire</member> has to be called before. ~ORowSetNotifier( ); diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 38ff97293a99..31455e055727 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -717,7 +717,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) for (auto const& elem : aTables) aNames.push_back(elem.first); - m_pTables.reset( new OPrivateTables(aTables,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames) ); + m_pTables.reset( new OPrivateTables(aTables,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,std::move(aNames)) ); } return m_pTables.get(); diff --git a/dbaccess/source/filter/hsqldb/columndef.cxx b/dbaccess/source/filter/hsqldb/columndef.cxx index 62bd7b541bf1..5a7b741089e2 100644 --- a/dbaccess/source/filter/hsqldb/columndef.cxx +++ b/dbaccess/source/filter/hsqldb/columndef.cxx @@ -26,12 +26,12 @@ namespace dbahsql using namespace css::sdbc; ColumnDefinition::ColumnDefinition(const OUString& sName, sal_Int32 eType, - const std::vector<sal_Int32>& aParams, bool bPrimary, + std::vector<sal_Int32>&& aParams, bool bPrimary, sal_Int32 nAutoIncr, bool bNullable, bool bCaseInsensitive, const OUString& sDefault) : m_sName(sName) , m_eType(eType) - , m_aParams(aParams) + , m_aParams(std::move(aParams)) , m_bPrimaryKey(bPrimary) , m_nAutoIncrement(nAutoIncr) , m_bNullable(bNullable) diff --git a/dbaccess/source/filter/hsqldb/columndef.hxx b/dbaccess/source/filter/hsqldb/columndef.hxx index faad744c554e..5ffa18ba574b 100644 --- a/dbaccess/source/filter/hsqldb/columndef.hxx +++ b/dbaccess/source/filter/hsqldb/columndef.hxx @@ -28,7 +28,7 @@ private: OUString m_sDefaultValue; public: - ColumnDefinition(const OUString& sName, sal_Int32 eType, const std::vector<sal_Int32>& aParams, + ColumnDefinition(const OUString& sName, sal_Int32 eType, std::vector<sal_Int32>&& aParams, bool bPrimary = false, sal_Int32 nAutoIncr = -1, bool bNullable = true, bool bCaseInsensitive = false, const OUString& sDefault = OUString{}); diff --git a/dbaccess/source/filter/hsqldb/createparser.cxx b/dbaccess/source/filter/hsqldb/createparser.cxx index 9aad116535fb..de1213945151 100644 --- a/dbaccess/source/filter/hsqldb/createparser.cxx +++ b/dbaccess/source/filter/hsqldb/createparser.cxx @@ -256,7 +256,7 @@ void CreateStmtParser::parseColumnPart(const OUString& sColumnPart) const OUString sColumnWithoutName = sColumn.copy(sColumn.indexOf(typeParts.typeName)); ColumnDefinition aColDef(rColumnName, lcl_getDataTypeFromHsql(typeParts.typeName), - typeParts.params, isPrimaryKey, + std::move(typeParts.params), isPrimaryKey, lcl_getAutoIncrementDefault(sColumnWithoutName), lcl_isNullable(sColumnWithoutName), bCaseInsensitive, lcl_getDefaultValue(sColumnWithoutName)); diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx index 5ded17936c38..cfbef28a2b11 100644 --- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx +++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx @@ -90,9 +90,8 @@ OUString lcl_double_dabble(const std::vector<sal_uInt8>& bytes) RTL_TEXTENCODING_UTF8); } -OUString lcl_makeStringFromBigint(const std::vector<sal_uInt8>& bytes) +OUString lcl_makeStringFromBigint(std::vector<sal_uInt8>&& aBytes) { - std::vector<sal_uInt8> aBytes{ bytes }; OUStringBuffer sRet; // two's complement @@ -311,7 +310,7 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const std::vector<ColumnDefiniti m_pStream->ReadInt32(nScale); Sequence<Any> result(2); - OUString sNum = lcl_makeStringFromBigint(aBytes); + OUString sNum = lcl_makeStringFromBigint(std::move(aBytes)); result[0] <<= lcl_putDot(sNum, nScale); result[1] <<= nScale; aData.push_back(makeAny(result)); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index dfa9bf355187..cbe866cf5be4 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -641,7 +641,7 @@ namespace dbaui m_xUnique->set_sensitive(!aSelectedIndex->bPrimaryKey); m_xUnique->save_state(); - m_xFields->initializeFrom(aSelectedIndex->aFields); + m_xFields->initializeFrom(std::vector(aSelectedIndex->aFields)); m_xFields->Enable(!aSelectedIndex->bPrimaryKey); m_xFields->SaveValue(); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 88cf056dbfc7..3770fb737e1a 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -137,10 +137,10 @@ constexpr auto BROWSER_STANDARD_FLAGS = BrowserMode::COLUMNSELECTION | BrowserMo _rDev.SetClipRegion(); } - void IndexFieldsControl::initializeFrom(const IndexFields& _rFields) + void IndexFieldsControl::initializeFrom(IndexFields&& _rFields) { // copy the field descriptions - m_aFields = _rFields; + m_aFields = std::move(_rFields); m_aSeekRow = m_aFields.end(); SetUpdateMode(false); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index f5610156c6a5..eacc5908328d 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -266,7 +266,7 @@ class OExceptionChainDialog : public weld::GenericDialogController ExceptionDisplayChain m_aExceptions; public: - OExceptionChainDialog(weld::Window* pParent, const ExceptionDisplayChain& rExceptions); + OExceptionChainDialog(weld::Window* pParent, ExceptionDisplayChain&& rExceptions); protected: DECL_LINK(OnExceptionSelected, weld::TreeView&, void); @@ -274,11 +274,11 @@ protected: } -OExceptionChainDialog::OExceptionChainDialog(weld::Window* pParent, const ExceptionDisplayChain& rExceptions) +OExceptionChainDialog::OExceptionChainDialog(weld::Window* pParent, ExceptionDisplayChain&& rExceptions) : GenericDialogController(pParent, "dbaccess/ui/sqlexception.ui", "SQLExceptionDialog") , m_xExceptionList(m_xBuilder->weld_tree_view("list")) , m_xExceptionText(m_xBuilder->weld_text_view("description")) - , m_aExceptions(rExceptions) + , m_aExceptions(std::move(rExceptions)) { int nListWidth = m_xExceptionText->get_approximate_digit_width() * 28; int nTextWidth = m_xExceptionText->get_approximate_digit_width() * 42; @@ -581,7 +581,7 @@ OSQLMessageBox::~OSQLMessageBox() IMPL_LINK_NOARG(OSQLMessageBox, ButtonClickHdl, weld::Button&, void) { - OExceptionChainDialog aDlg(m_xDialog.get(), m_pImpl->aDisplayInfo); + OExceptionChainDialog aDlg(m_xDialog.get(), std::vector(m_pImpl->aDisplayInfo)); aDlg.run(); } diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 3e2804a654e0..ab7c85811778 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -137,7 +137,7 @@ namespace dbaui // required for automatic type recognition ODatabaseExport( sal_Int32 nRows, - const TPositions& _rColumnPositions, + TPositions&& _rColumnPositions, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 3c1fa88d2d60..5c4ddde13f4e 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -54,7 +54,7 @@ namespace dbaui // required for automatic type recognition OHTMLReader(SvStream& rIn, sal_Int32 nRows, - const TPositions &_rColumnPositions, + TPositions&& _rColumnPositions, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 0bda00b2f5fa..58f6aa26ba2b 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -45,7 +45,7 @@ namespace dbaui // required for automatic type recognition ORTFReader( SvStream& rIn, sal_Int32 nRows, - const TPositions &_rColumnPositions, + TPositions&& _rColumnPositions, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 729862721d44..36e249795137 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -28,7 +28,7 @@ namespace dbaui { std::vector< std::shared_ptr<OTableRow> > m_vTableRow; public: - OTableRowExchange(const std::vector< std::shared_ptr<OTableRow> >& _rvTableRow); + OTableRowExchange(std::vector< std::shared_ptr<OTableRow> >&& _rvTableRow); protected: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 1d650d7a6171..936acfc80c96 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -311,7 +311,7 @@ namespace dbaui weld::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, - const ODatabaseExport::TColumns& _rDestColumns, + ODatabaseExport::TColumns&& _rDestColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::util::XNumberFormatter >& _xFormatter, diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index a973d4c1b495..90ae7172e3df 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -54,7 +54,7 @@ namespace dbaui void Init(const css::uno::Sequence< OUString >& _rAvailableFields, bool _bAddIndexAppendix); - void initializeFrom(const IndexFields& _rFields); + void initializeFrom(IndexFields&& _rFields); void commitTo(IndexFields& _rFields); bool SaveModified() override; diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index adab71f29d8f..e899af729f2f 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -69,14 +69,14 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper // ODatabaseExport ODatabaseExport::ODatabaseExport(sal_Int32 nRows, - const TPositions &_rColumnPositions, + TPositions&&_rColumnPositions, const Reference< XNumberFormatter >& _rxNumberF, const Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled, SvStream& _rInputStream) - :m_vColumnPositions(_rColumnPositions) + :m_vColumnPositions(std::move(_rColumnPositions)) ,m_aDestColumns(true) ,m_xFormatter(_rxNumberF) ,m_xContext(_rxContext) @@ -667,7 +667,7 @@ bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTe nullptr, sTableName, bHaveDefaultTable ? CopyTableOperation::AppendData : CopyTableOperation::CopyDefinitionAndData, - m_aDestColumns, + ODatabaseExport::TColumns(m_aDestColumns), m_vDestVector, m_xConnection, m_xFormatter, diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 6e3d329e3ef2..56eade49356d 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -64,14 +64,14 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, OHTMLReader::OHTMLReader(SvStream& rIn, sal_Int32 nRows, - const TPositions &_rColumnPositions, + TPositions&& _rColumnPositions, const Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled) : HTMLParser(rIn) - , ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) + , ODatabaseExport( nRows, std::move(_rColumnPositions), _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) , m_nTableCount(0) , m_nColumnWidth(87) { diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 1a247ca88b06..8895d494f817 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -57,14 +57,14 @@ ORTFReader::ORTFReader( SvStream& rIn, ORTFReader::ORTFReader(SvStream& rIn, sal_Int32 nRows, - const TPositions &_rColumnPositions, + TPositions&& _rColumnPositions, const Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled) :SvRTFParser(rIn) - ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) + ,ODatabaseExport( nRows, std::move(_rColumnPositions), _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) { m_bAppendFirstLine = false; } diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 56341d35f4f1..b72e16180727 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -583,11 +583,11 @@ weld::Container* OCopyTableWizard::CreatePageContainer() } OCopyTableWizard::OCopyTableWizard( weld::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, - const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, + ODatabaseExport::TColumns&& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XComponentContext >& _rxContext ) : vcl::RoadmapWizardMachine(pParent) - , m_vSourceColumns(_rSourceColumns) + , m_vSourceColumns(std::move(_rSourceColumns)) , m_mNameMapping(_xConnection->getMetaData().is() && _xConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()) , m_xDestConnection( _xConnection ) , m_rSourceObject( DummyCopySource::Instance() ) diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index f34661cabd7d..c7eac9181e00 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -31,7 +31,7 @@ void OWizHTMLExtend::createReaderAndCallParser(sal_Int32 _nRows) { tools::SvRef<OHTMLReader> xParser = new OHTMLReader(*m_pParserStream, _nRows, - m_pParent->GetColumnPositions(), + std::vector(m_pParent->GetColumnPositions()), m_pParent->GetFormatter(), m_pParent->GetComponentContext(), &m_pParent->getDestVector(), @@ -44,7 +44,7 @@ void OWizRTFExtend::createReaderAndCallParser(sal_Int32 _nRows) { tools::SvRef<ORTFReader> xParser = new ORTFReader(*m_pParserStream, _nRows, - m_pParent->GetColumnPositions(), + std::vector(m_pParent->GetColumnPositions()), m_pParent->GetFormatter(), m_pParent->GetComponentContext(), &m_pParent->getDestVector(), diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 010ce0878c50..728b21cf55d6 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -734,7 +734,7 @@ void OTableEditorCtrl::CopyRows() } if(!vClipboardList.empty()) { - rtl::Reference<OTableRowExchange> pData = new OTableRowExchange(vClipboardList); + rtl::Reference<OTableRowExchange> pData = new OTableRowExchange(std::move(vClipboardList)); pData->CopyToClipboard(GetParent()); } } @@ -806,7 +806,7 @@ void OTableEditorCtrl::InsertRows( sal_Int32 nRow ) RowInserted( nRow,vInsertedUndoRedoRows.size() ); // Create the Undo-Action - GetUndoManager().AddUndoAction( std::make_unique<OTableEditorInsUndoAct>(this, nRow,vInsertedUndoRedoRows) ); + GetUndoManager().AddUndoAction( std::make_unique<OTableEditorInsUndoAct>(this, nRow, std::move(vInsertedUndoRedoRows)) ); GetView()->getController().setModified( true ); InvalidateFeatures(); } diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 916b8112f7c5..2728fbdfbe61 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -28,8 +28,8 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - OTableRowExchange::OTableRowExchange(const std::vector< std::shared_ptr<OTableRow> >& _rvTableRow) - : m_vTableRow(_rvTableRow) + OTableRowExchange::OTableRowExchange(std::vector< std::shared_ptr<OTableRow> >&& _rvTableRow) + : m_vTableRow(std::move(_rvTableRow)) { } bool OTableRowExchange::WriteObject( tools::SvRef<SotTempStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& /*rFlavor*/ ) diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index 4ef28032795e..d60756a2e697 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -213,9 +213,9 @@ void OTableEditorDelUndoAct::Redo() OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, tools::Long nInsertPosition , - const std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows) + std::vector< std::shared_ptr<OTableRow> >&& _vInsertedRows) :OTableEditorUndoAct( pOwner,STR_TABED_UNDO_ROWINSERTED ) - ,m_vInsertedRows(_vInsertedRows) + ,m_vInsertedRows(std::move(_vInsertedRows)) ,m_nInsPos( nInsertPosition ) { } diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 2bd25f9d6447..5ad23b84fb0f 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -103,7 +103,7 @@ namespace dbaui public: OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, tools::Long nInsertPosition, - const std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows); + std::vector< std::shared_ptr<OTableRow> >&& _vInsertedRows); virtual ~OTableEditorInsUndoAct() override; }; diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index a33d0607de83..40443652705b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -942,11 +942,11 @@ namespace class ValueTransfer { public: - ValueTransfer( const sal_Int32& _rSourcePos, const sal_Int32& _rDestPos, const std::vector< sal_Int32 >& _rColTypes, + ValueTransfer( const sal_Int32& _rSourcePos, const sal_Int32& _rDestPos, std::vector< sal_Int32 >&& _rColTypes, const Reference< XRow >& _rxSource, const Reference< XParameters >& _rxDest ) :m_rSourcePos( _rSourcePos ) ,m_rDestPos( _rDestPos ) - ,m_rColTypes( _rColTypes ) + ,m_rColTypes( std::move(_rColTypes) ) ,m_xSource( _rxSource ) ,m_xDest( _rxDest ) { @@ -1144,7 +1144,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou sal_Int32 nDestColumn( 0 ); sal_Int32 nSourceColumn( 1 ); - ValueTransfer aTransfer( nSourceColumn, nDestColumn, aSourceColTypes, xRow, xStatementParams ); + ValueTransfer aTransfer( nSourceColumn, nDestColumn, std::vector(aSourceColTypes), xRow, xStatementParams ); for ( auto const& rColumnPos : aColumnPositions ) {