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
---
 include/svx/optgrid.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/svx/optgrid.hxx')

diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 86e5e1d5ee96..1d6e62b6c0f5 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -100,9 +100,9 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 public:
-    SvxGridTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet& rAttrSet );
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
-- 
cgit