diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/cppcanvas | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/cppcanvas')
| -rw-r--r-- | include/cppcanvas/vclfactory.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index cb42627114ff..9d85248f9340 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -31,7 +31,7 @@ #include <cppcanvas/cppcanvasdllapi.h> -class Window; +namespace vcl { class Window; } class Bitmap; class BitmapEx; class Polygon; @@ -70,7 +70,7 @@ namespace cppcanvas BitmapCanvasSharedPtr createBitmapCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& xCanvas ); - SpriteCanvasSharedPtr createSpriteCanvas( const ::Window& rVCLWindow ) const; + SpriteCanvasSharedPtr createSpriteCanvas( const vcl::Window& rVCLWindow ) const; SpriteCanvasSharedPtr createSpriteCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >& xCanvas ) const; |