diff options
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/qa/unit/test.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 12 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx index 02a361692f76..6b909e058a44 100644 --- a/cppcanvas/qa/unit/test.cxx +++ b/cppcanvas/qa/unit/test.cxx @@ -43,7 +43,7 @@ public: void CanvasTest::testComposite() { #ifdef LINUX - boost::scoped_ptr<vcl::Window> pWin(new WorkWindow( (vcl::Window *)NULL )); + VclPtrInstance<WorkWindow> pWin( nullptr, WB_STDWORK ); uno::Reference<rendering::XCanvas> xCanvas = pWin->GetCanvas (); if( !xCanvas.is() ) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9e93995ed2af..9aeabbaefde3 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2908,16 +2908,16 @@ namespace cppcanvas VectorOfOutDevStates aStateStack; - VirtualDevice aVDev; - aVDev.EnableOutput( false ); + ScopedVclPtrInstance< VirtualDevice > aVDev; + aVDev->EnableOutput( false ); // Setup VDev for state tracking and mapping // ========================================= - aVDev.SetMapMode( rMtf.GetPrefMapMode() ); + aVDev->SetMapMode( rMtf.GetPrefMapMode() ); const Size aMtfSize( rMtf.GetPrefSize() ); - const Size aMtfSizePixPre( aVDev.LogicToPixel( aMtfSize, + const Size aMtfSizePixPre( aVDev->LogicToPixel( aMtfSize, rMtf.GetPrefMapMode() ) ); // #i44110# correct null-sized output - there are shapes @@ -2928,7 +2928,7 @@ namespace cppcanvas sal_Int32 nCurrActions(0); ActionFactoryParameters aParms(aStateStack, rCanvas, - aVDev, + *aVDev.get(), rParams, nCurrActions ); @@ -2942,7 +2942,7 @@ namespace cppcanvas 1.0 / aMtfSizePix.Height() ); tools::calcLogic2PixelAffineTransform( aStateStack.getState().mapModeTransform, - aVDev ); + *aVDev.get() ); ColorSharedPtr pColor( getCanvas()->createColor() ); diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 8237a12216b4..a943e36a198c 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -242,10 +242,10 @@ namespace cppcanvas // render our content into an appropriately sized // VirtualDevice with alpha channel - VirtualDevice aVDev( + ScopedVclPtrInstance<VirtualDevice> aVDev( *::Application::GetDefaultDevice(), 0, 0 ); - aVDev.SetOutputSizePixel( aBitmapSizePixel ); - aVDev.SetMapMode(); + aVDev->SetOutputSizePixel( aBitmapSizePixel ); + aVDev->SetMapMode(); if( rSubset.mnSubsetBegin != 0 || rSubset.mnSubsetEnd != -1 ) @@ -334,7 +334,7 @@ namespace cppcanvas } } - aVDev.DrawTransparent( aMtf, + aVDev->DrawTransparent( aMtf, aEmptyPoint, aOutputSizePixel, *mpAlphaGradient ); @@ -342,7 +342,7 @@ namespace cppcanvas else { // no subsetting - render whole mtf - aVDev.DrawTransparent( *mpGroupMtf, + aVDev->DrawTransparent( *mpGroupMtf, aEmptyPoint, aOutputSizePixel, *mpAlphaGradient ); @@ -352,7 +352,7 @@ namespace cppcanvas // update buffered bitmap and transformation BitmapSharedPtr aBmp( VCLFactory::createBitmap( mpCanvas, - aVDev.GetBitmapEx( + aVDev->GetBitmapEx( aEmptyPoint, aBitmapSizePixel ) ) ); mxBufferBitmap = aBmp->getUNOBitmap(); |