From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 23 Sep 2014 11:20:40 +0200
Subject: fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
---
 tools/source/ref/errinf.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 3a9dfd9d7305..e61253d2e221 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -184,7 +184,7 @@ static void aDspFunc(const OUString &rErr, const OUString &rAction)
     OSL_FAIL(aErr.getStr());
 }
 
-ErrorContext::ErrorContext(Window *pWinP)
+ErrorContext::ErrorContext(vcl::Window *pWinP)
 {
     EDcrData *pData=EDcrData::GetData();
     ErrorContext *&pHdl=pData->pFirstCtx;
@@ -272,7 +272,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
     ErrorContext *pCtx=ErrorContext::GetContext();
     if(pCtx)
         pCtx->GetString(pInfo->GetErrorCode(), aAction);
-    Window *pParent=0;
+    vcl::Window *pParent=0;
     // Remove parent from context
     for(;pCtx;pCtx=pCtx->pNext)
         if(pCtx->GetParent())
-- 
cgit