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 /framework/source/inc/pattern | |
| 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 'framework/source/inc/pattern')
| -rw-r--r-- | framework/source/inc/pattern/window.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 71744ed546ec..43afe9d9f20a 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -51,7 +51,7 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x { SolarMutexGuard aSolarGuard; - Window* pWindow = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is necessary to guarantee correct pointer cast! if (pWindow!=NULL && pWindow->IsSystemWindow()) { @@ -77,7 +77,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // SOLAR SAFE -> ---------------------------- SolarMutexGuard aSolarGuard; - Window* pWindow = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is necessary to guarantee correct pointer cast! if ( (pWindow ) && @@ -107,7 +107,7 @@ static bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( SolarMutexGuard aSolarGuard; - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( (pWindow ) && (pWindow->IsSystemWindow()) |