diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-24 18:59:09 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-04-24 21:27:04 +0000 |
commit | 59dc694c9f858f0c892818ba6370665b352de6a8 (patch) | |
tree | d1a0e88b9fbbcdb35a218b39f93808c531522ccd /chart2 | |
parent | 3a6e3d7811ceff077d4dd3f5f77b7e88cb223e00 (diff) |
C++11: disable ctors instead of not implementing them (chart2)
replace the old declare and don't implement pattern
with C++11 delete keyword
Change-Id: I10b14cece4ecaddc5f96ee098b5fa36a8782a0fc
Reviewed-on: https://gerrit.libreoffice.org/24340
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/inc/ChartView.hxx | 3 | ||||
-rw-r--r-- | chart2/source/controller/main/ChartDropTargetHelper.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/axes/Tickmarks.hxx | 3 | ||||
-rw-r--r-- | chart2/source/view/axes/VCartesianCoordinateSystem.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/axes/VPolarCoordinateSystem.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/inc/LabelPositionHelper.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/inc/ShapeFactory.hxx | 3 |
7 files changed, 7 insertions, 18 deletions
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 013335bffbf7..12421dcdd16b 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -107,6 +107,7 @@ private: void init(); public: + ChartView() = delete; ChartView(css::uno::Reference< css::uno::XComponentContext > const & xContext, ChartModel& rModel); @@ -209,8 +210,6 @@ public: void updateOpenGLWindow(); private: //methods - ChartView(); - void createShapes(); void createShapes2D( const css::awt::Size& rPageSize ); bool createAxisTitleShapes2D( CreateShapeParam2D& rParam, const css::awt::Size& rPageSize ); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index ebb52745adbe..41dc2b6cdfd3 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -33,6 +33,7 @@ namespace chart class ChartDropTargetHelper : public DropTargetHelper { public: + ChartDropTargetHelper() = delete; explicit ChartDropTargetHelper( const css::uno::Reference< css::datatransfer::dnd::XDropTarget >& rxDropTarget, const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument ); @@ -44,9 +45,6 @@ protected: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; private: - // not available - ChartDropTargetHelper(); - bool satisfiesPrerequisites() const; css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 1fc63e5e081f..865c87e15dd6 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -45,6 +45,7 @@ struct TickInfo sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category //methods: + TickInfo() = delete; explicit TickInfo( const css::uno::Reference<css::chart2::XScaling>& xInverse ); /** @@ -54,8 +55,6 @@ struct TickInfo */ double getUnscaledTickValue() const; sal_Int32 getScreenDistanceBetweenTicks( const TickInfo& rOherTickInfo ) const; -private: - TickInfo(); }; typedef std::vector<TickInfo> TickInfoArrayType; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index 85819babdd39..d258b6182673 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -29,6 +29,7 @@ namespace chart class VCartesianCoordinateSystem : public VCoordinateSystem { public: + VCartesianCoordinateSystem() = delete; explicit VCartesianCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); virtual ~VCartesianCoordinateSystem(); @@ -41,9 +42,6 @@ public: virtual void updateScalesAndIncrementsOnAxes() override; virtual void createGridShapes() override; - -private: - VCartesianCoordinateSystem(); }; } //namespace chart diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 734622bc45d5..8828d3ee1d2d 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -29,6 +29,7 @@ namespace chart class VPolarCoordinateSystem : public VCoordinateSystem { public: + VPolarCoordinateSystem() = delete; explicit VPolarCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); virtual ~VPolarCoordinateSystem(); @@ -45,9 +46,6 @@ public: virtual void updateScalesAndIncrementsOnAxes() override; virtual void createGridShapes() override; - -private: - VPolarCoordinateSystem(); }; } //namespace chart diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index a53abf3c5088..46ce12b2579e 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -37,6 +37,7 @@ class AbstractShapeFactory; class LabelPositionHelper { public: + LabelPositionHelper() = delete; LabelPositionHelper( sal_Int32 nDimensionCount , const css::uno::Reference< css::drawing::XShapes >& xLogicTarget @@ -54,9 +55,6 @@ public: static void correctPositionForRotation( const css::uno::Reference< css::drawing::XShape >& xShape2DText , LabelAlignment eLabelAlignment, const double fRotationAngle, bool bRotateAroundCenter ); -private: - LabelPositionHelper(); - protected: sal_Int32 m_nDimensionCount; diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 4c19f8f11178..448515bcb277 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -32,6 +32,7 @@ class ShapeFactory : public AbstractShapeFactory {m_xShapeFactory = xFactory;} public: + ShapeFactory() = delete; virtual css::uno::Reference< css::drawing::XShapes > createGroup2D( const css::uno::Reference< css::drawing::XShapes >& xTarget @@ -230,8 +231,6 @@ public: virtual void clearPage(css::uno::Reference< css::drawing::XShapes > ) override {} private: - ShapeFactory(); - css::uno::Reference< css::drawing::XShape > impl_createCube( const css::uno::Reference< css::drawing::XShapes >& xTarget , const css::drawing::Position3D& rPosition |