[Libreoffice-commits] core.git: chart2/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Wed Aug 27 03:22:57 PDT 2014
chart2/source/view/inc/3DChartObjects.hxx | 6 ++++--
chart2/source/view/main/3DChartObjects.cxx | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit f96908e1b1c9456daf49560656c2d6ef5cc6596f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Aug 27 12:11:50 2014 +0200
pass by const reference
Change-Id: I1d1fff8b596d75a4cb033679d06b300402dbf212
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index d3ea915..49b21a3 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -108,10 +108,12 @@ private:
class ScreenText : public Renderable3DObject
{
public:
- ScreenText(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, glm::vec4 rColor, sal_uInt32 nId);
+ ScreenText(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr,
+ const glm::vec4& rColor, sal_uInt32 nId);
virtual void render() SAL_OVERRIDE;
- void setPosition(const glm::vec2& rTopLeft, const glm::vec2& rBottomRight, glm::vec3 r3DPos = glm::vec3(0.0, 0.0, 0.0));
+ void setPosition(const glm::vec2& rTopLeft, const glm::vec2& rBottomRight,
+ const glm::vec3& r3DPos = glm::vec3(0.0, 0.0, 0.0));
private:
TextCacheItem maText;
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 96763d0..f4acef7 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -128,14 +128,16 @@ void Text::setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, co
maBottomRight = rBottomRight;
}
-ScreenText::ScreenText(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, glm::vec4 rColor, sal_uInt32 nId):
+ScreenText::ScreenText(OpenGL3DRenderer* pRenderer, TextCache& rTextCache,
+ const OUString& rStr, const glm::vec4& rColor, sal_uInt32 nId):
Renderable3DObject(pRenderer, nId),
maText(rTextCache.getText(rStr)),
maColor(rColor)
{
}
-void ScreenText::setPosition(const glm::vec2& rTopLeft, const glm::vec2& rBottomRight, glm::vec3 r3DPos)
+void ScreenText::setPosition(const glm::vec2& rTopLeft, const glm::vec2& rBottomRight,
+ const glm::vec3& r3DPos)
{
maTopLeft = rTopLeft;
maBottomRight = rBottomRight;
More information about the Libreoffice-commits
mailing list