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 /drawinglayer | |
| parent | d46e0d9656670dcd7dcca2f32062606400ff6246 (diff) | |
Automated conversion of VclPtr construction to use Instance template.
Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e
Diffstat (limited to 'drawinglayer')
4 files changed, 6 insertions, 6 deletions
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index bb84b292ab26..d782962fa11d 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -116,7 +116,7 @@ namespace drawinglayer if(nSizeX > 0 && nSizeY > 0) { // prepare VirtualDevice - ScopedVclPtr<VirtualDevice> aVirtualDevice(new VirtualDevice(*Application::GetDefaultDevice())); + ScopedVclPtrInstance< VirtualDevice > aVirtualDevice(*Application::GetDefaultDevice()); const Size aSizePixel(nSizeX, nSizeY); aVirtualDevice->SetOutputSizePixel(aSizePixel); diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 1f6ee8d82f9a..7ed0045f778a 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -96,8 +96,8 @@ namespace // with a step count of zero if(maAnimation.Count()) { - ScopedVclPtr<VirtualDevice> aVirtualDevice(new VirtualDevice(*Application::GetDefaultDevice())); - ScopedVclPtr<VirtualDevice> aVirtualDeviceMask(new VirtualDevice(*Application::GetDefaultDevice(), 1L)); + ScopedVclPtrInstance< VirtualDevice > aVirtualDevice(*Application::GetDefaultDevice()); + ScopedVclPtrInstance< VirtualDevice > aVirtualDeviceMask(*Application::GetDefaultDevice(), 1L); // Prepare VirtualDevices and their states aVirtualDevice->EnableMapMode(false); diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 8b26870142ec..4c8df82cf393 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -252,7 +252,7 @@ namespace drawinglayer const Rectangle aPrimitiveRectangle( basegfx::fround(aPrimitiveRange.getMinX()), basegfx::fround(aPrimitiveRange.getMinY()), basegfx::fround(aPrimitiveRange.getMaxX()), basegfx::fround(aPrimitiveRange.getMaxY())); - ScopedVclPtr<VirtualDevice> aContentVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > aContentVDev; MapMode aNewMapMode(pLastOutputDevice->GetMapMode()); mpOutputDevice = aContentVDev.get(); @@ -2016,7 +2016,7 @@ namespace drawinglayer const Rectangle aRectPixel(mpOutputDevice->LogicToPixel(aRectLogic)); Size aSizePixel(aRectPixel.GetSize()); const Point aEmptyPoint; - ScopedVclPtr<VirtualDevice> aBufferDevice( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > aBufferDevice; const sal_uInt32 nMaxQuadratPixels(500000); const sal_uInt32 nViewVisibleArea(aSizePixel.getWidth() * aSizePixel.getHeight()); double fReduceFactor(1.0); diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index e64f7d3d84e0..2dd3d9d8d2ee 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -73,7 +73,7 @@ namespace drawinglayer const Point aEmptyPoint; const Size aSizePixel(nDiscreteWidth, nDiscreteHeight); geometry::ViewInformation2D aViewInformation2D(rViewInformation2D); - ScopedVclPtr<VirtualDevice> maContent(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > maContent; // prepare vdev maContent->SetOutputSizePixel(aSizePixel, false); |