diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-12 02:23:09 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-12 13:21:05 +0000 |
| commit | c4f63de0eebf8ba5c58e269c9a3763c42448424e (patch) | |
| tree | 8ac6c63a37d0ba6e5e1f6f9634d265426419501b /vcl/unx | |
| parent | 7a9dc7fd35168e1f44fb0aa23c984f90163db621 (diff) | |
Revert "Fix LibreOffice running with SAL_ENABLEGL=1"
This reverts commit 6bf39b2f4ea4e880d8414b04269405e6b48efe23.
Change-Id: I97619740f34cf0046f89352553dba73723f35a6f
Reviewed-on: https://gerrit.libreoffice.org/16239
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 357d24c789ce..11a18e5e90e0 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -322,12 +322,9 @@ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG, return pNew; #else GtkSalGraphics *pGtkSalGraphics = dynamic_cast<GtkSalGraphics*>(pG); - - GtkSalGraphics *pNewGraphics = NULL; - if (pGtkSalGraphics) - pNewGraphics = new GtkSalGraphics(pGtkSalGraphics->GetGtkFrame(), pGtkSalGraphics->GetGtkWidget()); - - return CreateX11VirtualDevice(pG, nDX, nDY, nBitCount, pGd, pNewGraphics); + assert(pGtkSalGraphics); + return CreateX11VirtualDevice(pG, nDX, nDY, nBitCount, pGd, + new GtkSalGraphics(pGtkSalGraphics->GetGtkFrame(), pGtkSalGraphics->GetGtkWidget())); #endif } |