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
---
 sw/source/uibase/dbui/mailmergechildwindow.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sw/source/uibase/dbui/mailmergechildwindow.cxx')

diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index f52bf6298d21..caaec215a799 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
 
 SFX_IMPL_FLOATINGWINDOW( SwMailMergeChildWindow, FN_MAILMERGE_CHILDWINDOW )
 
-SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent,
+SwMailMergeChildWindow::SwMailMergeChildWindow( vcl::Window* _pParent,
                                 sal_uInt16 nId,
                                 SfxBindings* pBindings,
                                 SfxChildWinInfo* pInfo ) :
@@ -64,7 +64,7 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent,
 }
 
 SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings,
-    SfxChildWindow* pChild, Window *pParent)
+    SfxChildWindow* pChild, vcl::Window *pParent)
     : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingMMChild",
                         "modules/swriter/ui/floatingmmchild.ui")
 {
-- 
cgit