[Libreoffice-commits] core.git: Branch 'feature/priorities' - framework/source vcl/opengl

[Tobias Madl]

 framework/source/uielement/toolbarmanager.cxx |    4 ++--
 vcl/opengl/gdiimpl.cxx                        |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit ce423057fd995d7ba1d968db6de6f26cc3b6f374
Author: Tobias Madl <tobias.madl....@gmail.com>
Date:   Tue Nov 11 15:38:40 2014 +0000

    merge fixes
    
    Change-Id: Ibca73c7099739790e1659a24841f168a2c06b71e

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index b1984b0..cbcc849 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -243,7 +243,7 @@ ToolBarManager::ToolBarManager( const Reference< 
XComponentContext >& rxContext,
 
 ToolBarManager::~ToolBarManager()
 {
-    assert(!m_aAsyncUpdateControllersTimer.IsActive());
+    assert(!m_aAsyncUpdateControllersIdle.IsActive());
     OSL_ASSERT( m_pToolBar == 0 );
     OSL_ASSERT( !m_bAddedToTaskPaneList );
 }
@@ -629,7 +629,7 @@ void SAL_CALL ToolBarManager::dispose() throw( 
RuntimeException, std::exception
 
         // stop timer to prevent timer events after dispose
         // do it last because other calls could restart timer in StateChanged()
-        m_aAsyncUpdateControllersTimer.Stop();
+        m_aAsyncUpdateControllersIdle.Stop();
 
         m_bDisposed = true;
     }
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 0cd4fc9..e00c9c0 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -53,9 +53,6 @@
 
 OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl()
     : mpFrame(NULL)
-    , mbOffscreen(false)
-    , mnFramebufferId(0)
-    , mpOffscreenTex(NULL)
     , mnLineColor(SALCOLOR_NONE)
     , mnFillColor(SALCOLOR_NONE)
     , mnSolidProgram(0)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits