diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-31 23:04:14 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:40:25 +0100 |
| commit | 8a65284fe31e6c0a927cb88b75df7845cd248572 (patch) | |
| tree | 0427685579288f412d1890619e8bc224339bb228 /slideshow | |
| parent | d46e0d9656670dcd7dcca2f32062606400ff6246 (diff) | |
Automated conversion of VclPtr construction to use Instance template.
Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/rehearsetimingsactivity.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index ad3535f0386a..46fa58df63be 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -159,7 +159,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte maFont.SetColor( COL_BLACK ); // determine sprite size (in pixel): - ScopedVclPtr<VirtualDevice> blackHole( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > blackHole; blackHole->EnableOutput(false); blackHole->SetFont( maFont ); blackHole->SetMapMode( MAP_PIXEL ); @@ -444,7 +444,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) // create the MetaFile: GDIMetaFile metaFile; - ScopedVclPtr<VirtualDevice> blackHole( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > blackHole; metaFile.Record( blackHole ); metaFile.SetPrefSize( Size( 1, 1 ) ); blackHole->EnableOutput(false); diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index b4a7833378c5..c38a45777a47 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -286,12 +286,12 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, // normalize animations to n bitmaps of same size. An Animation, // though, can contain bitmaps of varying sizes and different // update modes) - ScopedVclPtr<VirtualDevice> pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; pVDev->SetOutputSizePixel( aAnimSize ); pVDev->EnableMapMode( false ); // setup mask VDev (alpha VDev is currently rather slow) - ScopedVclPtr<VirtualDevice> pVDevMask( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDevMask; pVDevMask->SetOutputSizePixel( aAnimSize ); pVDevMask->EnableMapMode( false ); |