summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-19 17:21:42 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 12:22:58 +0100
commitb129ee5021b7f56dfd936d53a46d274880edc0a9 (patch)
tree6a4ba9d0c514c7bad71be91c9e60ca7512b46885 /vcl
parent23d833dd3fba1c05a7d7552de6037cf3723bbfcc (diff)
Move OutputDevice members to VclPtr: dbaccess, canvas.
Change-Id: Iae01ddcb6a0cde3be1bd79200e9177983be2f924
Diffstat (limited to 'vcl')
-rw-r--r--vcl/quartz/cairo_quartz_cairo.cxx4
-rw-r--r--vcl/quartz/cairo_quartz_cairo.hxx2
-rw-r--r--vcl/unx/generic/gdi/cairo_xlib_cairo.cxx4
-rw-r--r--vcl/unx/generic/gdi/cairo_xlib_cairo.hxx2
-rw-r--r--vcl/win/source/gdi/cairo_win32_cairo.cxx4
-rw-r--r--vcl/win/source/gdi/cairo_win32_cairo.hxx2
6 files changed, 9 insertions, 9 deletions
diff --git a/vcl/quartz/cairo_quartz_cairo.cxx b/vcl/quartz/cairo_quartz_cairo.cxx
index b3a05541c438..cec50a21b60d 100644
--- a/vcl/quartz/cairo_quartz_cairo.cxx
+++ b/vcl/quartz/cairo_quartz_cairo.cxx
@@ -244,12 +244,12 @@ namespace cairo
*
* @return The new virtual device
**/
- boost::shared_ptr<VirtualDevice> QuartzSurface::createVirtualDevice() const
+ VclPtr<VirtualDevice> QuartzSurface::createVirtualDevice() const
{
SystemGraphicsData aSystemGraphicsData;
aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
aSystemGraphicsData.rCGContext = getCGContext();
- return boost::shared_ptr<VirtualDevice>(
+ return VclPtr<VirtualDevice>(
new VirtualDevice( &aSystemGraphicsData, Size(1, 1), getDepth() ));
}
diff --git a/vcl/quartz/cairo_quartz_cairo.hxx b/vcl/quartz/cairo_quartz_cairo.hxx
index a3f94d20abf3..9c31c42c6ab9 100644
--- a/vcl/quartz/cairo_quartz_cairo.hxx
+++ b/vcl/quartz/cairo_quartz_cairo.hxx
@@ -55,7 +55,7 @@ namespace cairo {
virtual CairoSurfaceSharedPtr getCairoSurface() const { return mpSurface; }
virtual SurfaceSharedPtr getSimilar( Content aContent, int width, int height ) const;
- virtual boost::shared_ptr<VirtualDevice> createVirtualDevice() const;
+ virtual VclPtr<VirtualDevice> createVirtualDevice() const;
virtual void flush() const;
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index bf58b95bf4bb..99944d1909b6 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -257,7 +257,7 @@ namespace cairo
&cairo_surface_destroy )));
}
- boost::shared_ptr<VirtualDevice> X11Surface::createVirtualDevice() const
+ VclPtr<VirtualDevice> X11Surface::createVirtualDevice() const
{
SystemGraphicsData aSystemGraphicsData;
@@ -268,7 +268,7 @@ namespace cairo
int width = cairo_xlib_surface_get_width(mpSurface.get());
int height = cairo_xlib_surface_get_height(mpSurface.get());
- return boost::shared_ptr<VirtualDevice>(
+ return VclPtr<VirtualDevice>(
new VirtualDevice(&aSystemGraphicsData,
Size(width, height),
std::max(getDepth(), 0)));
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 166ebaf0a882..5be944f87e42 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -87,7 +87,7 @@ namespace cairo {
virtual CairoSurfaceSharedPtr getCairoSurface() const SAL_OVERRIDE { return mpSurface; }
virtual SurfaceSharedPtr getSimilar(int cairo_content_type, int width, int height) const SAL_OVERRIDE;
- virtual boost::shared_ptr<VirtualDevice> createVirtualDevice() const SAL_OVERRIDE;
+ virtual VclPtr<VirtualDevice> createVirtualDevice() const SAL_OVERRIDE;
virtual bool Resize( int width, int height ) SAL_OVERRIDE;
diff --git a/vcl/win/source/gdi/cairo_win32_cairo.cxx b/vcl/win/source/gdi/cairo_win32_cairo.cxx
index 9cf81c7002de..357106724e1a 100644
--- a/vcl/win/source/gdi/cairo_win32_cairo.cxx
+++ b/vcl/win/source/gdi/cairo_win32_cairo.cxx
@@ -170,13 +170,13 @@ namespace cairo
*
* @return The new virtual device
**/
- boost::shared_ptr<VirtualDevice> Win32Surface::createVirtualDevice() const
+ VclPtr<VirtualDevice> Win32Surface::createVirtualDevice() const
{
SystemGraphicsData aSystemGraphicsData;
aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
aSystemGraphicsData.hDC = cairo_win32_surface_get_dc( mpSurface.get() );
- return boost::shared_ptr<VirtualDevice>(
+ return VclPtr<VirtualDevice>(
new VirtualDevice( &aSystemGraphicsData, Size(1, 1), sal::static_int_cast<USHORT>(getDepth()) ));
}
diff --git a/vcl/win/source/gdi/cairo_win32_cairo.hxx b/vcl/win/source/gdi/cairo_win32_cairo.hxx
index dd1be37db7dd..5dee0eaa3dd8 100644
--- a/vcl/win/source/gdi/cairo_win32_cairo.hxx
+++ b/vcl/win/source/gdi/cairo_win32_cairo.hxx
@@ -43,7 +43,7 @@ namespace cairo {
virtual CairoSurfaceSharedPtr getCairoSurface() const { return mpSurface; }
virtual SurfaceSharedPtr getSimilar( int aContent, int width, int height ) const;
- virtual boost::shared_ptr<VirtualDevice> createVirtualDevice() const;
+ virtual VclPtr<VirtualDevice> createVirtualDevice() const;
virtual void flush() const;