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 /canvas/source/opengl/ogl_spritecanvas.cxx | |
| parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
| download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip | |
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 'canvas/source/opengl/ogl_spritecanvas.cxx')
| -rw-r--r-- | canvas/source/opengl/ogl_spritecanvas.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index a7e255fa8dda..c378baeae21e 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -64,7 +64,7 @@ namespace oglcanvas uno::Reference< awt::XWindow > xParentWindow; maArguments[4] >>= xParentWindow; - Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if( !pParentWindow ) throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!", NULL); |