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 --- sfx2/source/dialog/navigat.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sfx2/source/dialog/navigat.cxx') diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 4c3f972bb15c..334e7771a786 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -28,7 +28,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); -SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , +SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -47,7 +47,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , SfxNavigator::SfxNavigator( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , -- cgit