From d2d83f5a8a0f6f84c4e2692229c960b6677878ef Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 19 Mar 2015 17:16:37 +0000 Subject: Move OutputDevice members to VclPtr: filter, reportdesign, uui. Change-Id: Iafac8812714a0be68f5608f657c76c159f2912a0 --- filter/source/flash/swfwriter.cxx | 2 +- filter/source/flash/swfwriter.hxx | 2 +- filter/source/graphicfilter/eos2met/eos2met.cxx | 2 +- filter/source/graphicfilter/eps/eps.cxx | 10 +++++----- filter/source/graphicfilter/icgm/cgm.cxx | 2 +- filter/source/graphicfilter/icgm/cgm.hxx | 2 +- filter/source/graphicfilter/idxf/dxf2mtf.cxx | 2 +- filter/source/graphicfilter/idxf/dxf2mtf.hxx | 2 +- filter/source/graphicfilter/ios2met/ios2met.cxx | 4 ++-- filter/source/graphicfilter/ipict/ipict.cxx | 4 ++-- filter/source/svg/svgwriter.cxx | 2 +- filter/source/svg/svgwriter.hxx | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) (limited to 'filter') diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 4e2021264605..7df9404ed549 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -100,7 +100,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int Writer::~Writer() { - delete mpVDev; + mpVDev.disposeAndClear(); delete mpSprite; delete mpTag; } diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 218459b00f6e..2e98ab1f48a1 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -395,7 +395,7 @@ private: sal_uInt16 mnWhiteBackgroundShapeId; sal_uInt16 mnPageButtonId; - VirtualDevice* mpVDev; + VclPtr mpVDev; const tools::PolyPolygon* mpClipPolyPolygon; diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index c2bb58460a93..c6404e503cc5 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -157,7 +157,7 @@ private: sal_uInt32 nActBitmapPercent; // percentage of the next bitmap that's already written ScopedVclPtr apDummyVDev; - OutputDevice* pCompDev; + VclPtr pCompDev; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index c4f1b7b5e91b..925823af956b 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -257,7 +257,7 @@ PSWriter::PSWriter() , mpPS(NULL) , pMTF(NULL) , pAMTF(NULL) - , aVDev() + , pVDev() , nBoundingX1(0) , nBoundingY1(0) , nBoundingX2(0) @@ -419,13 +419,13 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter Bitmap aBmp( rGraphic.GetBitmap() ); pAMTF = new GDIMetaFile(); ScopedVclPtr pTmpVDev(new VirtualDevice()); - pAMTF->Record( &aTmpVDev ); + pAMTF->Record( pTmpVDev ); pTmpVDev->DrawBitmap( Point(), aBmp ); pAMTF->Stop(); pAMTF->SetPrefSize( aBmp.GetSizePixel() ); pMTF = pAMTF; } - aVDev.SetMapMode( pMTF->GetPrefMapMode() ); + pVDev->SetMapMode( pMTF->GetPrefMapMode() ); nBoundingX1 = nBoundingY1 = 0; nBoundingX2 = pMTF->GetPrefSize().Width(); nBoundingY2 = pMTF->GetPrefSize().Height(); @@ -454,7 +454,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter { ImplWriteProlog( ( mnPreview & EPS_PREVIEW_EPSI ) ? &rGraphic : NULL ); mnCursorPos = 0; - ImplWriteActions( *pMTF, aVDev ); + ImplWriteActions( *pMTF, *pVDev.get() ); ImplWriteEpilog(); if ( mnPreview & EPS_PREVIEW_TIFF ) { @@ -1608,7 +1608,7 @@ void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) { - ScopedVclPtr l_pVirDev( new VirtualDevice() ); + ScopedVclPtr l_pVDev( new VirtualDevice() ); GDIMetaFile aTmpMtf; l_pVDev->SetMapMode( rVDev.GetMapMode() ); l_pVDev->AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf ); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index acd073eb88c3..f9b48b825908 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -80,7 +80,7 @@ CGM::~CGM() mpGDIMetaFile->Stop(); mpGDIMetaFile->SetPrefMapMode( MapMode() ); mpGDIMetaFile->SetPrefSize( Size( static_cast< long >( mnOutdx ), static_cast< long >( mnOutdy ) ) ); - delete mpVirDev; + 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 c03b8910cfa3..c6c0fa689158 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -138,7 +138,7 @@ class CGM ~CGM(); CGM( sal_uInt32 nMode, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > const & rModel ); - VirtualDevice* mpVirDev; + VclPtr mpVirDev; GDIMetaFile* mpGDIMetaFile; sal_uInt32 GetBackGroundColor(); bool IsValid() const { return mbStatus; }; diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index 8429940c9cef..2d2b86bb91b4 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -885,7 +885,7 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF rMTF.SetPrefMapMode( MapMode( MAP_100TH_MM ) ); } - delete pVirDev; + pVirDev.disposeAndClear(); return bStatus; } diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx index 354cd09734ab..a9eab710d748 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx @@ -34,7 +34,7 @@ enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT, class DXF2GDIMetaFile { private: - VirtualDevice * pVirDev; + VclPtr pVirDev; const DXFRepresentation * pDXF; bool bStatus; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 4a77e38f1c3b..9e8b89458265 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -345,7 +345,7 @@ private: long ErrorCode; SvStream * pOS2MET; // the OS2MET file to be read - VirtualDevice * pVirDev; // here the drawing methods are being called + VclPtr pVirDev; // here the drawing methods are being called // While doing this a recording in the GDIMetaFile // will take place. sal_uLong nOrigPos; // initial position in pOS2MET @@ -2665,7 +2665,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF } rGDIMetaFile.Stop(); - delete pVirDev; + pVirDev.disposeAndClear(); rGDIMetaFile.SetPrefMapMode( aGlobMapMode ); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 9ab206f67534..a578272e8ac0 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -146,7 +146,7 @@ class PictReader { private: SvStream * pPict; // The Pict file to read. - VirtualDevice * pVirDev; // Here the drawing methos will be called. + VclPtr pVirDev; // Here the drawing methos will be called. // A recording into the GDIMetaFile will take place. sal_uLong nOrigPos; // Initial position in pPict. @@ -1942,7 +1942,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) pVirDev->SetClipRegion(); rGDIMetaFile.Stop(); - delete pVirDev; + pVirDev.disposeAndClear(); rGDIMetaFile.SetPrefMapMode( MapMode( MAP_INCH, Point(), aHRes, aVRes ) ); rGDIMetaFile.SetPrefSize( aBoundingRect.GetSize() ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 44fe1253bd36..b0036731d668 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1658,7 +1658,7 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport SVGActionWriter::~SVGActionWriter() { DBG_ASSERT( !mpContext, "Not all contexts are closed" ); - delete mpVDev; + mpVDev.disposeAndClear(); } long SVGActionWriter::ImplMap( sal_Int32 nVal ) const diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index a74ca3032de4..2de237a268b2 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -178,7 +178,7 @@ class SVGTextWriter private: SVGExport& mrExport; SVGAttributeWriter* mpContext; - VirtualDevice* mpVDev; + VclPtr mpVDev; bool mbIsTextShapeStarted; Reference mrTextShape; OUString msShapeId; @@ -303,7 +303,7 @@ private: SVGFontExport& mrFontExport; SVGAttributeWriter* mpContext; SVGTextWriter maTextWriter; - VirtualDevice* mpVDev; + VclPtr mpVDev; MapMode maTargetMapMode; sal_uInt32 mnInnerMtfCount; bool mbClipAttrChanged; -- cgit