From c72fac269626cd4c2c3f62a6eed69e47b59256a4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 16 Mar 2015 12:17:44 +0200 Subject: vclwidget: convert lots more sites to use VclPtr seems there was a lot of shared_ptr usage floating around... Change-Id: Icd05243170eb8493709275fc36bf986fc194b781 --- slideshow/source/engine/shapes/viewmediashape.hxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index a512a96e8c57..1dc8f32aab9e 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -26,6 +26,7 @@ #include #include #include +#include #include "viewlayer.hxx" @@ -147,8 +148,8 @@ namespace slideshow const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rVCLDeviceParams, const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; - ::std::unique_ptr< SystemChildWindow > mpMediaWindow; - boost::scoped_ptr< ::vcl::Window > mpEventHandlerParent; + VclPtr< SystemChildWindow > mpMediaWindow; + VclPtr< ::vcl::Window > mpEventHandlerParent; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; -- cgit From 8fa63f31ab84131fc1551563ae5d9bf86208c906 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 19 Mar 2015 15:39:43 +0000 Subject: Fix OutputDevice members / stack allocation: slideshow, starmath, sd, sc. Change-Id: I6d6d41b8a6501ce7d35c78e5b730ea45143d6b73 --- .../source/engine/rehearsetimingsactivity.cxx | 40 ++++++++++----------- slideshow/source/engine/shapes/gdimtftools.cxx | 42 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'slideshow') 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 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 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 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 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 )))); -- cgit From 8a65284fe31e6c0a927cb88b75df7845cd248572 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 31 Mar 2015 23:04:14 +0100 Subject: Automated conversion of VclPtr construction to use Instance template. Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e --- slideshow/source/engine/rehearsetimingsactivity.cxx | 4 ++-- slideshow/source/engine/shapes/gdimtftools.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'slideshow') 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 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 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 pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; pVDev->SetOutputSizePixel( aAnimSize ); pVDev->EnableMapMode( false ); // setup mask VDev (alpha VDev is currently rather slow) - ScopedVclPtr pVDevMask( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDevMask; pVDevMask->SetOutputSizePixel( aAnimSize ); pVDevMask->EnableMapMode( false ); -- cgit From 5430eb76db1ca40248717bcbee6b65e56c1a0e9b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 16 Apr 2015 20:50:12 +0100 Subject: slideshow: convert new to ::Create to get initial ref-counting right. Change-Id: I513dacfa0dd2e902437578611b6d39575f2e7314 --- slideshow/source/engine/shapes/viewmediashape.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index afddec0b6b51..f026b21a8eb2 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -471,20 +471,20 @@ namespace slideshow #else if( avmedia::IsModel(rMimeType) ) { - mpEventHandlerParent.reset(new vcl::Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); + mpEventHandlerParent.reset(VclPtr::Create(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); mpEventHandlerParent->EnablePaint(false); mpEventHandlerParent->Show(); SystemWindowData aWinData = OpenGLContext::generateWinData(mpEventHandlerParent.get(), false); - mpMediaWindow.reset(new SystemChildWindow(mpEventHandlerParent.get(), 0, &aWinData)); + mpMediaWindow.reset(VclPtr::Create(mpEventHandlerParent.get(), 0, &aWinData)); mpMediaWindow->SetPosSizePixel( Point( 0, 0 ), Size( aAWTRect.Width, aAWTRect.Height ) ); } else #endif { - mpMediaWindow.reset( new SystemChildWindow( pWindow, WB_CLIPCHILDREN ) ); + mpMediaWindow.reset( VclPtr::Create( pWindow, WB_CLIPCHILDREN ) ); mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); } -- cgit