diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-07 20:24:27 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2016-04-08 17:40:14 +0000 |
commit | 25934decf8bfd94506bccd48ac66be9d7eb4dce2 (patch) | |
tree | faf19bc190d008d51ed9825be8a95f9b5dfb8632 /chart2/source/view | |
parent | fd61dee6457a44687f1142dd55bfee6b64fda2ef (diff) |
tdf#94306 replace boost::noncopyable in chart2
Replace with C++11 delete copy-constructur
and copy-assignment.
Delete default-constructors when comments suggested it.
Change-Id: Ieeaf6ca998a4165d6eacf5e900c6a09aafdcfbe6
Reviewed-on: https://gerrit.libreoffice.org/23903
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'chart2/source/view')
-rw-r--r-- | chart2/source/view/charttypes/AreaChart.hxx | 5 | ||||
-rw-r--r-- | chart2/source/view/charttypes/BarChart.hxx | 5 | ||||
-rw-r--r-- | chart2/source/view/charttypes/BubbleChart.hxx | 5 | ||||
-rw-r--r-- | chart2/source/view/charttypes/CandleStickChart.hxx | 6 | ||||
-rw-r--r-- | chart2/source/view/charttypes/NetChart.hxx | 5 | ||||
-rw-r--r-- | chart2/source/view/charttypes/PieChart.hxx | 5 | ||||
-rw-r--r-- | chart2/source/view/inc/VDataSeries.hxx | 6 | ||||
-rw-r--r-- | chart2/source/view/inc/VSeriesPlotter.hxx | 6 |
8 files changed, 18 insertions, 25 deletions
diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 80f56ec7121c..14e65f8b8bd4 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -30,6 +30,8 @@ class AreaChart : public VSeriesPlotter { // public methods public: + AreaChart() = delete; + AreaChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bCategoryXAxis, bool bNoArea=false @@ -50,9 +52,6 @@ public: virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods - //no default constructor - AreaChart(); - void impl_createSeriesShapes(); bool impl_createArea( VDataSeries* pSeries , css::drawing::PolyPolygonShape3D* pSeriesPoly diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 4153cdf3f09c..17632f5c4832 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -30,6 +30,8 @@ class BarChart : public VSeriesPlotter { // public methods public: + BarChart() = delete; + BarChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~BarChart(); @@ -40,9 +42,6 @@ public: virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; private: //methods - //no default constructor - BarChart(); - css::uno::Reference< css::drawing::XShape > createDataPoint3D_Bar( const css::uno::Reference< css::drawing::XShapes >& xTarget diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index f66a6144774b..5c7d49caf9ed 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -29,6 +29,8 @@ class BubbleChart : public VSeriesPlotter { // public methods public: + BubbleChart() = delete; + BubbleChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~BubbleChart(); @@ -46,9 +48,6 @@ public: virtual LegendSymbolStyle getLegendSymbolStyle() override; private: //methods - //no default constructor - BubbleChart(); - void calculateMaximumLogicBubbleSize(); void calculateBubbleSizeScalingFactor(); diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index f85db625daa3..38e1dacd57b9 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -30,6 +30,8 @@ class CandleStickChart : public VSeriesPlotter { // public methods public: + CandleStickChart() = delete; + CandleStickChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~CandleStickChart(); @@ -44,10 +46,6 @@ public: virtual LegendSymbolStyle getLegendSymbolStyle() override; -private: //methods - //no default constructor - CandleStickChart(); - private: //member BarPositionHelper* m_pMainPosHelper; }; diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index ee98c343b8bd..8ec0f2793d53 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -29,6 +29,8 @@ class NetChart : public VSeriesPlotter { // public methods public: + NetChart() = delete; + NetChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bNoArea @@ -50,9 +52,6 @@ public: virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods - //no default constructor - NetChart(); - void impl_createSeriesShapes(); bool impl_createArea( VDataSeries* pSeries , css::drawing::PolyPolygonShape3D* pSeriesPoly diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index b46279943f0f..2b39e0869f95 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -33,6 +33,8 @@ class PieChart : public VSeriesPlotter struct ShapeParam; public: + PieChart() = delete; + PieChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount, bool bExcludingPositioning ); virtual ~PieChart(); @@ -61,9 +63,6 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; private: //methods - //no default constructor - PieChart(); - css::uno::Reference<css::drawing::XShape> createDataPoint( const css::uno::Reference<css::drawing::XShapes>& xTarget, diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 0d18b6eb64f4..94586f402882 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -36,7 +36,6 @@ #include <memory> #include <vector> #include <map> -#include <boost/noncopyable.hpp> namespace chart { @@ -56,13 +55,16 @@ public: mutable css::uno::Sequence<double> Doubles; }; -class VDataSeries final : private boost::noncopyable +class VDataSeries final { public: VDataSeries( const css::uno::Reference<css::chart2::XDataSeries>& xDataSeries ); ~VDataSeries(); + VDataSeries(const VDataSeries&) = delete; + const VDataSeries& operator=(const VDataSeries&) = delete; + css::uno::Reference<css::chart2::XDataSeries> getModel() const; void setCategoryXAxis(); diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index f112f2828ea2..2eeeb1af14ae 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -119,6 +119,8 @@ private: class VSeriesPlotter : public PlotterBase, public MinimumAndMaximumSupplier, public LegendEntryProvider { public: + VSeriesPlotter() = delete; + virtual ~VSeriesPlotter(); /* @@ -253,10 +255,6 @@ public: bool WantToPlotInFrontOfAxisLine(); virtual bool shouldSnapRectToUsedArea(); -private: - //no default constructor - VSeriesPlotter(); - protected: VSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel |