in general this seems to make more sense

Change-Id: I00dfbaa9971e3ee589672e51bca07e8eddfdc167
Reviewed-on: https://gerrit.libreoffice.org/16238Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

vcl/inc/opengl/x11/salvd.hxx

@@ -34,7 +34,8 @@ public:
     X11OpenGLSalVirtualDevice( SalGraphics *pGraphics,
                                long &nDX, long &nDY,
                                sal_uInt16 nBitCount,
-                               const SystemGraphicsData *pData );
+                               const SystemGraphicsData *pData,
+                               X11SalGraphics* pNewGraphics);
     virtual ~X11OpenGLSalVirtualDevice();
 
     // SalGeometryProvider

vcl/opengl/x11/salvd.cxx

@@ -36,7 +36,9 @@ void X11SalGraphics::Init( X11OpenGLSalVirtualDevice *pDevice )
 X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics,
                                                       long &nDX, long &nDY,
                                                       sal_uInt16 nBitCount,
-                                                      const SystemGraphicsData *pData ) :
+                                                      const SystemGraphicsData *pData,
+                                                      X11SalGraphics* pNewGraphics) :
+    mpGraphics(pNewGraphics),
     mbGraphics( false ),
     mnXScreen( 0 )
 {
@@ -53,8 +55,11 @@ X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics,
                              vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen();
     mnWidth    = nDX;
     mnHeight   = nDY;
-    mpGraphics = new X11SalGraphics();
-    mpGraphics->SetLayout( SalLayoutFlags::NONE );
+    if (!mpGraphics)
+    {
+        mpGraphics = new X11SalGraphics();
+        mpGraphics->SetLayout( SalLayoutFlags::NONE );
+    }
     mpGraphics->Init( this );
 }
 

vcl/unx/generic/gdi/salvd.cxx

@@ -39,13 +39,11 @@ SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics,
         long &nDX, long &nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData,
         X11SalGraphics* pNewGraphics)
 {
+    assert(pNewGraphics);
     if (OpenGLHelper::isVCLOpenGLEnabled())
-        return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, nBitCount, pData );
+        return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, nBitCount, pData, pNewGraphics );
     else
-    {
-        assert(pNewGraphics);
         return new X11SalVirtualDevice(pGraphics, nDX, nDY, nBitCount, pData, pNewGraphics);
-    }
 }
 
 SalVirtualDevice* X11SalInstance::CreateVirtualDevice(SalGraphics* pGraphics,