diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-08-18 12:27:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-18 14:24:11 +0100 |
commit | 4630157e29f565c110f4fa11223a2d2358508c26 (patch) | |
tree | f27b9b6e953ec3ae433172229a596ab0bdc9d934 /chart2 | |
parent | 8a6eb111609fbb1e0270ef5ba475b027635c9749 (diff) |
cppcheck: passedByValue
Change-Id: I3ffcfe1294a1cbb06aadd3a1a79e9259876e38cc
Diffstat (limited to 'chart2')
38 files changed, 134 insertions, 131 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 4cc40be87108..2a408c54e0d6 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -74,9 +74,9 @@ namespace chart namespace wrapper { -AreaWrapper::AreaWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : - m_spChart2ModelContact( spChart2ModelContact ), - m_aEventListenerContainer( m_aMutex ) +AreaWrapper::AreaWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : m_spChart2ModelContact(spChart2ModelContact) + , m_aEventListenerContainer(m_aMutex) { } diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 1f983f4ac4ea..a45e8f063c1a 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -47,7 +47,7 @@ class AreaWrapper : public ::cppu::ImplInheritanceHelper< > { public: - explicit AreaWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit AreaWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~AreaWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 177c7d9ec682..288e22488987 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -401,7 +401,7 @@ namespace wrapper { AxisWrapper::AxisWrapper( - tAxisType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : + tAxisType eType, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : m_spChart2ModelContact( spChart2ModelContact ), m_aEventListenerContainer( m_aMutex ), m_eType( eType ) diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 2ba3dc0b2457..e1b945047a63 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -61,7 +61,7 @@ public: SECOND_Y_AXIS }; - AxisWrapper( tAxisType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + AxisWrapper(tAxisType eType, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~AxisWrapper(); static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 5d5bfa56a447..ae403bbe9854 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -383,16 +383,16 @@ struct lcl_DateCategoriesOperator : public lcl_Operator const Sequence< double >& m_rDates; }; -ChartDataWrapper::ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : - m_spChart2ModelContact( spChart2ModelContact ), - m_aEventListenerContainer( m_aMutex ) +ChartDataWrapper::ChartDataWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : m_spChart2ModelContact(spChart2ModelContact) + , m_aEventListenerContainer(m_aMutex) { osl_atomic_increment( &m_refCount ); initDataAccess(); osl_atomic_decrement( &m_refCount ); } -ChartDataWrapper::ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, +ChartDataWrapper::ChartDataWrapper( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, const Reference< XChartData >& xNewData ) : m_spChart2ModelContact( spChart2ModelContact ), m_aEventListenerContainer( m_aMutex ) diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index f83eee2fc1ad..cf51e8e77eb5 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -48,8 +48,8 @@ class ChartDataWrapper : public MutexContainer, public css::lang::XComponent > { public: - explicit ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); - ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact + explicit ChartDataWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); + ChartDataWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact , const css::uno::Reference< css::chart::XChartData >& xNewData ); virtual ~ChartDataWrapper(); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index b0749d6846f9..738b49a5c84d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -271,7 +271,7 @@ namespace wrapper class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty { public: - explicit WrappedDataSourceLabelsInFirstRowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedDataSourceLabelsInFirstRowProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -288,7 +288,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("DataSourceLabelsInFirstRow",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -369,7 +369,7 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty { public: - explicit WrappedDataSourceLabelsInFirstColumnProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedDataSourceLabelsInFirstColumnProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -386,7 +386,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("DataSourceLabelsInFirstColumn",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -467,7 +467,7 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe class WrappedHasLegendProperty : public WrappedProperty { public: - explicit WrappedHasLegendProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedHasLegendProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -483,9 +483,9 @@ private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; }; -WrappedHasLegendProperty::WrappedHasLegendProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : WrappedProperty("HasLegend",OUString()) - , m_spChart2ModelContact( spChart2ModelContact ) +WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : WrappedProperty("HasLegend",OUString()) + , m_spChart2ModelContact( spChart2ModelContact ) { } @@ -551,7 +551,7 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope class WrappedHasMainTitleProperty : public WrappedProperty { public: - explicit WrappedHasMainTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedHasMainTitleProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -567,9 +567,9 @@ private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; }; -WrappedHasMainTitleProperty::WrappedHasMainTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : WrappedProperty("HasMainTitle",OUString()) - , m_spChart2ModelContact( spChart2ModelContact ) +WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : WrappedProperty("HasMainTitle",OUString()) + , m_spChart2ModelContact( spChart2ModelContact ) { } @@ -624,7 +624,7 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr class WrappedHasSubTitleProperty : public WrappedProperty { public: - explicit WrappedHasSubTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedHasSubTitleProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -640,7 +640,7 @@ private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; }; -WrappedHasSubTitleProperty::WrappedHasSubTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("HasSubTitle",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 72b4e9a54d48..04cb257c589a 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -258,7 +258,7 @@ struct StaticPointWrapperPropertyArray : public rtl::StaticAggregate< Sequence< class WrappedAttachedAxisProperty : public ::chart::WrappedProperty { public: - explicit WrappedAttachedAxisProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedAttachedAxisProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedAttachedAxisProperty(); virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -275,7 +275,7 @@ protected: }; WrappedAttachedAxisProperty::WrappedAttachedAxisProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedProperty("Axis",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) { @@ -489,15 +489,14 @@ namespace chart namespace wrapper { -DataSeriesPointWrapper::DataSeriesPointWrapper( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : m_spChart2ModelContact( spChart2ModelContact ) - , m_aEventListenerContainer( m_aMutex ) - , m_eType( DATA_SERIES ) - , m_nSeriesIndexInNewAPI( -1 ) - , m_nPointIndex( -1 ) - , m_bLinesAllowed(true) - , m_xDataSeries(nullptr) +DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : m_spChart2ModelContact( spChart2ModelContact ) + , m_aEventListenerContainer( m_aMutex ) + , m_eType( DATA_SERIES ) + , m_nSeriesIndexInNewAPI( -1 ) + , m_nPointIndex( -1 ) + , m_bLinesAllowed(true) + , m_xDataSeries(nullptr) { //need initialize call afterwards } @@ -528,10 +527,10 @@ void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any m_eType = DATA_SERIES; } -DataSeriesPointWrapper::DataSeriesPointWrapper( eType _eType, - sal_Int32 nSeriesIndexInNewAPI , - sal_Int32 nPointIndex, //ignored for series - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +DataSeriesPointWrapper::DataSeriesPointWrapper(eType _eType, + sal_Int32 nSeriesIndexInNewAPI , + sal_Int32 nPointIndex, //ignored for series + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : m_spChart2ModelContact( spChart2ModelContact ) , m_aEventListenerContainer( m_aMutex ) , m_eType( _eType ) diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 8ee2734c4f34..3755aeb93209 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -60,12 +60,12 @@ public: }; //this constructor needs an initialize call afterwards - explicit DataSeriesPointWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit DataSeriesPointWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - DataSeriesPointWrapper( eType eType + DataSeriesPointWrapper(eType eType , sal_Int32 nSeriesIndexInNewAPI , sal_Int32 nPointIndex //ignored for series - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~DataSeriesPointWrapper(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2258949076af..0292a9f8c840 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -625,10 +625,9 @@ namespace chart namespace wrapper { -DiagramWrapper::DiagramWrapper( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : - m_spChart2ModelContact( spChart2ModelContact ), - m_aEventListenerContainer( m_aMutex ) +DiagramWrapper::DiagramWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : m_spChart2ModelContact(spChart2ModelContact) + , m_aEventListenerContainer(m_aMutex) { } @@ -1198,7 +1197,7 @@ void SAL_CALL DiagramWrapper::removeEventListener( class WrappedDataRowSourceProperty : public WrappedProperty { public: - explicit WrappedDataRowSourceProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedDataRowSourceProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1215,7 +1214,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedDataRowSourceProperty::WrappedDataRowSourceProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("DataRowSource",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -1300,7 +1299,7 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP class WrappedStackingProperty : public WrappedProperty { public: - WrappedStackingProperty( StackMode eStackMode, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedStackingProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1321,7 +1320,7 @@ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; mutable Any m_aOuterValue; }; -WrappedStackingProperty::WrappedStackingProperty( StackMode eStackMode, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedStackingProperty::WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty(OUString(),OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_eStackMode( eStackMode ) @@ -1410,7 +1409,7 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper class WrappedDim3DProperty : public WrappedProperty { public: - explicit WrappedDim3DProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedDim3DProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1427,7 +1426,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedDim3DProperty::WrappedDim3DProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("Dim3D",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -1481,7 +1480,7 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS class WrappedVerticalProperty : public WrappedProperty { public: - explicit WrappedVerticalProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedVerticalProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1498,7 +1497,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedVerticalProperty::WrappedVerticalProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("Vertical",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -1557,7 +1556,7 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper class WrappedNumberOfLinesProperty : public WrappedProperty { public: - explicit WrappedNumberOfLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedNumberOfLinesProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1577,7 +1576,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("NumberOfLines",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue( this->getPropertyDefault(nullptr) ) @@ -1711,7 +1710,7 @@ Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XP class WrappedAttributedDataPointsProperty : public WrappedProperty { public: - explicit WrappedAttributedDataPointsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedAttributedDataPointsProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1728,7 +1727,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("AttributedDataPoints",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -1825,7 +1824,7 @@ Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< be class WrappedSolidTypeProperty : public WrappedProperty { public: - explicit WrappedSolidTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedSolidTypeProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1842,7 +1841,7 @@ private: //member mutable Any m_aOuterValue; }; -WrappedSolidTypeProperty::WrappedSolidTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty( "SolidType", OUString() ) , m_spChart2ModelContact( spChart2ModelContact ) , m_aOuterValue() @@ -1970,7 +1969,7 @@ Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XP class WrappedIncludeHiddenCellsProperty : public WrappedProperty { public: - explicit WrappedIncludeHiddenCellsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedIncludeHiddenCellsProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -1982,7 +1981,7 @@ private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; }; -WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("IncludeHiddenCells","IncludeHiddenCells") , m_spChart2ModelContact( spChart2ModelContact ) { diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index fb8d1d495fd8..50aaa820dc87 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -71,7 +71,7 @@ class DiagramWrapper : public cppu::ImplInheritanceHelper< > { public: - explicit DiagramWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit DiagramWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~DiagramWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 3865cfad8915..cb6bc2102bcb 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -76,11 +76,10 @@ namespace chart namespace wrapper { -GridWrapper::GridWrapper( - tGridType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : - m_spChart2ModelContact( spChart2ModelContact ), - m_aEventListenerContainer( m_aMutex ), - m_eType( eType ) +GridWrapper::GridWrapper(tGridType eType, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : m_spChart2ModelContact(spChart2ModelContact) + , m_aEventListenerContainer(m_aMutex) + , m_eType(eType) { } diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index c8dcc1c7b9fa..a00b4eef5081 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -55,7 +55,7 @@ public: Z_MINOR_GRID }; - GridWrapper( tGridType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + GridWrapper(tGridType eType, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~GridWrapper(); static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid ); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 696f6005d3fa..c40e141cd3c1 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -273,9 +273,9 @@ namespace chart namespace wrapper { -LegendWrapper::LegendWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : - m_spChart2ModelContact( spChart2ModelContact ), - m_aEventListenerContainer( m_aMutex ) +LegendWrapper::LegendWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) + : m_spChart2ModelContact(spChart2ModelContact) + , m_aEventListenerContainer(m_aMutex) { } diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index a6e40188d2bf..fcc5c26b4cfe 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -50,7 +50,7 @@ class LegendWrapper : public ::cppu::ImplInheritanceHelper< , public ReferenceSizePropertyProvider { public: - explicit LegendWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit LegendWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~LegendWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index c047939ca672..a4f006075705 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -123,7 +123,7 @@ namespace chart namespace wrapper { -MinMaxLineWrapper::MinMaxLineWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +MinMaxLineWrapper::MinMaxLineWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : m_spChart2ModelContact( spChart2ModelContact ) , m_aEventListenerContainer( m_aMutex ) , m_aWrappedLineJointProperty( "LineJoint", uno::makeAny( drawing::LineJoint_NONE )) diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 26760be4ce9c..cde6a36aef05 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -55,7 +55,7 @@ class MinMaxLineWrapper : public MutexContainer > { public: - explicit MinMaxLineWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit MinMaxLineWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~MinMaxLineWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 532291e9d763..83630540e093 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -198,7 +198,7 @@ namespace wrapper { TitleWrapper::TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType, - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : m_spChart2ModelContact( spChart2ModelContact ), m_aEventListenerContainer( m_aMutex ), m_eTitleType(eTitleType) diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 6ca38c41a3d3..207633613d38 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -49,7 +49,7 @@ class TitleWrapper : public ::cppu::ImplInheritanceHelper< { public: TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType, - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~TitleWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 1e87a550d0ec..d0feec2d8077 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -126,7 +126,7 @@ namespace wrapper { UpDownBarWrapper::UpDownBarWrapper( - bool bUp, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + bool bUp, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : m_spChart2ModelContact( spChart2ModelContact ) , m_aEventListenerContainer( m_aMutex ) , m_aPropertySetName( bUp ? OUString( "WhiteDay" ) : OUString( "BlackDay" )) diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 01e5dda969ef..78b529de3c65 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -54,7 +54,7 @@ class UpDownBarWrapper : public MutexContainer > { public: - UpDownBarWrapper( bool bUp, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + UpDownBarWrapper(bool bUp, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~UpDownBarWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index b52ca66b71da..66d485599f1a 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -80,7 +80,7 @@ namespace wrapper { WallFloorWrapper::WallFloorWrapper( bool bWall, - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : m_spChart2ModelContact( spChart2ModelContact ), m_aEventListenerContainer( m_aMutex ), m_bWall( bWall ) diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index e3c96ccf5d3a..bc0053314232 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -44,7 +44,7 @@ class WallFloorWrapper : public ::cppu::ImplInheritanceHelper< > { public: - WallFloorWrapper( bool bWall, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + WallFloorWrapper(bool bWall, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WallFloorWrapper(); /// XServiceInfo declarations diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index e1a75c626f78..3221928b24e6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -36,7 +36,7 @@ class WrappedAxisAndGridExistenceProperty : public WrappedProperty { public: WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedAxisAndGridExistenceProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -74,7 +74,7 @@ void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< W } WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedProperty(OUString(),OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_bAxis( bAxis ) @@ -203,7 +203,7 @@ class WrappedAxisTitleExistenceProperty : public WrappedProperty { public: WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedAxisTitleExistenceProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -230,8 +230,8 @@ void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< Wra rList.push_back( new WrappedAxisTitleExistenceProperty( 4, spChart2ModelContact ) );//secondary y axis title } -WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty(sal_Int32 nTitleIndex + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty(OUString(),OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_eTitleType( TitleHelper::Y_AXIS_TITLE ) @@ -317,7 +317,7 @@ class WrappedAxisLabelExistenceProperty : public WrappedProperty { public: WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedAxisLabelExistenceProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -345,8 +345,8 @@ void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< Wra rList.push_back( new WrappedAxisLabelExistenceProperty( false, 1, spChart2ModelContact ) );//secondary y axis } -WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain, sal_Int32 nDimensionIndex + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty(OUString(),OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_bMain( bMain ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index d1dd79ee28e5..76bb1b9c7f1b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -42,8 +42,8 @@ public: virtual sal_Int32 getValueFromSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override; - explicit WrappedDataCaptionProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, - tSeriesOrDiagramPropertyType ePropertyType ); + explicit WrappedDataCaptionProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, + tSeriesOrDiagramPropertyType ePropertyType ); virtual ~WrappedDataCaptionProperty(); }; @@ -122,7 +122,7 @@ void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< } WrappedDataCaptionProperty::WrappedDataCaptionProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< sal_Int32 >( "DataCaption" , uno::makeAny( sal_Int32(0) ), spChart2ModelContact, ePropertyType ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 14ff874da7d9..68d9681345e9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -38,7 +38,7 @@ WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base( const OUString& rOuterName , const OUString& rInnerSequencePropertyName , sal_Int32 nDefaultValue - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedDefaultProperty( rOuterName, OUString(), uno::makeAny( nDefaultValue ) ) , m_nDimensionIndex(0) , m_nAxisIndex(0) @@ -153,7 +153,7 @@ Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::X } WrappedGapwidthProperty::WrappedGapwidthProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedBarPositionProperty_Base( "GapWidth", "GapwidthSequence", DEFAULT_GAPWIDTH, spChart2ModelContact ) { } @@ -162,7 +162,7 @@ WrappedGapwidthProperty::~WrappedGapwidthProperty() } WrappedBarOverlapProperty::WrappedBarOverlapProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedBarPositionProperty_Base( "Overlap", "OverlapSequence", DEFAULT_OVERLAP, spChart2ModelContact ) { } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 378bb63f3391..1dbb851fc15e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -36,7 +36,7 @@ public: const OUString& rOuterName , const OUString& rInnerSequencePropertyName , sal_Int32 nDefaultValue - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -61,14 +61,14 @@ protected: class WrappedGapwidthProperty : public WrappedBarPositionProperty_Base { public: - explicit WrappedGapwidthProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedGapwidthProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedGapwidthProperty(); }; class WrappedBarOverlapProperty : public WrappedBarPositionProperty_Base { public: - explicit WrappedBarOverlapProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedBarOverlapProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedBarOverlapProperty(); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 058ed68d600f..966dead7aad7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -31,7 +31,7 @@ namespace chart namespace wrapper { -WrappedNumberFormatProperty::WrappedNumberFormatProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedNumberFormatProperty::WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedDirectStateProperty( CHART_UNONAME_NUMFMT, CHART_UNONAME_NUMFMT ) , m_spChart2ModelContact(spChart2ModelContact) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index c578b21a4296..0afe20340950 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -34,7 +34,7 @@ class WrappedLinkNumberFormatProperty; class WrappedNumberFormatProperty : public WrappedDirectStateProperty { public: - explicit WrappedNumberFormatProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedNumberFormatProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 54ee48c4324a..2be350b47a0f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -37,8 +37,8 @@ namespace chart namespace wrapper { -WrappedScaleProperty::WrappedScaleProperty( tScaleProperty eScaleProperty - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedScaleProperty::WrappedScaleProperty(tScaleProperty eScaleProperty + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty(OUString(),OUString()) , m_spChart2ModelContact( spChart2ModelContact ) , m_eScaleProperty( eScaleProperty ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index fdab48a17c41..50a5bf152077 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -54,7 +54,7 @@ public: }; public: - WrappedScaleProperty( tScaleProperty eScaleProperty, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + WrappedScaleProperty(tScaleProperty eScaleProperty, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedScaleProperty(); static void addWrappedProperties( std::vector< WrappedProperty* >& rList, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 3ad490c98f48..b0ba7db13477 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -36,7 +36,7 @@ namespace wrapper class WrappedScaleTextProperty : public WrappedProperty { public: - explicit WrappedScaleTextProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedScaleTextProperty(); virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const @@ -50,7 +50,7 @@ private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; }; -WrappedScaleTextProperty::WrappedScaleTextProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : ::chart::WrappedProperty( "ScaleText" , OUString() ) , m_spChart2ModelContact( spChart2ModelContact ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 099139a7e1dc..ce85f0f42d8b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -39,7 +39,7 @@ void WrappedSceneProperty::addWrappedProperties( std::vector< WrappedProperty* > } WrappedD3DTransformMatrixProperty::WrappedD3DTransformMatrixProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedProperty("D3DTransformMatrix","D3DTransformMatrix") , m_spChart2ModelContact( spChart2ModelContact ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index e2c9c9bced23..07fb66c705ad 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -41,7 +41,7 @@ class WrappedD3DTransformMatrixProperty : public WrappedProperty { public: explicit WrappedD3DTransformMatrixProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedD3DTransformMatrixProperty(); virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index c159dfd12d1f..924a93aca384 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -49,7 +49,7 @@ public: virtual void setValueToSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet, const PROPERTYTYPE & aNewValue ) const =0; explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const css::uno::Any& rDefaulValue - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedProperty(rName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index f8b1dba6cc2d..3ac9209f4cca 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -44,7 +44,7 @@ class WrappedSplineProperty : public WrappedProperty public: explicit WrappedSplineProperty( const OUString& rOuterName, const OUString& rInnerName , const css::uno::Any& rDefaulValue - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedProperty(rOuterName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) , m_aOuterValue(rDefaulValue) @@ -161,7 +161,7 @@ protected: class WrappedSplineTypeProperty : public WrappedSplineProperty< sal_Int32 > { public: - explicit WrappedSplineTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedSplineTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedSplineTypeProperty(); virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; @@ -219,13 +219,15 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty uno::makeAny(sal_Int32(20)), spChart2ModelContact)); } -WrappedSplineTypeProperty::WrappedSplineTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedSplineTypeProperty::WrappedSplineTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedSplineProperty<sal_Int32>(CHART_UNONAME_SPLINE_TYPE, CHART_UNONAME_CURVE_STYLE, uno::makeAny(sal_Int32(0)), spChart2ModelContact ) { } + WrappedSplineTypeProperty::~WrappedSplineTypeProperty() { } + Any WrappedSplineTypeProperty::convertInnerToOuterValue( const Any& rInnerValue ) const { chart2::CurveStyle aInnerValue = chart2::CurveStyle_LINES; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index c04dc360b320..5178bfbaf859 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -40,7 +40,7 @@ class WrappedStockProperty : public WrappedProperty public: explicit WrappedStockProperty( const OUString& rOuterName , const css::uno::Any& rDefaulValue - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedStockProperty(); void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -59,7 +59,7 @@ protected: WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName , const css::uno::Any& rDefaulValue - , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) : WrappedProperty(rOuterName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) , m_aOuterValue() @@ -116,7 +116,7 @@ css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Referenc class WrappedVolumeProperty : public WrappedStockProperty { public: - explicit WrappedVolumeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedVolumeProperty(); css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -125,10 +125,11 @@ public: uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; -WrappedVolumeProperty::WrappedVolumeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) +WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedStockProperty( "Volume", uno::makeAny(false) , spChart2ModelContact ) { } + WrappedVolumeProperty::~WrappedVolumeProperty() { } @@ -187,7 +188,7 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla class WrappedUpDownProperty : public WrappedStockProperty { public: - explicit WrappedUpDownProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); + explicit WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedUpDownProperty(); css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const @@ -195,13 +196,16 @@ public: uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; -WrappedUpDownProperty::WrappedUpDownProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) + +WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedStockProperty( "UpDown", uno::makeAny(false) , spChart2ModelContact ) { } + WrappedUpDownProperty::~WrappedUpDownProperty() { } + css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 4ecc8ef7c7b5..1945efa38daf 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -60,8 +60,8 @@ public: virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const throw (beans::UnknownPropertyException, uno::RuntimeException) override; - explicit WrappedSymbolTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, - tSeriesOrDiagramPropertyType ePropertyType ); + explicit WrappedSymbolTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, + tSeriesOrDiagramPropertyType ePropertyType); virtual ~WrappedSymbolTypeProperty(); }; @@ -71,8 +71,8 @@ public: virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewGraphicURL ) const override; - explicit WrappedSymbolBitmapURLProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, - tSeriesOrDiagramPropertyType ePropertyType ); + explicit WrappedSymbolBitmapURLProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, + tSeriesOrDiagramPropertyType ePropertyType); virtual ~WrappedSymbolBitmapURLProperty(); }; @@ -84,8 +84,8 @@ public: virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const throw (beans::UnknownPropertyException, uno::RuntimeException) override; - explicit WrappedSymbolSizeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, - tSeriesOrDiagramPropertyType ePropertyType ); + explicit WrappedSymbolSizeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, + tSeriesOrDiagramPropertyType ePropertyType); virtual ~WrappedSymbolSizeProperty(); }; @@ -97,8 +97,8 @@ public: virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const throw (beans::UnknownPropertyException, uno::RuntimeException) override; - explicit WrappedSymbolAndLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, - tSeriesOrDiagramPropertyType ePropertyType ); + explicit WrappedSymbolAndLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, + tSeriesOrDiagramPropertyType ePropertyType); virtual ~WrappedSymbolAndLinesProperty(); }; @@ -214,7 +214,7 @@ void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< Wrapp } WrappedSymbolTypeProperty::WrappedSymbolTypeProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< sal_Int32 >( "SymbolType" , uno::makeAny( css::chart::ChartSymbolType::NONE ) @@ -300,7 +300,7 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc } WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< OUString >( "SymbolBitmapURL" , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType ) @@ -428,7 +428,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol ) }//end anonymous namespace WrappedSymbolSizeProperty::WrappedSymbolSizeProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< awt::Size >( "SymbolSize" , uno::makeAny( awt::Size(250,250) ), spChart2ModelContact, ePropertyType ) @@ -490,7 +490,7 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc } WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty( - std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< bool >( "Lines" , uno::makeAny( true ), spChart2ModelContact, ePropertyType ) |