diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-31 20:57:16 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:27:16 +0100 |
commit | 5d133eb62187ae910772ff5dfeb8f2c3276e8481 (patch) | |
tree | de10fa41a70071dfb3e36ed061e19328e883d206 /cppcanvas | |
parent | Fix misc. issues in lifecycle unit tests. (diff) | |
download | core-5d133eb62187ae910772ff5dfeb8f2c3276e8481.tar.gz core-5d133eb62187ae910772ff5dfeb8f2c3276e8481.zip |
first half of non-scriptable, Instance constructor conversion.
Change-Id: If73bb41bfa805e22609748f25971724b4778edb3
Diffstat (limited to 'cppcanvas')
-rw-r--r-- | cppcanvas/qa/unit/test.cxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx index 684980a78321..fa7b21e2ceaa 100644 --- a/cppcanvas/qa/unit/test.cxx +++ b/cppcanvas/qa/unit/test.cxx @@ -43,7 +43,7 @@ public: void CanvasTest::testComposite() { #ifdef LINUX - VclPtr<vcl::Window> pWin(new WorkWindow( (vcl::Window *)NULL )); + VclPtrInstance<WorkWindow> pWin( nullptr ); uno::Reference<rendering::XCanvas> xCanvas = pWin->GetCanvas (); if( !xCanvas.is() ) diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 74a9505bcf08..51a8c32b4568 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -242,8 +242,8 @@ namespace cppcanvas // render our content into an appropriately sized // VirtualDevice with alpha channel - ScopedVclPtr<VirtualDevice> aVDev(new VirtualDevice( - *::Application::GetDefaultDevice(), 0, 0 )); + ScopedVclPtrInstance<VirtualDevice> aVDev( + *::Application::GetDefaultDevice(), 0, 0 ); aVDev->SetOutputSizePixel( aBitmapSizePixel ); aVDev->SetMapMode(); |