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

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |    4 +++-
 vcl/source/app/timer.cxx                 |   27 +++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 0012f3a450a1285f3d9edb6bdbdf8f5b7fef2897
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jan 3 13:22:51 2014 +0100

    maybe that will fix my windows crashes
    
    Change-Id: Idedfe8c0385712807c7f810d5275947310f24df4

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 17fac5f..2d5f209 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -858,7 +858,9 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
     m_iPointNum(0),
     m_iFboIdx(0),
     m_fLineAlpha(1.0),
-    mxRenderTarget(xTarget)
+    mxRenderTarget(xTarget),
+    m_TextVertexID(0),
+    m_TextTexCoordID(1)
 {
     memset(&m_Line2DPoitList, 0, sizeof(Line2DPointList));
     m_iFboIdx = 0;
commit 21e238c6dafb075dbae4b7906684decc5ac51a57
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jan 3 12:09:02 2014 +0100

    small cleanup in timer.cxx
    
    Change-Id: Ia47c1775bc13596bf854475dd786c50c9c9b6e25

diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index dab9927..512386a 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -191,22 +191,21 @@ void Timer::ImplTimerCallbackProc()
     pSVData->mbNotAllTimerCalled = sal_False;
 }
 
-Timer::Timer()
+Timer::Timer():
+    mpTimerData(NULL),
+    mnTimeout(1),
+    mbActive(false),
+    mbAuto(false)
 {
-    mpTimerData     = NULL;
-    mnTimeout       = 1;
-    mbAuto          = false;
-    mbActive        = false;
 }
 
-Timer::Timer( const Timer& rTimer )
+Timer::Timer( const Timer& rTimer ):
+    mpTimerData(NULL),
+    mnTimeout(rTimer.mnTimeout),
+    mbActive(false),
+    mbAuto(false),
+    maTimeoutHdl(rTimer.maTimeoutHdl)
 {
-    mpTimerData     = NULL;
-    mnTimeout       = rTimer.mnTimeout;
-    mbAuto          = false;
-    mbActive        = false;
-    maTimeoutHdl    = rTimer.maTimeoutHdl;
-
     if ( rTimer.IsActive() )
         Start();
 }
@@ -217,7 +216,7 @@ Timer::~Timer()
     {
         mpTimerData->mbDelete = true;
         mpTimerData->mpTimer = NULL;
-    }
+     }
 }
 
 void Timer::Timeout()
@@ -256,7 +255,7 @@ void Timer::Start()
         }
 
         // insert timer and start
-        mpTimerData                 = new ImplTimerData;
+        mpTimerData = new ImplTimerData;
         mpTimerData->mpTimer        = this;
         mpTimerData->mnUpdateTime   = Time::GetSystemTicks();
         mpTimerData->mnTimerUpdate  = pSVData->mnTimerUpdate;