[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara caolanm at redhat.com
Mon Nov 30 04:01:55 PST 2015


 vcl/unx/gtk/gtksalframe.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2d49006f7cb04d7b3b71481f1f3aecf0f6d70dff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 30 12:01:07 2015 +0000

    uninitialized m_pGraphics -> cppcanvas_emfplus kaboom
    
    Change-Id: I370f63ed12e187684332112b9510a9892a665129

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 6da958d..c5c01a4 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -494,6 +494,7 @@ void GtkSalFrame::doKeyCallback( guint state,
 
 GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
     : m_nXScreen( getDisplay()->GetDefaultXScreen() )
+    , m_pGraphics(nullptr)
 {
     getDisplay()->registerFrame( this );
     m_bDefaultPos       = true;
@@ -507,6 +508,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
 
 GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
     : m_nXScreen( getDisplay()->GetDefaultXScreen() )
+    , m_pGraphics(nullptr)
 {
     getDisplay()->registerFrame( this );
     // permanently ignore errors from our unruly children ...


More information about the Libreoffice-commits mailing list