diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sfx2/source/dialog/navigat.cxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sfx2/source/dialog/navigat.cxx')
-rw-r--r-- | sfx2/source/dialog/navigat.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 , |