commit 7a2e0a335593bcd04caf5ba3fd7a9b0e2d933567
author Michael Meeks <michael.meeks@collabora.com> Thu Mar 19 13:56:13 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 12:11:57 2015 +0100
tree b2a56237672b72fb10f8d3e95d0bf33538541a7d
parent 2177201e655767f6f15e9b44aedf7a4f99d2994a

ImplSVGDIData didn't dispose its contents previously; clobber it for now.

Change-Id: I71c877773cbdabe10f617d1d3d7141ebd6d93923

vcl/inc/svdata.hxx

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index fc285cd..d881a8e 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -153,6 +153,8 @@ struct ImplSVAppData

struct ImplSVGDIData
{
    ~ImplSVGDIData();

    VclPtr<OutputDevice>    mpFirstWinGraphics;             // First OutputDevice with a Frame Graphics
    VclPtr<OutputDevice>    mpLastWinGraphics;              // Last OutputDevice with a Frame Graphics
    VclPtr<OutputDevice>    mpFirstVirGraphics;             // First OutputDevice with a VirtualDevice Graphics

vcl/source/app/svdata.cxx

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 887d082..bd33350 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -88,6 +88,14 @@ ImplSVData::ImplSVData()
    maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT );
}

ImplSVGDIData::~ImplSVGDIData()
{
    // FIXME: deliberately leak any remaining OutputDevice
    // until we have their pGraphics reference counted, doing
    // any disposes so late in shutdown is rather unsafe.
    memset( this, 0, sizeof( ImplSVGDIData ) );
}

void ImplDeInitSVData()
{
    ImplSVData* pSVData = ImplGetSVData();