diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-26 14:17:38 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-26 14:17:38 +0100 |
commit | bc8dcb2b5db706c8c5bdd6cf3ac1311d6625d962 (patch) | |
tree | d11f09fdb025c80fc5400e75ea1cd1e2783bbbcd /chart2 | |
parent | e65233abd48c290448c361a75a90a0a9e5652062 (diff) |
-Werror,-Wunused-private-field
Change-Id: I70e753b1532fe465d378b8b4b0bbd2b7582130fe
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 17 | ||||
-rw-r--r-- | chart2/source/view/main/DummyXShape.hxx | 28 | ||||
-rw-r--r-- | chart2/source/view/main/OpenglShapeFactory.cxx | 15 |
3 files changed, 11 insertions, 49 deletions
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index a6f9ed12c00d..efadcbc1ff12 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -453,13 +453,6 @@ void DummyPieSegment2D::render() } -DummyPieSegment::DummyPieSegment( - const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene ): - maOffset(rOffset), - maUnitCircleToScene(rUnitCircleToScene) -{ -} - DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPropertySet > & xPropSet, const tPropertyNameMap& rPropertyNameMap ): maStripe(rStripe) @@ -467,11 +460,6 @@ DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPr setProperties(xPropSet, rPropertyNameMap, maProperties); } -DummyArea3D::DummyArea3D(const drawing::PolyPolygonShape3D& rShape): - maShapes(rShape) -{ -} - DummyArea2D::DummyArea2D(const drawing::PointSequenceSequence& rShape): maShapes(rShape) { @@ -505,8 +493,6 @@ void DummyArea2D::render() DummySymbol2D::DummySymbol2D(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, sal_Int32 nStandardSymbol, sal_Int32 nFillColor): - mrPosition(rPos), - mrSize(rSize), mnStandardSymbol(nStandardSymbol), mnFillColor(nFillColor) { @@ -592,8 +578,7 @@ void setProperties( const VLineProperties& rLineProperties, std::map<OUString, u } -DummyLine3D::DummyLine3D(const drawing::PolyPolygonShape3D& rPoints, const VLineProperties& rLineProperties): - maPoints(rPoints) +DummyLine3D::DummyLine3D(const VLineProperties& rLineProperties) { setProperties(rLineProperties, maProperties); } diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 5ce54c429619..79d31c574db4 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -44,7 +44,6 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/graphic/XGraphic.hpp> @@ -227,16 +226,7 @@ private: css::drawing::HomogenMatrix maUnitCircleToScene; }; -class DummyPieSegment : public DummyXShape -{ -public: - DummyPieSegment( - const css::drawing::Direction3D& rOffset, const css::drawing::HomogenMatrix& rUnitCircleToScene); - -private: - css::drawing::Direction3D maOffset; - css::drawing::HomogenMatrix maUnitCircleToScene; -}; +class DummyPieSegment : public DummyXShape {}; class DummyStripe : public DummyXShape { @@ -248,14 +238,7 @@ private: Stripe maStripe; }; -class DummyArea3D : public DummyXShape -{ -public: - explicit DummyArea3D(const css::drawing::PolyPolygonShape3D& rShape); - -private: - css::drawing::PolyPolygonShape3D maShapes; -}; +class DummyArea3D : public DummyXShape {}; class DummyArea2D : public DummyXShape { @@ -275,8 +258,6 @@ public: sal_Int32 nStandardSymbol, sal_Int32 nFillColor); void render() override; private: - css::drawing::Position3D mrPosition; - css::drawing::Direction3D mrSize; sal_Int32 mnStandardSymbol; sal_Int32 mnFillColor; }; @@ -302,10 +283,7 @@ public: class DummyLine3D : public DummyXShape { public: - DummyLine3D(const css::drawing::PolyPolygonShape3D& rPoints, const VLineProperties& rProperties); - -private: - css::drawing::PolyPolygonShape3D maPoints; + DummyLine3D(const VLineProperties& rProperties); }; class DummyLine2D : public DummyXShape diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx index 666ab98a8124..244855eaaab8 100644 --- a/chart2/source/view/main/OpenglShapeFactory.cxx +++ b/chart2/source/view/main/OpenglShapeFactory.cxx @@ -205,12 +205,11 @@ uno::Reference< drawing::XShape > const uno::Reference< drawing::XShapes >& xTarget , double, double , double, double - , const drawing::Direction3D& rOffset - , const drawing::HomogenMatrix& rUnitCircleToScene + , const drawing::Direction3D& + , const drawing::HomogenMatrix& , double ) { - dummy::DummyPieSegment* pSegment = new dummy::DummyPieSegment( - rOffset, rUnitCircleToScene); + dummy::DummyPieSegment* pSegment = new dummy::DummyPieSegment; xTarget->add(pSegment); return pSegment; @@ -233,10 +232,10 @@ uno::Reference< drawing::XShape > uno::Reference< drawing::XShape > OpenglShapeFactory::createArea3D( const uno::Reference< drawing::XShapes >& xTarget - , const drawing::PolyPolygonShape3D& rPolyPolygon + , const drawing::PolyPolygonShape3D& , double ) { - dummy::DummyArea3D* pArea = new dummy::DummyArea3D(rPolyPolygon); + dummy::DummyArea3D* pArea = new dummy::DummyArea3D; xTarget->add(pArea); return pArea; } @@ -323,10 +322,10 @@ uno::Reference< drawing::XShape > uno::Reference< drawing::XShape > OpenglShapeFactory::createLine3D( const uno::Reference< drawing::XShapes >& xTarget - , const drawing::PolyPolygonShape3D& rPoints + , const drawing::PolyPolygonShape3D& , const VLineProperties& rLineProperties ) { - dummy::DummyLine3D* pLine = new dummy::DummyLine3D(rPoints, rLineProperties); + dummy::DummyLine3D* pLine = new dummy::DummyLine3D(rLineProperties); xTarget->add(pLine); return pLine; } |