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

Markus Mohrhard markus.mohrhard at collabora.co.uk
Sat Feb 15 05:16:59 CET 2014


 chart2/source/view/main/DummyXShape.cxx  |    2 +-
 chart2/source/view/main/OpenGLRender.cxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4825182fc29e108f236e2a7f55af4ee384eeb6dd
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Feb 15 05:13:56 2014 +0100

    last fix for chart area size and positioning
    
    It WORKS!!!!!!! The chart looks good and there are now only minor
    positioning issues. Issues that I'm aware of:
    
    * legend text is not positioned correctly
    * text seems to be positioned a bit too far to the right
    * bubble positions are incorrect
    
    Change-Id: Ib81cae13624c8119216f0bedea58b5838fcdc80c

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 3508f19..478226c 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -822,7 +822,7 @@ awt::Point DummyGroup2D::getPosition()
         }
     }
 
-    return awt::Point(nTop, nLeft);
+    return awt::Point(nLeft, nTop);
 }
 
 awt::Size DummyGroup2D::getSize()
commit 110e5a1749ed49e77a06ff35b329e92049580184
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Feb 15 03:58:04 2014 +0100

    fix OpenGL resource leak
    
    Change-Id: I56d00381dc023273c406a134c0828bda89d4d6b2

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 55feba5..8ecc888 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -634,6 +634,7 @@ void OpenGLRender::Release()
 {
     glDeleteBuffers(1, &m_VertexBuffer);
     glDeleteBuffers(1, &m_ColorBuffer);
+    glDeleteBuffers(1, &m_TextTexCoordBuf);
     glDeleteProgram(m_CommonProID);
     glDeleteProgram(m_TextProID);
     glDeleteProgram(m_BackgroundProID);


More information about the Libreoffice-commits mailing list