[Libreoffice-commits] core.git: Branch 'feature/vclptr' - vcl/source

[Michael Meeks]

 vcl/source/opengl/OpenGLContext.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7377c4d6dd6dacd1d20352226a46a075cbd6a935
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Apr 10 14:08:12 2015 +0100

    Remove OpenGLContext GC window.
    
    Change-Id: I1468fc94aa0c709528a767b96bc26eefdb7ed08f

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 9a15a45..30b7afa 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -101,6 +101,8 @@ OpenGLContext::~OpenGLContext()
         mpNextContext->mpPrevContext = mpPrevContext;
     else
         pSVData->maGDIData.mpLastContext = mpPrevContext;
+
+    m_pChildWindow.disposeAndClear();
 }
 
 #ifdef DBG_UTIL
@@ -1080,7 +1082,6 @@ bool OpenGLContext::initWindow()
     {
         SystemWindowData winData = generateWinData(mpWindow, false);
         m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false);
-        m_xChildWindowGC.reset(m_pChildWindow);
     }
 
     if( m_pChildWindow )
@@ -1108,7 +1109,6 @@ bool OpenGLContext::initWindow()
     {
         SystemWindowData winData = generateWinData(mpWindow, mbRequestLegacyContext);
         m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false);
-        m_xChildWindowGC.reset(m_pChildWindow);
     }
 
     if( m_pChildWindow )
@@ -1143,7 +1143,6 @@ bool OpenGLContext::initWindow()
         if( !m_pChildWindow )
         {
             m_pChildWindow = VclPtrInstance<SystemChildWindow>(mpWindow, 0, &winData, false);
-            m_xChildWindowGC.reset(m_pChildWindow);
         }
         pChildSysData = m_pChildWindow->GetSystemData();
     }