Skip to content

C
core
Kaydet (Commit) db3c6265 authored tarafından Thomas Arnhold's avatar Thomas Arnhold
Dosyalara gözat
Seçenekler

chart2: fix namespacing 

Change-Id: Ib9ef14b4ce38f93f590473913a308a967343c75d
üst b4150450
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 48 deletions
chart2/source/view/main/DummyXShape.hxx
Dosyayı görüntüle @ db3c6265
...@@ -62,8 +62,6 @@ ...@@ -62,8 +62,6 @@
#include <map> #include <map>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
using namespace com::sun::star;
namespace chart { namespace chart {
...@@ -175,7 +173,7 @@ public: ...@@ -175,7 +173,7 @@ public:
protected: protected:
std::map<OUString, uno::Any> maProperties; std::map<OUString, css::uno::Any> maProperties;
com::sun::star::awt::Point maPosition; com::sun::star::awt::Point maPosition;
com::sun::star::awt::Size maSize; com::sun::star::awt::Size maSize;
...@@ -189,29 +187,29 @@ private: ...@@ -189,29 +187,29 @@ private:
class DummyCube : public DummyXShape class DummyCube : public DummyXShape
{ {
public: public:
DummyCube(const drawing::Position3D &rPos, const drawing::Direction3D& rSize, DummyCube(const css::drawing::Position3D &rPos, const css::drawing::Direction3D& rSize,
const uno::Reference< beans::XPropertySet > & xPropSet, const css::uno::Reference< css::beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap ); const tPropertyNameMap& rPropertyNameMap );
}; };
class DummyCylinder : public DummyXShape class DummyCylinder : public DummyXShape
{ {
public: public:
DummyCylinder(const drawing::Position3D&, const drawing::Direction3D& rSize ); DummyCylinder(const css::drawing::Position3D&, const css::drawing::Direction3D& rSize );
}; };
class DummyPyramid : public DummyXShape class DummyPyramid : public DummyXShape
{ {
public: public:
DummyPyramid(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize, DummyPyramid(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize,
const uno::Reference< beans::XPropertySet > & xPropSet, const css::uno::Reference< css::beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap ); const tPropertyNameMap& rPropertyNameMap );
}; };
class DummyCone : public DummyXShape class DummyCone : public DummyXShape
{ {
public: public:
DummyCone(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize); DummyCone(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize);
}; };
class DummyPieSegment2D : public DummyXShape class DummyPieSegment2D : public DummyXShape
...@@ -219,7 +217,7 @@ class DummyPieSegment2D : public DummyXShape ...@@ -219,7 +217,7 @@ class DummyPieSegment2D : public DummyXShape
public: public:
DummyPieSegment2D(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree, DummyPieSegment2D(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree,
double fUnitCircleInnerRadius, double fUnitCircleOuterRadius, double fUnitCircleInnerRadius, double fUnitCircleOuterRadius,
const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene); const css::drawing::Direction3D& rOffset, const css::drawing::HomogenMatrix& rUnitCircleToScene);
void render() SAL_OVERRIDE; void render() SAL_OVERRIDE;
private: private:
double mfUnitCircleStartAngleDegree; double mfUnitCircleStartAngleDegree;
...@@ -227,25 +225,25 @@ private: ...@@ -227,25 +225,25 @@ private:
double mfUnitCircleInnerRadius; double mfUnitCircleInnerRadius;
double mfUnitCircleOuterRadius; double mfUnitCircleOuterRadius;
drawing::Direction3D maOffset; css::drawing::Direction3D maOffset;
drawing::HomogenMatrix maUnitCircleToScene; css::drawing::HomogenMatrix maUnitCircleToScene;
}; };
class DummyPieSegment : public DummyXShape class DummyPieSegment : public DummyXShape
{ {
public: public:
DummyPieSegment( DummyPieSegment(
const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene); const css::drawing::Direction3D& rOffset, const css::drawing::HomogenMatrix& rUnitCircleToScene);
private: private:
drawing::Direction3D maOffset; css::drawing::Direction3D maOffset;
drawing::HomogenMatrix maUnitCircleToScene; css::drawing::HomogenMatrix maUnitCircleToScene;
}; };
class DummyStripe : public DummyXShape class DummyStripe : public DummyXShape
{ {
public: public:
DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPropertySet > & xPropSet, DummyStripe(const Stripe& rStripe, const css::uno::Reference< css::beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap ); const tPropertyNameMap& rPropertyNameMap );
private: private:
...@@ -255,32 +253,32 @@ private: ...@@ -255,32 +253,32 @@ private:
class DummyArea3D : public DummyXShape class DummyArea3D : public DummyXShape
{ {
public: public:
DummyArea3D(const drawing::PolyPolygonShape3D& rShape); DummyArea3D(const css::drawing::PolyPolygonShape3D& rShape);
private: private:
drawing::PolyPolygonShape3D maShapes; css::drawing::PolyPolygonShape3D maShapes;
}; };
class DummyArea2D : public DummyXShape class DummyArea2D : public DummyXShape
{ {
public: public:
DummyArea2D(const drawing::PointSequenceSequence& rShape); DummyArea2D(const css::drawing::PointSequenceSequence& rShape);
virtual void render() SAL_OVERRIDE; virtual void render() SAL_OVERRIDE;
private: private:
drawing::PointSequenceSequence maShapes; css::drawing::PointSequenceSequence maShapes;
}; };
class DummySymbol2D : public DummyXShape class DummySymbol2D : public DummyXShape
{ {
public: public:
DummySymbol2D(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize, DummySymbol2D(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize,
sal_Int32 nStandardSymbol, sal_Int32 nFillColor); sal_Int32 nStandardSymbol, sal_Int32 nFillColor);
void render() SAL_OVERRIDE; void render() SAL_OVERRIDE;
private: private:
drawing::Position3D mrPosition; css::drawing::Position3D mrPosition;
drawing::Direction3D mrSize; css::drawing::Direction3D mrSize;
sal_Int32 mnStandardSymbol; sal_Int32 mnStandardSymbol;
sal_Int32 mnFillColor; sal_Int32 mnFillColor;
}; };
...@@ -288,17 +286,17 @@ private: ...@@ -288,17 +286,17 @@ private:
class DummyGraphic2D : public DummyXShape class DummyGraphic2D : public DummyXShape
{ {
public: public:
DummyGraphic2D(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize, DummyGraphic2D(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize,
const uno::Reference< graphic::XGraphic > xGraphic ); const css::uno::Reference< css::graphic::XGraphic > xGraphic );
private: private:
uno::Reference< graphic::XGraphic > mxGraphic; css::uno::Reference< css::graphic::XGraphic > mxGraphic;
}; };
class DummyCircle : public DummyXShape class DummyCircle : public DummyXShape
{ {
public: public:
DummyCircle(const awt::Point& rPosition, const awt::Size& rSize); DummyCircle(const css::awt::Point& rPosition, const css::awt::Size& rSize);
virtual void render() SAL_OVERRIDE; virtual void render() SAL_OVERRIDE;
}; };
...@@ -306,30 +304,30 @@ public: ...@@ -306,30 +304,30 @@ public:
class DummyLine3D : public DummyXShape class DummyLine3D : public DummyXShape
{ {
public: public:
DummyLine3D(const drawing::PolyPolygonShape3D& rPoints, const VLineProperties& rProperties); DummyLine3D(const css::drawing::PolyPolygonShape3D& rPoints, const VLineProperties& rProperties);
private: private:
drawing::PolyPolygonShape3D maPoints; css::drawing::PolyPolygonShape3D maPoints;
}; };
class DummyLine2D : public DummyXShape class DummyLine2D : public DummyXShape
{ {
public: public:
DummyLine2D(const drawing::PointSequenceSequence& rPoints, const VLineProperties* pProperties); DummyLine2D(const css::drawing::PointSequenceSequence& rPoints, const VLineProperties* pProperties);
DummyLine2D(const awt::Size& rSize, const awt::Point& rPosition); DummyLine2D(const css::awt::Size& rSize, const css::awt::Point& rPosition);
virtual void render() SAL_OVERRIDE; virtual void render() SAL_OVERRIDE;
private: private:
drawing::PointSequenceSequence maPoints; css::drawing::PointSequenceSequence maPoints;
}; };
class DummyRectangle : public DummyXShape class DummyRectangle : public DummyXShape
{ {
public: public:
DummyRectangle(); DummyRectangle();
DummyRectangle(const awt::Size& rSize); DummyRectangle(const css::awt::Size& rSize);
DummyRectangle(const awt::Size& rSize, const awt::Point& rPoint, const tNameSequence& rNames, DummyRectangle(const css::awt::Size& rSize, const css::awt::Point& rPoint, const tNameSequence& rNames,
const tAnySequence& rValues ); const tAnySequence& rValues );
virtual void render() SAL_OVERRIDE; virtual void render() SAL_OVERRIDE;
...@@ -339,7 +337,7 @@ class DummyText : public DummyXShape ...@@ -339,7 +337,7 @@ class DummyText : public DummyXShape
{ {
public: public:
DummyText(const OUString& rText, const tNameSequence& rNames, DummyText(const OUString& rText, const tNameSequence& rNames,
const tAnySequence& rValues, const uno::Any& rTrans, com::sun::star::uno::Reference< const tAnySequence& rValues, const css::uno::Any& rTrans, com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xTarget, double nRotation); com::sun::star::drawing::XShapes > xTarget, double nRotation);
virtual void render() SAL_OVERRIDE; virtual void render() SAL_OVERRIDE;
...@@ -352,7 +350,7 @@ private: ...@@ -352,7 +350,7 @@ private:
void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix);
OUString maText; OUString maText;
uno::Any maTrans; css::uno::Any maTrans;
BitmapEx maBitmap; BitmapEx maBitmap;
double mnRotation; double mnRotation;
}; };
......
chart2/source/view/main/OpenGLRender.hxx
Dosyayı görüntüle @ db3c6265
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
#define DEBUG_POSITIONING 0 #define DEBUG_POSITIONING 0
#define RENDER_TO_FILE 0 #define RENDER_TO_FILE 0
using namespace std;
using namespace ::com::sun::star;
struct PosVecf3 struct PosVecf3
{ {
float x; float x;
...@@ -64,9 +61,9 @@ struct TextInfo ...@@ -64,9 +61,9 @@ struct TextInfo
float nDy; float nDy;
}; };
typedef vector<GLfloat> Area2DPointList; typedef std::vector<GLfloat> Area2DPointList;
typedef vector<GLfloat> PieSegment2DPointList; typedef std::vector<GLfloat> PieSegment2DPointList;
typedef vector<GLfloat> PointList; typedef std::vector<GLfloat> PointList;
// for 3D, use vector to save the points // for 3D, use vector to save the points
...@@ -99,14 +96,14 @@ public: ...@@ -99,14 +96,14 @@ public:
int CreateTextTexture(const boost::shared_array<sal_uInt8> &rPixels, int CreateTextTexture(const boost::shared_array<sal_uInt8> &rPixels,
const ::Size &aPixelSize, const ::Size &aPixelSize,
const ::css::awt::Point&, const css::awt::Point&,
const ::css::awt::Size& aSize, const css::awt::Size& aSize,
long rotation, long rotation,
const ::css::drawing::HomogenMatrix3& rTrans); const css::drawing::HomogenMatrix3& rTrans);
int CreateTextTexture(const BitmapEx& rBitmapEx, int CreateTextTexture(const BitmapEx& rBitmapEx,
const ::css::awt::Point& aPos, const css::awt::Size& aSize, const css::awt::Point& aPos, const css::awt::Size& aSize,
long rotation, const ::css::drawing::HomogenMatrix3& rTrans); long rotation, const css::drawing::HomogenMatrix3& rTrans);
int CreateTextTexture(::rtl::OUString const &textValue, Font aFont, long fontColor, awt::Point aPos, awt::Size aSize, long rotation); int CreateTextTexture(::rtl::OUString const &textValue, Font aFont, long fontColor, css::awt::Point aPos, css::awt::Size aSize, long rotation);
int RenderTextShape(); int RenderTextShape();
int SetArea2DShapePoint(float x, float y, int listLength); int SetArea2DShapePoint(float x, float y, int listLength);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment