diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-07 14:56:48 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-10 07:44:37 +0100 |
commit | 37a4a250662cbfb394f02ad29edca53d898a05d7 (patch) | |
tree | 98d5a804d5e4e9c3d8b38cc996c928f3cbcc545b /chart2/source/model | |
parent | 20dbb652d8bff996ac417f1c2c0894277c52497c (diff) |
loplugin:finalclasses in chart2
Change-Id: I35afa226beb6fe4319313125c323d9f059837357
Reviewed-on: https://gerrit.libreoffice.org/44534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/model')
22 files changed, 44 insertions, 56 deletions
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 49e2e5f72c7b..ee45f584d7b9 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -60,7 +60,7 @@ typedef ::cppu::WeakImplHelper< DataSeries_Base; } -class DataSeries : +class DataSeries final : public MutexContainer, public impl::DataSeries_Base, public ::property::OPropertySet @@ -79,7 +79,7 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() -protected: +private: explicit DataSeries( const DataSeries & rOther ); // late initialization to call after copy-constructing @@ -150,7 +150,6 @@ protected: void fireModifyEvent(); -private: typedef std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; tDataSequenceContainer m_aDataSequences; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 12102cc1bbb4..e622cca202a3 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -55,7 +55,7 @@ typedef ::cppu::WeakImplHelper< Diagram_Base; } -class Diagram : +class Diagram final : public MutexContainer, public impl::Diagram_Base, public ::property::OPropertySet @@ -74,7 +74,7 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() -protected: +private: explicit Diagram( const Diagram & rOther ); // ____ OPropertySet ____ @@ -152,7 +152,6 @@ protected: void fireModifyEvent(); -private: css::uno::Reference< css::uno::XComponentContext > m_xContext; typedef diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 06ff1cc59f3f..ed3afcf20a99 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -40,7 +40,7 @@ typedef ::cppu::WeakImplHelper< StockBar_Base; } -class StockBar : +class StockBar final : public MutexContainer, public impl::StockBar_Base, public ::property::OPropertySet @@ -52,7 +52,7 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() -protected: +private: explicit StockBar( const StockBar & rOther ); // ____ OPropertySet ____ @@ -85,7 +85,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; -private: const bool m_bRisingCourse; css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index e82190e97532..942dd7d4c489 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -48,7 +48,7 @@ typedef ::cppu::WeakImplHelper< Axis_Base; } -class Axis : +class Axis final : public MutexContainer, public impl::Axis_Base, public ::property::OPropertySet @@ -67,7 +67,7 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() -protected: +private: explicit Axis( const Axis & rOther ); // late initialization to call after copy-constructing @@ -119,11 +119,8 @@ protected: void fireModifyEvent(); -private: //methods void AllocateSubGrids(); -private: //member - css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; css::chart2::ScaleData m_aScaleData; diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 22914a12018a..6236d210d6b8 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -44,7 +44,7 @@ typedef ::cppu::WeakImplHelper< DataPoint_Base; } -class DataPoint : +class DataPoint final : public MutexContainer, public impl::DataPoint_Base, public ::property::OPropertySet @@ -60,7 +60,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit DataPoint( const DataPoint & rOther ); // ____ OPropertySet ____ @@ -101,7 +101,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; -private: css::uno::WeakReference< css::beans::XPropertySet > m_xParentProperties; css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 64fd195ce7e2..16c73372ebcc 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper< FormattedString_Base; } -class FormattedString : +class FormattedString final : public MutexContainer, public impl::FormattedString_Base, public ::property::OPropertySet @@ -75,7 +75,7 @@ public: virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } -protected: +private: explicit FormattedString( const FormattedString & rOther ); // ____ XFormattedString ____ @@ -115,7 +115,6 @@ protected: void fireModifyEvent(); -private: OUString m_aString; css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 3ac0cf21b53b..090e37edc2df 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -44,7 +44,7 @@ typedef ::cppu::WeakImplHelper< GridProperties_Base; } -class GridProperties : +class GridProperties final : public MutexContainer, public impl::GridProperties_Base, public ::property::OPropertySet @@ -63,7 +63,7 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() -protected: +private: explicit GridProperties( const GridProperties & rOther ); // ____ OPropertySet ____ @@ -96,7 +96,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; -private: css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 19c2a4b72a8d..74eb63c856b2 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -45,7 +45,7 @@ typedef ::cppu::WeakImplHelper< Legend_Base; } -class Legend : +class Legend final : public MutexContainer, public impl::Legend_Base, public ::property::OPropertySet @@ -64,7 +64,7 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() -protected: +private: explicit Legend( const Legend & rOther ); // ____ OPropertySet ____ @@ -98,7 +98,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; -private: css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 98c9c8c3f99a..2863dedde35e 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -42,7 +42,7 @@ typedef ::cppu::WeakImplHelper< PageBackground_Base; } -class PageBackground : +class PageBackground final : public MutexContainer, public impl::PageBackground_Base, public ::property::OPropertySet @@ -59,7 +59,7 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() -protected: +private: explicit PageBackground( const PageBackground & rOther ); // ____ OPropertySet ____ @@ -93,7 +93,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; -private: css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 982cbe3a49d2..a402fb9f514a 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper< Title_Base; } -class Title : +class Title final : public MutexContainer, public impl::Title_Base, public ::property::OPropertySet @@ -62,7 +62,7 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() -protected: +private: explicit Title( const Title & rOther ); // ____ OPropertySet ____ @@ -102,7 +102,6 @@ protected: void fireModifyEvent(); -private: css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > m_aStrings; css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index b325aaca0db9..25bc245292a0 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -42,7 +42,7 @@ typedef ::cppu::WeakImplHelper< Wall_Base; } -class Wall : +class Wall final : public MutexContainer, public impl::Wall_Base, public ::property::OPropertySet @@ -54,7 +54,7 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() -protected: +private: explicit Wall( const Wall & rOther ); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 9cbc090f8e3f..8f3b67a2d6b6 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -24,7 +24,7 @@ namespace chart { -class AreaChartType : public ChartType +class AreaChartType final : public ChartType { public: explicit AreaChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -37,7 +37,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit AreaChartType( const AreaChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 0db8a8b7d5d5..8d04613ebc97 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -24,7 +24,7 @@ namespace chart { -class BarChartType : public ChartType +class BarChartType final : public ChartType { public: explicit BarChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -37,7 +37,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit BarChartType( const BarChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index c3248c0b1a4a..5fe58f3a15da 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -25,7 +25,7 @@ namespace chart { -class BubbleChartType : public ChartType +class BubbleChartType final : public ChartType { public: explicit BubbleChartType( @@ -39,7 +39,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit BubbleChartType( const BubbleChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 2e9ae89256f7..c153ad8a5892 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -24,7 +24,7 @@ namespace chart { -class CandleStickChartType : public ChartType +class CandleStickChartType final : public ChartType { public: explicit CandleStickChartType( @@ -38,7 +38,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit CandleStickChartType( const CandleStickChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 5f2aaea15b14..860c13ceb68a 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -24,7 +24,7 @@ namespace chart { -class ColumnChartType : public ChartType +class ColumnChartType final : public ChartType { public: explicit ColumnChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -37,7 +37,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit ColumnChartType( const ColumnChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 49fc980d1078..48109fb31bec 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -24,7 +24,7 @@ namespace chart { -class FilledNetChartType : public NetChartType_Base +class FilledNetChartType final : public NetChartType_Base { public: explicit FilledNetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -37,7 +37,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit FilledNetChartType( const FilledNetChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 75a156988507..3161285df271 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -18,7 +18,7 @@ namespace chart { * Chart type that represents 3 dimensional data content in 3D space using * OpenGL. */ -class GL3DBarChartType : public ChartType +class GL3DBarChartType final : public ChartType { public: explicit GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext ); @@ -33,7 +33,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: GL3DBarChartType( const GL3DBarChartType& rOther ); virtual OUString SAL_CALL getChartType() override; diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index d001b72bf424..18269668db70 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -25,7 +25,7 @@ namespace chart { -class LineChartType : public ChartType +class LineChartType final : public ChartType { public: explicit LineChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -38,7 +38,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit LineChartType( const LineChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 61a5d4fa184c..53e588751a99 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -47,7 +47,7 @@ protected: getPropertySetInfo() override; }; -class NetChartType : public NetChartType_Base +class NetChartType final : public NetChartType_Base { public: explicit NetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -60,7 +60,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit NetChartType( const NetChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 86509405b313..ad2da929aa6f 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -24,7 +24,7 @@ namespace chart { -class PieChartType : public ChartType +class PieChartType final: public ChartType { public: explicit PieChartType( @@ -38,7 +38,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit PieChartType( const PieChartType & rOther ); // ____ XChartType ____ diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index a09a840224ab..db4899f5534b 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -25,7 +25,7 @@ namespace chart { -class ScatterChartType : public ChartType +class ScatterChartType final : public ChartType { public: ScatterChartType( @@ -42,7 +42,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: explicit ScatterChartType( const ScatterChartType & rOther ); // ____ XChartType ____ |