[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/controller/dialogs/tp_RangeChooser.cxx |    3 +++
 chart2/source/model/main/ChartModel.cxx              |    1 +
 chart2/source/view/main/OpenGLRender.cxx             |    2 +-
 chart2/source/view/main/OpenGLRender.hxx             |    2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ee20f4f4a4029fc82fde969e1c3102a4c61ca7db
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jan 2 14:27:56 2014 +0100

    fix the time based rendering
    
    I managed to screw it up already. I really need some sleep.
    
    Change-Id: Ie1f13496cd36a6f48b2b094ac302f293d5fd5383

diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 39467e7..0105f5d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -157,6 +157,9 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent
     m_aRB_Rows.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
     m_aCB_FirstRowAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
     m_aCB_FirstColumnAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
+    m_aCB_TimeBased.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
+    m_aEd_TimeStart.SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
+    m_aEd_TimeEnd.SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
 }
 
 RangeChooserTabPage::~RangeChooserTabPage()
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 2625668..0fab4a6 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1401,6 +1401,7 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd)
     bSet = false;
     mnStart = nStart;
     mnEnd = nEnd;
+    mbTimeBased = true;
 }
 
 }  // namespace chart
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 3072c02..2090e03 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1315,7 +1315,7 @@ int OpenGLRender::RenderRectangleShape()
     return 0;
 }
 
-int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, long color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation)
+int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, sal_uInt32 color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation)
 {
     VirtualDevice aDevice;
     Font aFont(font, Size(0, 100));
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 1c02a9b..9040836 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -176,7 +176,7 @@ public:
     int RenderRectangleShape();
     int RectangleShapePoint(float x, float y, float directionX, float directionY);
 
-    int CreateTextTexture(::rtl::OUString textValue, long color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation);
+    int CreateTextTexture(::rtl::OUString textValue, sal_uInt32 color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation);
     int RenderTextShape();
 private:
     GLint LoadShaders(const char *vertexShader,const char *fragmentShader);