summaryrefslogtreecommitdiff
path: root/chart2/source/view/inc
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/inc')
-rw-r--r--chart2/source/view/inc/3DChartObjects.hxx2
-rw-r--r--chart2/source/view/inc/GL3DBarChart.hxx4
-rw-r--r--chart2/source/view/inc/GL3DRenderer.hxx10
3 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index 052fd1dd2783..432137747424 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -62,7 +62,7 @@ protected:
class Bar : public Renderable3DObject
{
public:
- Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nColor, sal_uInt32 nId);
+ Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, Color nColor, sal_uInt32 nId);
virtual void render() override;
private:
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index c1350f47b231..0c244a335b5a 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -116,7 +116,7 @@ private:
static void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest);
void getNearestBars(std::vector<sal_uInt32> &vectorNearest);
void updateScroll();
- void processAutoFly(sal_uInt32 nId, sal_uInt32 nColor);
+ void processAutoFly(sal_uInt32 nId, Color nColor);
void getNeighborBarID(sal_uInt32 nSelectBarId, sal_uInt32 *pNeighborBarId);
void addMovementScreenText(sal_uInt32 nBarId);
css::uno::Reference<css::chart2::XChartType> mxChartType;
@@ -184,7 +184,7 @@ private:
std::map<sal_uInt32, std::deque<float> > maBarHistory;
std::vector<sal_uInt32> maVectorNearest;
std::map<sal_uInt32, float> maDistanceMap;
- std::map<sal_uInt32, sal_uInt32> maBarColorMap;
+ std::map<sal_uInt32, Color> maBarColorMap;
int mnColorRate;
bool mbBenchMarkMode;
sal_uInt32 mnHistoryCounter;
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 141621c1bc70..9dc860229aee 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -181,16 +181,16 @@ public:
~OpenGL3DRenderer();
void init();
- void Set3DSenceInfo(sal_uInt32 color, bool twoSidesLighting = true);
- void SetLightInfo(bool lightOn, sal_uInt32 color, const glm::vec4& direction);
- void AddShapePolygon3DObject(sal_uInt32 color, bool lineOnly, sal_uInt32 lineColor,
+ void Set3DSenceInfo(Color color, bool twoSidesLighting = true);
+ void SetLightInfo(bool lightOn, Color color, const glm::vec4& direction);
+ void AddShapePolygon3DObject(Color color, bool lineOnly, Color lineColor,
long fillStyle, sal_uInt32 specular, sal_uInt32 nUniqueId);
void EndAddShapePolygon3DObject();
void AddPolygon3DObjectNormalPoint(float x, float y, float z);
void EndAddPolygon3DObjectNormalPoint();
void AddPolygon3DObjectPoint(float x, float y, float z);
void EndAddPolygon3DObjectPoint();
- void AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 color, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId);
+ void AddShape3DExtrudeObject(bool roundedCorner, Color color, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId);
void EndAddShape3DExtrudeObject();
void SetSize(const Size& rSize);
void SetCameraInfo(const glm::vec3& pos, const glm::vec3& direction, const glm::vec3& up);
@@ -207,7 +207,7 @@ public:
void SetPickingMode(bool bPickingMode);
- sal_uInt32 GetPixelColorFromPoint(long nX, long nY);
+ Color GetPixelColorFromPoint(long nX, long nY);
void ReleaseShapes();
void ReleaseScreenTextShapes();