diff options
-rw-r--r-- | reportdesign/inc/PropertyForward.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/PropertyForward.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index 4f467c2a0fe0..8a9a058a0500 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -59,7 +59,7 @@ namespace rptui public: OPropertyMediator(const css::uno::Reference< css::beans::XPropertySet>& _xSource ,const css::uno::Reference< css::beans::XPropertySet>& _xDest - ,const TPropertyNamePair& _aNameMap + ,TPropertyNamePair&& _aNameMap ,bool _bReverse = false); // css::beans::XPropertyChangeListener diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 0450e2d342ba..394edfc12f43 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -30,10 +30,10 @@ namespace rptui OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,const Reference< XPropertySet>& _xDest - ,const TPropertyNamePair& _aNameMap + ,TPropertyNamePair&& _aNameMap ,bool _bReverse) : OPropertyForward_Base(m_aMutex) - ,m_aNameMap(_aNameMap) + ,m_aNameMap(std::move(_aNameMap)) ,m_xSource(_xSource) ,m_xDest(_xDest) ,m_bInChange(false) diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index cdcb355e7729..75ba20f61479 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -875,7 +875,7 @@ void OUnoObject::CreateMediator(bool _bReverse) m_xMediator = new OPropertyMediator( m_xReportComponent, xControlModel, - getPropertyNameMap(GetObjIdentifier()), + TPropertyNamePair(getPropertyNameMap(GetObjIdentifier())), _bReverse); } } diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index f4c8abd97497..a6c1214704a7 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -132,7 +132,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface aPropertyMediation.emplace( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ); aPropertyMediation.emplace( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ); - m_xMasterDetails = new OPropertyMediator( m_xDataProvider, m_xReportComponent, aPropertyMediation,true ); + m_xMasterDetails = new OPropertyMediator( m_xDataProvider, m_xReportComponent, std::move(aPropertyMediation), true ); } } catch(const uno::Exception &) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 0adc915ea055..886e3390adf6 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2976,7 +2976,7 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() aPropertyMediation.emplace( PROPERTY_ESCAPEPROCESSING, TPropertyConverter(PROPERTY_ESCAPEPROCESSING,aNoConverter) ); aPropertyMediation.emplace( PROPERTY_FILTER, TPropertyConverter(PROPERTY_FILTER,aNoConverter) ); - m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition, xRowSetProp, aPropertyMediation ); + m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition, xRowSetProp, std::move(aPropertyMediation) ); m_xRowSet = xRowSet; } catch(const uno::Exception&) |