diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 17:21:42 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:22:58 +0100 |
commit | b129ee5021b7f56dfd936d53a46d274880edc0a9 (patch) | |
tree | 6a4ba9d0c514c7bad71be91c9e60ca7512b46885 /canvas | |
parent | 23d833dd3fba1c05a7d7552de6037cf3723bbfcc (diff) |
Move OutputDevice members to VclPtr: dbaccess, canvas.
Change-Id: Iae01ddcb6a0cde3be1bd79200e9177983be2f924
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 2 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.hxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_devicehelper.hxx | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 62bf3e2a3a46..be07a54e3c56 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -63,7 +63,7 @@ namespace cairocanvas // adjust to stretched/shrunk font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) { - OutputDevice* pOutDev( mpRefDevice->getOutputDevice() ); + VclPtr<OutputDevice> pOutDev( mpRefDevice->getOutputDevice() ); if( pOutDev ) { diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 6157ea671020..7a918f4b38be 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -83,7 +83,7 @@ namespace cairocanvas { mpSurface.reset(); mpCairo.reset(); - mpVirtualDevice.reset(); + mpVirtualDevice.disposeAndClear(); mpDevice = NULL; mpSurfaceProvider = NULL; } @@ -105,7 +105,7 @@ namespace cairocanvas void CanvasHelper::setSurface( const SurfaceSharedPtr& pSurface, bool bHasAlpha ) { mbHaveAlpha = bHasAlpha; - mpVirtualDevice.reset(); + mpVirtualDevice.disposeAndClear(); mpSurface = pSurface; mpCairo = pSurface->getCairo(); } diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index b67904d6ebf5..ed6f702a53aa 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -28,6 +28,8 @@ #include <basegfx/vector/b2dsize.hxx> #include <com/sun/star/rendering/XLinePolyPolygon2D.hpp> +#include <vcl/vclptr.hxx> +#include <vcl/virdev.hxx> #include <boost/utility.hpp> #include <vcl/cairo.hxx> @@ -269,7 +271,7 @@ namespace cairocanvas private: - boost::shared_ptr<VirtualDevice> mpVirtualDevice; + VclPtr<VirtualDevice> mpVirtualDevice; void useStates( const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index f3c4c05083c3..2a98ea7b6e09 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -175,7 +175,7 @@ namespace cairocanvas class DeviceSettingsGuard { private: - OutputDevice *mpVirtualDevice; + VclPtr<OutputDevice> mpVirtualDevice; cairo_t *mpCairo; bool mbMappingWasEnabled; public: @@ -272,7 +272,7 @@ namespace cairocanvas cairo_fill(mpCairo.get()); #endif ::Point aOutpos; - if( !setupTextOutput( *mpVirtualDevice, pOwner, aOutpos, viewState, renderState, xFont ) ) + if( !setupTextOutput( *mpVirtualDevice.get(), pOwner, aOutpos, viewState, renderState, xFont ) ) return uno::Reference< rendering::XCachedPrimitive >(NULL); // no output necessary // change text direction and layout mode diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 9e7ba2e13ca5..684b61afcf2c 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -209,7 +209,7 @@ namespace cairocanvas uno::Any DeviceHelper::getDeviceHandle() const { - return uno::makeAny( reinterpret_cast< sal_Int64 >(mpRefDevice) ); + return uno::makeAny( reinterpret_cast< sal_Int64 >(mpRefDevice.get()) ); } uno::Any DeviceHelper::getSurfaceHandle() const diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index 81f71810d61d..eafc5065e10b 100644 --- a/canvas/source/cairo/cairo_devicehelper.hxx +++ b/canvas/source/cairo/cairo_devicehelper.hxx @@ -116,7 +116,7 @@ namespace cairocanvas */ SurfaceProvider* mpSurfaceProvider; - OutputDevice* mpRefDevice; + VclPtr<OutputDevice> mpRefDevice; ::cairo::SurfaceSharedPtr mpSurface; }; } |