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 /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 'cppcanvas')
| -rw-r--r-- | cppcanvas/qa/unit/test.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/vclfactory.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx index 06d8d6ea81aa..02a361692f76 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<Window> pWin(new WorkWindow( (Window *)NULL )); + boost::scoped_ptr<vcl::Window> pWin(new WorkWindow( (vcl::Window *)NULL )); uno::Reference<rendering::XCanvas> xCanvas = pWin->GetCanvas (); if( !xCanvas.is() ) diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index d27afa18099d..0b5f7c33fd80 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -71,7 +71,7 @@ namespace cppcanvas new internal::ImplBitmapCanvas( xCanvas ) ); } - SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const ::Window& rVCLWindow ) const + SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow ) const { return SpriteCanvasSharedPtr( new internal::ImplSpriteCanvas( |