diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-10 16:13:34 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-10 16:13:34 +0200 |
commit | 7a1fad0d4f6b95c9beafa9c34f34b70bb9a0c9ed (patch) | |
tree | 10280a4d4cde82967bba69ee1fe0f4a9db71bc9c /sw | |
parent | 3bf4ada33f09e155f3350602e7a4b6cec77e40f0 (diff) |
convert ScopedVclPtr to ScopedVclPtrInstance
Change-Id: I22a9d9c313a81ccee885b9c8785d4b008a6f2058
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/tiledrendering/tiledrendering.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8gr.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 2fddd6c33691..af67aee607d8 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -131,7 +131,7 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) // SystemGraphicsData aData; // [setup the aData] // VirtualDevice pDevice(&aData, [color depth]); - ScopedVclPtr< VirtualDevice > pDevice(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > pDevice; // paint to it pViewShell->PaintTile(*pDevice.get(), contextWidth, contextHeight, tilePosX, tilePosY, tileWidth, tileHeight); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index d8ec94862bd0..3ed004c9a617 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1239,7 +1239,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co Point aPt; GetGrfSize( aSz ); - ScopedVclPtr< VirtualDevice > pVirtDev(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > pVirtDev; pVirtDev->EnableOutput( false ); MapMode aTmp( GetWin()->GetMapMode() ); @@ -1266,7 +1266,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co // Otherwise it could happen that for vector graphics // many MB's of memory are allocated. const Size aSz( FindFlyFrm()->Prt().SSize() ); - ScopedVclPtr< VirtualDevice > pVirtDev(new VirtualDevice(*GetWin())); + ScopedVclPtrInstance< VirtualDevice > pVirtDev(*GetWin()); MapMode aTmp( MAP_TWIP ); pVirtDev->SetMapMode( aTmp ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index c22ab509338a..3afc80497d00 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7640,7 +7640,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pFirst); OutputDevice *pOld = pSh->GetOut(); - ScopedVclPtr< VirtualDevice > pDev( new VirtualDevice( *pOld ) ); + ScopedVclPtrInstance< VirtualDevice > pDev( *pOld ); pDev->EnableOutput( false ); GDIMetaFile aMet; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 2d3db2b581fb..77bd84f96805 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -726,7 +726,7 @@ void SwWW8WrGrf::WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rGrfNd, { case GRAPHIC_BITMAP: // Bitmap -> play in Metafile { - ScopedVclPtr< VirtualDevice > pVirt(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > pVirt; aMeta.Record(pVirt.get()); pVirt->DrawBitmap( Point( 0,0 ), rGrf.GetBitmap() ); aMeta.Stop(); @@ -854,7 +854,7 @@ void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uIn { case GRAPHIC_BITMAP: // Bitmap -> in Metafile abspielen { - ScopedVclPtr< VirtualDevice > pVirt(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > pVirt; aMeta.Record(pVirt.get()); pVirt->DrawBitmap( Point( 0,0 ), rGrf.GetBitmap() ); aMeta.Stop(); |