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

[Miklos Vajna]

 vcl/opengl/gdiimpl.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2d3dbdcd14dbca9e5827cb44e453cc45842dff14
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Sep 10 11:40:33 2015 +0200

    windows opengl: mpProgram seen as 0
    
    in JunitTest_sc_unoapi_3.
    
    Change-Id: Ic7e32979f31a3376b67eb3bef59373632461e39f
    (cherry picked from commit 0e682d47a792497211d33779312ca2cad9874ffb)
    Reviewed-on: https://gerrit.libreoffice.org/18490
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 10b5c35..85c3a3a 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -773,6 +773,12 @@ void OpenGLSalGraphicsImpl::DrawTrapezoid( const basegfx::B2DTrapezoid& trapezoi
         aVertices[j+1] = GLfloat(rPt.getY());
     }
 
+    if (!mpProgram)
+    {
+        SAL_WARN("vcl.opengl", "OpenGLSalGraphicsImpl::DrawTrapezoid: mpProgram is 0");
+        return;
+    }
+
     ApplyProgramMatrices();
     mpProgram->SetVertices( &aVertices[0] );
     glDrawArrays( GL_TRIANGLE_FAN, 0, nPoints );