[Libreoffice-commits] core.git: 2 commits - filter/source

[Michael Meeks]

 filter/source/graphicfilter/eps/eps.cxx  |    2 +-
 filter/source/graphicfilter/icgm/cgm.cxx |    2 --
 filter/source/graphicfilter/icgm/cgm.hxx |    1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit bd2f71fc265d5bf7a6b490a49549c1233d4bdc4d
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Jun 1 09:30:31 2015 +0100

    Remove unused icgm filter VirtualDevice member.
    
    Change-Id: I899e6cbc2fe9453ba048cd2dd147a2a29b166f22

diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 30c8c47..6d0d6f8 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -66,7 +66,6 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel )
     , mnElementClass(0)
     , mnElementID(0)
     , mnElementSize(0)
-    , mpVirDev(NULL)
     , mpGDIMetaFile(NULL)
 {
     pElement = new CGMElements( *this );
@@ -80,7 +79,6 @@ CGM::~CGM()
         mpGDIMetaFile->Stop();
         mpGDIMetaFile->SetPrefMapMode( MapMode() );
         mpGDIMetaFile->SetPrefSize( Size( static_cast< long >( mnOutdx ), static_cast< long >( mnOutdy ) ) );
-        mpVirDev.disposeAndClear();
         *mpGraphic = Graphic( *mpGDIMetaFile );
     }
     for( size_t i = 0, n = maDefRepList.size(); i < n; ++i )
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index f9e6fa4..f190365 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -139,7 +139,6 @@ class CGM
                             ~CGM();
 
                             CGM( sal_uInt32 nMode, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > const & rModel );
-        VclPtr<VirtualDevice> mpVirDev;
         GDIMetaFile*        mpGDIMetaFile;
         sal_uInt32              GetBackGroundColor();
         bool                IsValid() const { return mbStatus; };
commit c709da10fb2585a1f8b7d1a96b33d3fe5486d7f5
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jun 1 09:27:07 2015 +0100

    tdf#91782 - fix VirtualDevice allocation crasher in eps filter.
    
    Change-Id: I59cc13cebf9a15e873cd0b7f8fccffa37a6a8f39

diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 926d012..5c77259 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -116,7 +116,7 @@ private:
     SvStream*           mpPS;
     const GDIMetaFile*  pMTF;
     GDIMetaFile*        pAMTF;              // only created if Graphics is not a Metafile
-    ScopedVclPtr<VirtualDevice> pVDev;
+    ScopedVclPtrInstance<VirtualDevice> pVDev;
 
     double              nBoundingX1;        // this represents the bounding box
     double              nBoundingY1;