Kaydet (Commit) 55e214eb authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Fix LibreOffice running with SAL_ENABLEGL=1

Change-Id: I302ab9e38831403cbb4aa96c61d4862f43537e8e
üst 8accb240
...@@ -42,7 +42,10 @@ SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics, ...@@ -42,7 +42,10 @@ SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics,
if (OpenGLHelper::isVCLOpenGLEnabled()) if (OpenGLHelper::isVCLOpenGLEnabled())
return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, nBitCount, pData ); return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, nBitCount, pData );
else else
{
assert(pNewGraphics);
return new X11SalVirtualDevice(pGraphics, nDX, nDY, nBitCount, pData, pNewGraphics); return new X11SalVirtualDevice(pGraphics, nDX, nDY, nBitCount, pData, pNewGraphics);
}
} }
SalVirtualDevice* X11SalInstance::CreateVirtualDevice(SalGraphics* pGraphics, SalVirtualDevice* X11SalInstance::CreateVirtualDevice(SalGraphics* pGraphics,
......
...@@ -322,9 +322,12 @@ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG, ...@@ -322,9 +322,12 @@ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG,
return pNew; return pNew;
#else #else
GtkSalGraphics *pGtkSalGraphics = dynamic_cast<GtkSalGraphics*>(pG); GtkSalGraphics *pGtkSalGraphics = dynamic_cast<GtkSalGraphics*>(pG);
assert(pGtkSalGraphics);
return CreateX11VirtualDevice(pG, nDX, nDY, nBitCount, pGd, GtkSalGraphics *pNewGraphics = NULL;
new GtkSalGraphics(pGtkSalGraphics->GetGtkFrame(), pGtkSalGraphics->GetGtkWidget())); if (pGtkSalGraphics)
pNewGraphics = new GtkSalGraphics(pGtkSalGraphics->GetGtkFrame(), pGtkSalGraphics->GetGtkWidget());
return CreateX11VirtualDevice(pG, nDX, nDY, nBitCount, pGd, pNewGraphics);
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment