Fix OutputDevice members / stack allocation: slideshow, starmath, sd, sc.

Change-Id: I6d6d41b8a6501ce7d35c78e5b730ea45143d6b73

2 files changed, 41 insertions, 41 deletions

diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 72d6db281812..ad3535f0386a 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -159,13 +159,13 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
     maFont.SetColor( COL_BLACK );
 
     // determine sprite size (in pixel):
-    VirtualDevice blackHole;
-    blackHole.EnableOutput(false);
-    blackHole.SetFont( maFont );
-    blackHole.SetMapMode( MAP_PIXEL );
+    ScopedVclPtr<VirtualDevice> blackHole( new VirtualDevice() );
+    blackHole->EnableOutput(false);
+    blackHole->SetFont( maFont );
+    blackHole->SetMapMode( MAP_PIXEL );
     Rectangle rect;
-    const FontMetric metric( blackHole.GetFontMetric() );
-    blackHole.GetTextBoundRect( rect, OUString("XX:XX:XX") );
+    const FontMetric metric( blackHole->GetFontMetric() );
+    blackHole->GetTextBoundRect( rect, OUString("XX:XX:XX") );
     maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
     maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 );
     mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20));
@@ -444,30 +444,30 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas )
 
     // create the MetaFile:
     GDIMetaFile metaFile;
-    VirtualDevice blackHole;
-    metaFile.Record( &blackHole );
+    ScopedVclPtr<VirtualDevice> blackHole( new VirtualDevice() );
+    metaFile.Record( blackHole );
     metaFile.SetPrefSize( Size( 1, 1 ) );
-    blackHole.EnableOutput(false);
-    blackHole.SetMapMode( MAP_PIXEL );
-    blackHole.SetFont( maFont );
+    blackHole->EnableOutput(false);
+    blackHole->SetMapMode( MAP_PIXEL );
+    blackHole->SetFont( maFont );
     Rectangle rect = Rectangle( 0,0,
                                 maSpriteSizePixel.getX(),
                                 maSpriteSizePixel.getY());
     if (mbDrawPressed)
     {
-        blackHole.SetTextColor( COL_BLACK );
-        blackHole.SetFillColor( COL_LIGHTGRAY );
-        blackHole.SetLineColor( COL_GRAY );
+        blackHole->SetTextColor( COL_BLACK );
+        blackHole->SetFillColor( COL_LIGHTGRAY );
+        blackHole->SetLineColor( COL_GRAY );
     }
     else
     {
-        blackHole.SetTextColor( COL_BLACK );
-        blackHole.SetFillColor( COL_WHITE );
-        blackHole.SetLineColor( COL_GRAY );
+        blackHole->SetTextColor( COL_BLACK );
+        blackHole->SetFillColor( COL_WHITE );
+        blackHole->SetLineColor( COL_GRAY );
     }
-    blackHole.DrawRect( rect );
-    blackHole.GetTextBoundRect( rect, time );
-    blackHole.DrawText(
+    blackHole->DrawRect( rect );
+    blackHole->GetTextBoundRect( rect, time );
+    blackHole->DrawText(
         Point( (maSpriteSizePixel.getX() - rect.getWidth()) / 2,
                mnYOffset ), time );
 
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index f3a52ca300f3..b4a7833378c5 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -286,14 +286,14 @@ 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)
-    VirtualDevice aVDev;
-    aVDev.SetOutputSizePixel( aAnimSize );
-    aVDev.EnableMapMode( false );
+    ScopedVclPtr<VirtualDevice> pVDev( new VirtualDevice() );
+    pVDev->SetOutputSizePixel( aAnimSize );
+    pVDev->EnableMapMode( false );
 
     // setup mask VDev (alpha VDev is currently rather slow)
-    VirtualDevice aVDevMask;
-    aVDevMask.SetOutputSizePixel( aAnimSize );
-    aVDevMask.EnableMapMode( false );
+    ScopedVclPtr<VirtualDevice> pVDevMask( new VirtualDevice() );
+    pVDevMask->SetOutputSizePixel( aAnimSize );
+    pVDevMask->EnableMapMode( false );
 
     switch( aAnimation.GetCycleMode() )
     {
@@ -329,23 +329,23 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
         {
             case DISPOSE_NOT:
             {
-                aVDev.DrawBitmapEx(rAnimBmp.aPosPix,
+                pVDev->DrawBitmapEx(rAnimBmp.aPosPix,
                                    rAnimBmp.aBmpEx);
                 Bitmap aMask = rAnimBmp.aBmpEx.GetMask();
 
                 if( aMask.IsEmpty() )
                 {
                     const Rectangle aRect(aEmptyPoint,
-                                          aVDevMask.GetOutputSizePixel());
+                                          pVDevMask->GetOutputSizePixel());
                     const Wallpaper aWallpaper(COL_BLACK);
-                    aVDevMask.DrawWallpaper(aRect,
+                    pVDevMask->DrawWallpaper(aRect,
                                             aWallpaper);
                 }
                 else
                 {
                     BitmapEx aTmpMask = BitmapEx(aMask,
                                                  aMask);
-                    aVDevMask.DrawBitmapEx(rAnimBmp.aPosPix,
+                    pVDevMask->DrawBitmapEx(rAnimBmp.aPosPix,
                                            aTmpMask );
                 }
                 break;
@@ -357,35 +357,35 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
                 const Bitmap aMask(rAnimBmp.aBmpEx.GetMask());
                 const Bitmap aContent(rAnimBmp.aBmpEx.GetBitmap());
 
-                aVDevMask.Erase();
-                aVDev.DrawBitmap(rAnimBmp.aPosPix, aContent);
+                pVDevMask->Erase();
+                pVDev->DrawBitmap(rAnimBmp.aPosPix, aContent);
 
                 if(aMask.IsEmpty())
                 {
                     const Rectangle aRect(rAnimBmp.aPosPix, aContent.GetSizePixel());
-                    aVDevMask.SetFillColor(COL_BLACK);
-                    aVDevMask.SetLineColor();
-                    aVDevMask.DrawRect(aRect);
+                    pVDevMask->SetFillColor(COL_BLACK);
+                    pVDevMask->SetLineColor();
+                    pVDevMask->DrawRect(aRect);
                 }
                 else
                 {
-                    aVDevMask.DrawBitmap(rAnimBmp.aPosPix, aMask);
+                    pVDevMask->DrawBitmap(rAnimBmp.aPosPix, aMask);
                 }
                 break;
             }
 
             case DISPOSE_FULL:
             {
-                aVDev.DrawBitmapEx(rAnimBmp.aPosPix,
+                pVDev->DrawBitmapEx(rAnimBmp.aPosPix,
                                    rAnimBmp.aBmpEx);
                 break;
             }
 
             case DISPOSE_PREVIOUS :
             {
-                aVDev.DrawBitmapEx(rAnimBmp.aPosPix,
+                pVDev->DrawBitmapEx(rAnimBmp.aPosPix,
                                    rAnimBmp.aBmpEx);
-                aVDevMask.DrawBitmap(rAnimBmp.aPosPix,
+                pVDevMask->DrawBitmap(rAnimBmp.aPosPix,
                                      rAnimBmp.aBmpEx.GetMask());
                 break;
             }
@@ -397,10 +397,10 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
         pMtf->AddAction(
             new MetaBmpExAction( aEmptyPoint,
                                  BitmapEx(
-                                     aVDev.GetBitmap(
+                                     pVDev->GetBitmap(
                                          aEmptyPoint,
                                          aAnimSize ),
-                                     aVDevMask.GetBitmap(
+                                     pVDevMask->GetBitmap(
                                          aEmptyPoint,
                                          aAnimSize ))));