[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Jan Holesovsky]

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

New commits:
commit 7017ab3559f8298f9afa364171531a10782d8d29
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 1 18:38:27 2015 +0200

    windows opengl: When the 2nd param is NULL, the 1st is ignored anyway.
    
    Change-Id: I840e8bb2d2ccae869c330bb32dba484b4a835a51
    Reviewed-on: https://gerrit.libreoffice.org/18248
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index c4ff6d8..84d8a79 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1296,7 +1296,7 @@ void OpenGLContext::reset()
         if (itr != g_vShareList.end())
             g_vShareList.erase(itr);
 
-        wglMakeCurrent( m_aGLWin.hDC, 0 );
+        wglMakeCurrent(NULL, NULL);
         wglDeleteContext( m_aGLWin.hRC );
         ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
     }
@@ -1473,7 +1473,7 @@ void OpenGLContext::resetCurrent()
     OpenGLZone aZone;
 
 #if defined( WNT )
-    wglMakeCurrent( m_aGLWin.hDC, 0 );
+    wglMakeCurrent(NULL, NULL);
 #elif defined( MACOSX )
     (void) this; // loplugin:staticmethods
     OpenGLWrapper::resetCurrent();