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/inc/srcedtw.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sw/source/uibase/inc/srcedtw.hxx')

diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 2bb3c368b5db..8cb2ea611bdd 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -37,7 +37,7 @@ class TextEngine;
 class ExtTextView;
 class DataChangedEvent;
 
-class TextViewOutWin : public Window
+class TextViewOutWin : public vcl::Window
 {
     ExtTextView*    pTextView;
 
@@ -51,7 +51,7 @@ protected:
     virtual void    DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
 
 public:
-        TextViewOutWin(Window* pParent, WinBits nBits) :
+        TextViewOutWin(vcl::Window* pParent, WinBits nBits) :
             Window(pParent, nBits), pTextView(0){}
 
     void    SetTextView( ExtTextView* pView ) {pTextView = pView;}
@@ -60,7 +60,7 @@ public:
 
 typedef std::set<sal_uInt16> SyntaxLineSet;
 
-class SwSrcEditWindow : public Window, public SfxListener
+class SwSrcEditWindow : public vcl::Window, public SfxListener
 {
 private:
     class ChangesListener;
@@ -115,7 +115,7 @@ protected:
     DECL_LINK(ScrollHdl, ScrollBar*);
 
 public:
-                    SwSrcEditWindow( Window* pParent, SwSrcView* pParentView );
+                    SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView );
                     virtual ~SwSrcEditWindow();
 
     void            SetScrollBarRanges();
-- 
cgit