[Libreoffice-commits] core.git: 2 commits - chart2/source

[Tor Lillqvist]

 chart2/source/view/inc/GL3DRenderer.hxx  |   12 ++++++------
 chart2/source/view/main/GL3DRenderer.cxx |    2 +-
 chart2/source/view/main/OpenGLRender.cxx |    2 +-
 chart2/source/view/main/OpenGLRender.hxx |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 576dd7742fda417f737ba309bd788e61fbb4033e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 29 13:12:14 2014 +0300

    WaE: passing OUString by value, rather pass by reference
    
    Change-Id: I181d16d26c4a144568da37add23939d57a7e1ca4

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index caf86e4..3ed67a9 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -177,7 +177,7 @@ private:
     int Update3DUniformBlock();
     int RenderExtrude3DObject();
     int RenderFPS(float fps);
-    int RenderText(::rtl::OUString string, com::sun::star::awt::Point aPos);
+    int RenderText(::rtl::OUString &string, com::sun::star::awt::Point aPos);
     int RenderExtrudeSurface(Extrude3DInfo extrude3D);
     int RenderExtrudeTopSurface(Extrude3DInfo extrude3D);
     int RenderExtrudeMiddleSurface(Extrude3DInfo extrude3D);
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index b9b7201..03a2161 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1184,7 +1184,7 @@ void OpenGL3DRenderer::SetClickPos(Point aMPos)
     m_aMPos = aMPos;
 }
 
-int OpenGL3DRenderer::RenderText(::rtl::OUString , awt::Point )
+int OpenGL3DRenderer::RenderText(::rtl::OUString &, awt::Point )
 {
     //TODO: moggi: disabled for now
     /*
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 06ebc60..1fe93f3 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -899,7 +899,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
     return 0;
 }
 
-int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, Font aFont, long , awt::Point aPos, awt::Size aSize, long rotation)
+int OpenGLRender::CreateTextTexture(::rtl::OUString &textValue, Font aFont, long , awt::Point aPos, awt::Size aSize, long rotation)
 {
     VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
     aDevice.Erase();
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 07e15eb..f5c54fa 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -99,7 +99,7 @@ public:
     int CreateTextTexture(const BitmapEx& rBitmapEx,
             const com::sun::star::awt::Point& aPos, const com::sun::star::awt::Size& aSize,
             long rotation, const com::sun::star::drawing::HomogenMatrix3& rTrans);
-    int CreateTextTexture(::rtl::OUString textValue, Font aFont, long fontColor, awt::Point aPos, awt::Size aSize, long rotation);
+    int CreateTextTexture(::rtl::OUString &textValue, Font aFont, long fontColor, awt::Point aPos, awt::Size aSize, long rotation);
     int RenderTextShape();
 
     int SetArea2DShapePoint(float x, float y, int listLength);
commit aef3ce97457005e06c13fc8de5508cc0ecb8aff5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 29 13:09:23 2014 +0300

    There is this thing called bool to use for Boolean flags
    
    Change-Id: Ifc25cb29b17e33d19e8f4ccafc653fdb686f2b5a

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 24a0067..caf86e4 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -48,7 +48,7 @@ typedef struct MaterialParameters
     glm::vec4 specular;
     glm::vec4 materialColor;
 
-    int twoSidesLighting;
+    bool twoSidesLighting;
     float shininess;
     float pad;
     float pad1;
@@ -73,9 +73,9 @@ typedef struct GlobalLights
 
 typedef struct Polygon3DInfo
 {
-    short lineOnly;
+    bool lineOnly;
     float lineWidth;
-    int twoSidesLighting;
+    bool twoSidesLighting;
     long fillStyle;
     glm::vec4 polygonColor;
     Vertices3D *vertices;
@@ -90,9 +90,9 @@ typedef struct Polygon3DInfo
 typedef struct Extrude3DInfo
 {
     int pickingFlg;
-    short lineOnly;
+    bool lineOnly;
     float lineWidth;
-    int twoSidesLighting;
+    bool twoSidesLighting;
     glm::vec4 extrudeColor;
     long fillStyle;
     float xRange[2];