diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-17 02:47:31 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-19 13:47:38 +0100 |
commit | 0aa94225baf8e55303d0b3cc23cabbec050a3e4e (patch) | |
tree | 1a24f1add0aa67be2faccb0d45cd74457208b4b7 /chart2 | |
parent | 4813b13542371619f483fd4ed173cecd84e74574 (diff) |
add the definition for the shapes
resolves the linker errors
Change-Id: I24d18a4491c8bc4f5839f9245386d0cd2b612cf0
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/view/inc/DummyXShape.hxx | 9 | ||||
-rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 156 |
2 files changed, 160 insertions, 5 deletions
diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx index 0e5c4f74db43..30b627da4407 100644 --- a/chart2/source/view/inc/DummyXShape.hxx +++ b/chart2/source/view/inc/DummyXShape.hxx @@ -147,7 +147,7 @@ class DummyCube : public DummyXShape public: DummyCube(const drawing::Position3D &rPos, const drawing::Direction3D& rSize, sal_Int32 nRotateZAngleHundredthDegree, const uno::Reference< beans::XPropertySet > xPropSet, - const tPropertyNameMap& rPropertyNaemMap, bool bRounded ); + const tPropertyNameMap& rPropertyNameMap, bool bRounded ); private: sal_Int32 mnRotateZAngleHundredthDegree; @@ -161,7 +161,6 @@ public: sal_Int32 nRotateZAngleHundredthDegree ); private: sal_Int32 mnRotateZAngleHundredthDegree; - bool mbRounded; }; class DummyPyramid : public DummyXShape @@ -173,7 +172,7 @@ public: private: double mfTopHeight; - bool bRotateZ; + bool mbRotateZ; }; class DummyCone : public DummyXShape @@ -320,8 +319,8 @@ public: const tAnySequence& rValues, const uno::Any& rTrans ); private: - OUString aText; - uno::Any aTrans; + OUString maText; + uno::Any maTrans; }; diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index c14bb6ec0a63..1451605ba4be 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -8,6 +8,7 @@ */ #include "DummyXShape.hxx" +#include "CommonConverters.hxx" #include <rtl/ustring.hxx> #include <algorithm> @@ -202,6 +203,161 @@ void DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent ) mxParent = xParent; } +DummyCube::DummyCube(const drawing::Position3D &rPos, const drawing::Direction3D& rSize, + sal_Int32 nRotateZAngleHundredthDegree, const uno::Reference< beans::XPropertySet > , + const tPropertyNameMap& , bool bRounded ): + mnRotateZAngleHundredthDegree(nRotateZAngleHundredthDegree), + mbRounded(bRounded) +{ + setPosition(Position3DToAWTPoint(rPos)); + setSize(Direction3DToAWTSize(rSize)); +} + +DummyCylinder::DummyCylinder(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, + sal_Int32 nRotateZAngleHundredthDegree ): + mnRotateZAngleHundredthDegree(nRotateZAngleHundredthDegree) +{ + setPosition(Position3DToAWTPoint(rPos)); + setSize(Direction3DToAWTSize(rSize)); +} + +DummyPyramid::DummyPyramid(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, + double fTopHeight, bool bRotateZ, uno::Reference< beans::XPropertySet > , + const tPropertyNameMap& ): + mfTopHeight(fTopHeight), + mbRotateZ(bRotateZ) +{ + setPosition(Position3DToAWTPoint(rPos)); + setSize(Direction3DToAWTSize(rSize)); +} + +DummyCone::DummyCone(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, + double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree): + mnRotateZAngleHundredthDegree(nRotateZAngleHundredthDegree), + mfTopHeight(fTopHeight) +{ + setPosition(Position3DToAWTPoint(rPos)); + setSize(Direction3DToAWTSize(rSize)); +} + +DummyPieSegment2D::DummyPieSegment2D(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree, + double fUnitCircleInnerRadius, double fUnitCircleOuterRadius, + const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene): + mfUnitCircleStartAngleDegree(fUnitCircleStartAngleDegree), + mfUnitCircleWidthAngleDegree(fUnitCircleWidthAngleDegree), + mfUnitCircleInnerRadius(fUnitCircleInnerRadius), + mfUnitCircleOuterRadius(fUnitCircleOuterRadius), + maOffset(rOffset), + maUnitCircleToScene(rUnitCircleToScene) +{ +} + +DummyPieSegment::DummyPieSegment(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree, + double fUnitCircleInnerRadius, double fUnitCircleOuterRadius, + const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene, + double fDepth ): + mfUnitCircleStartAngleDegree(fUnitCircleStartAngleDegree), + mfUnitCircleWidthAngleDegree(fUnitCircleWidthAngleDegree), + mfUnitCircleInnerRadius(fUnitCircleInnerRadius), + mfUnitCircleOuterRadius(fUnitCircleOuterRadius), + maOffset(rOffset), + maUnitCircleToScene(rUnitCircleToScene), + mfDepth(fDepth) +{ +} + +DummyStripe::DummyStripe(const Stripe& rStripe, uno::Reference< beans::XPropertySet > , + const tPropertyNameMap& , sal_Bool bDoubleSided, + short nRotatedTexture, bool bFlatNormals ): + maStripe(rStripe), + mbDoubleSided(bDoubleSided), + mnRotatedTexture(nRotatedTexture), + mbFlatNormals(bFlatNormals) +{ +} + +DummyArea3D::DummyArea3D(const drawing::PolyPolygonShape3D& rShape, double fDepth): + mfDepth(fDepth), + maShapes(rShape) +{ +} + +DummyArea2D::DummyArea2D(const drawing::PolyPolygonShape3D& rShape): + maShapes(rShape) +{ +} + +DummySymbol2D::DummySymbol2D(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, + sal_Int32 nStandardSymbol, sal_Int32 , sal_Int32 ): + mnStandardSymbol(nStandardSymbol) +{ + setPosition(Position3DToAWTPoint(rPos)); + setSize(Direction3DToAWTSize(rSize)); +} + +DummyCircle::DummyCircle(const awt::Point& rPos, const awt::Size& rSize) +{ + setPosition(rPos); + setSize(rSize); +} + +DummyLine3D::DummyLine3D(const drawing::PolyPolygonShape3D& rPoints, const VLineProperties& ): + maPoints(rPoints) +{ +} + +DummyLine2D::DummyLine2D(const drawing::PointSequenceSequence& rPoints, const VLineProperties* ): + maPoints(rPoints) +{ +} + +DummyLine2D::DummyLine2D(const awt::Size& rSize, const awt::Point& rPosition) +{ + setPosition(rPosition); + setSize(rSize); +} + +DummyRectangle::DummyRectangle() +{ +} + +DummyRectangle::DummyRectangle(const awt::Size& rSize) +{ + setSize(rSize); +} + +DummyRectangle::DummyRectangle(const awt::Size& rSize, const awt::Point& rPoint, const tNameSequence& , + const tAnySequence& ) +{ + setSize(rSize); + setPosition(rPoint); +} + +DummyText::DummyText(const OUString& rText, const tNameSequence& , + const tAnySequence& , const uno::Any& rTrans ): + maText(rText), + maTrans(rTrans) +{ +} + +DummyGroup3D::DummyGroup3D(const OUString& rName) +{ + setName(rName); +} + +DummyGroup2D::DummyGroup2D(const OUString& rName) +{ + setName(rName); +} + +DummyGraphic2D::DummyGraphic2D(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, + const uno::Reference< graphic::XGraphic > xGraphic ): + mxGraphic(xGraphic) +{ + setPosition(Position3DToAWTPoint(rPos)); + setSize(Direction3DToAWTSize(rSize)); +} + DummyChart* DummyXShape::getRootShape() { assert(mxParent.is()); |