fix some warnings

Change-Id: I3bded252fb6af9166dc533e7e2756e7569a82112

3 files changed, 5 insertions, 13 deletions

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 9b861f98d123..1ec63b91576f 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -715,7 +715,6 @@ void DummyText::render()
     DummyChart* pChart = getRootShape();
 
     drawing::HomogenMatrix3 aTransformation;
-    bool bHasTransformation = false;
     std::map<OUString, uno::Any>::const_iterator itr =
         maProperties.find("Transformation");
     if(itr != maProperties.end())
@@ -724,7 +723,6 @@ void DummyText::render()
         if(itr->second.hasValue())
         {
             aTransformation = itr->second.get<drawing::HomogenMatrix3>();
-            bHasTransformation = true;
         }
     }
     else if(maTrans.hasValue())
@@ -732,7 +730,7 @@ void DummyText::render()
         aTransformation = maTrans.get<drawing::HomogenMatrix3>();
     }
     pChart->m_GLRender.CreateTextTexture(maBitmap, maPosition, maSize, 0,
-            bHasTransformation, aTransformation);
+            aTransformation);
     pChart->m_GLRender.RenderTextShape();
 }
 
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 98681d642c18..d96b2190ffa1 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -43,7 +43,9 @@ using namespace com::sun::star;
 using namespace std;
 
 #define DEBUG_PNG 1
+#if RENDER_TO_FILE
 #define BMP_HEADER_LEN 54
+#endif
 
 #if DEBUG_PNG
 #include <vcl/pngwrite.hxx>
@@ -1457,7 +1459,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
 
 
 int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, awt::Point aPos, awt::Size aSize, long rotation,
-        bool bRotation, const drawing::HomogenMatrix3& rTrans)
+        const drawing::HomogenMatrix3& rTrans)
 {
     glm::mat3 aTrans(rTrans.Line1.Column1, rTrans.Line1.Column2, rTrans.Line1.Column3,
                     rTrans.Line2.Column1, rTrans.Line2.Column2, rTrans.Line2.Column3,
@@ -1504,26 +1506,18 @@ int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, awt::Point aPos,
     aTextInfo.y = (float)(aPos.Y + aSize.Height / 2);
     aTextInfo.z = m_fZStep;
     aTextInfo.rotation = -(double)rotation * GL_PI / 18000.0f;
-    glm::vec3 aPos1( 0, 0, 1 );
-    glm::vec3 aPos1Trans = aTrans * aPos1;
     aTextInfo.vertex[0] = rTrans.Line1.Column3 / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[1] = rTrans.Line2.Column3 / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[2] = m_fZStep;
 
-    glm::vec3 aPos2( 1, 0, 1 );
-    glm::vec3 aPos2Trans = aTrans * aPos2;
     aTextInfo.vertex[3] = (rTrans.Line1.Column3 + aSize.Width ) / OPENGL_SCALE_VALUE ;
     aTextInfo.vertex[4] = rTrans.Line2.Column3 / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[5] = m_fZStep;
 
-    glm::vec3 aPos3( 1, 1, 1 );
-    glm::vec3 aPos3Trans = aTrans * aPos3;
     aTextInfo.vertex[6] = (rTrans.Line1.Column3 + aSize.Width) / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[7] = (rTrans.Line2.Column3 + aSize.Height) / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[8] = m_fZStep;
 
-    glm::vec3 aPos4( 0, 1, 1 );
-    glm::vec3 aPos4Trans = aTrans * aPos4;
     aTextInfo.vertex[9] = rTrans.Line1.Column3 / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[10] = (rTrans.Line2.Column3 + aSize.Height) / OPENGL_SCALE_VALUE;
     aTextInfo.vertex[11] = m_fZStep;
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index ebd3b2af87b4..435e76dbfa40 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -168,7 +168,7 @@ public:
 
     int CreateTextTexture(const BitmapEx& rBitmapEx,
             com::sun::star::awt::Point aPos, com::sun::star::awt::Size aSize, long rotation,
-            bool bTransformation, const com::sun::star::drawing::HomogenMatrix3& rTrans);
+            const com::sun::star::drawing::HomogenMatrix3& rTrans);
     int RenderTextShape();
 
     int SetArea2DShapePoint(float x, float y, int listLength);