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

Michael Meeks michael.meeks at collabora.com
Wed Sep 2 07:21:47 PDT 2015


 vcl/unx/generic/gdi/salgdi.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 50e82134148673583c42a3ddb2ce5c6cf0b01767
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Sep 2 11:48:33 2015 +0100

    tdf#93839 - Encourage vdevs to pick up new GL Contexts for Linux.
    
    Change-Id: I1c40df21a1b1b6d0637f399cf29ca4f49a81d183
    Reviewed-on: https://gerrit.libreoffice.org/18264
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index ee68a0c..e9262e1 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -101,6 +101,7 @@ X11SalGraphics::X11SalGraphics():
 
 X11SalGraphics::~X11SalGraphics()
 {
+    DeInit();
     ReleaseFonts();
     freeResources();
 }
@@ -173,6 +174,7 @@ void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget,
 
 void X11SalGraphics::DeInit()
 {
+    mxImpl->DeInit();
     SetDrawable( None, m_nXScreen );
 }
 


More information about the Libreoffice-commits mailing list