From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin 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/sfx2/navigat.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/sfx2/navigat.hxx') diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 9d40799f40e1..37f7a144dce9 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -27,7 +27,7 @@ class SfxNavigatorWrapper : public SfxChildWindow { public: - SfxNavigatorWrapper( Window* pParent , + SfxNavigatorWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow public: SfxNavigator( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ); virtual void Resize() SAL_OVERRIDE; -- cgit