diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
| commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
| tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /vcl/source/gdi/impanmvw.cxx | |
| parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) | |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'vcl/source/gdi/impanmvw.cxx')
| -rw-r--r-- | vcl/source/gdi/impanmvw.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index 6fac2e802ae5..c3e7b793580c 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -21,7 +21,6 @@ #include <vcl/virdev.hxx> #include <vcl/window.hxx> #include <tools/helpers.hxx> -#include <boost/scoped_ptr.hpp> ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -155,7 +154,7 @@ void ImplAnimView::getPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size void ImplAnimView::drawToPos( sal_uLong nPos ) { VirtualDevice aVDev; - boost::scoped_ptr<vcl::Region> pOldClip(!maClip.IsNull() ? new vcl::Region( mpOut->GetClipRegion() ) : NULL); + std::unique_ptr<vcl::Region> xOldClip(!maClip.IsNull() ? new vcl::Region( mpOut->GetClipRegion() ) : NULL); aVDev.SetOutputSizePixel( maSzPix, false ); nPos = std::min( nPos, (sal_uLong) mpParent->Count() - 1UL ); @@ -163,13 +162,13 @@ void ImplAnimView::drawToPos( sal_uLong nPos ) for( sal_uLong i = 0UL; i <= nPos; i++ ) draw( i, &aVDev ); - if( pOldClip ) + if (xOldClip) mpOut->SetClipRegion( maClip ); mpOut->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, aVDev ); - if( pOldClip ) - mpOut->SetClipRegion( *pOldClip ); + if (xOldClip) + mpOut->SetClipRegion(*xOldClip); } void ImplAnimView::draw( sal_uLong nPos, VirtualDevice* pVDev ) @@ -261,17 +260,17 @@ void ImplAnimView::draw( sal_uLong nPos, VirtualDevice* pVDev ) if( !pVDev ) { - boost::scoped_ptr<vcl::Region> pOldClip(!maClip.IsNull() ? new vcl::Region( mpOut->GetClipRegion() ) : NULL); + std::unique_ptr<vcl::Region> xOldClip(!maClip.IsNull() ? new vcl::Region( mpOut->GetClipRegion() ) : NULL); - if( pOldClip ) + if (xOldClip) mpOut->SetClipRegion( maClip ); mpOut->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *pDev ); - if( pOldClip ) + if( xOldClip) { - mpOut->SetClipRegion( *pOldClip ); - pOldClip.reset(); + mpOut->SetClipRegion(*xOldClip); + xOldClip.reset(); } delete pDev; |