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/inc/PostItMgr.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sw/inc/PostItMgr.hxx')

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 3d3cda92c1ff..b7c7f052a9a9 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -57,7 +57,7 @@ namespace sw { namespace sidebarwindows {
 }}
 class SwSidebarItem;
 class SwFrm;
-class Window;
+namespace vcl { class Window; }
 struct ImplSVEvent;
 
 #define SORT_POS    1
@@ -282,10 +282,10 @@ class SwPostItMgr: public SfxListener
             void DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
                                               sw::sidebarwindows::SwSidebarWin& rSidebarWin );
             bool HasFrmConnectedSidebarWins( const SwFrm& rFrm );
-            Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm,
+            vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm,
                                                 const sal_Int32 nIndex );
             void GetAllSidebarWinForFrm( const SwFrm& rFrm,
-                                         std::vector< Window* >* pChildren );
+                                         std::vector< vcl::Window* >* pChildren );
 
             void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
 };
-- 
cgit