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/view/impviewframe.hxx | |
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/view/impviewframe.hxx')
-rw-r--r-- | sfx2/source/view/impviewframe.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index d91a3a39725e..a1debee4f458 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -35,9 +35,9 @@ struct SfxViewFrame_Impl OUString aActualURL; SfxFrame& rFrame; svtools::AsynchronLink* pReloader; - Window* pWindow; + vcl::Window* pWindow; SfxViewFrame* pActiveChild; - Window* pFocusWin; + vcl::Window* pFocusWin; sal_uInt16 nDocViewNo; sal_uInt16 nCurViewId; bool bResizeInToOut:1; @@ -79,12 +79,12 @@ struct SfxViewFrame_Impl } }; -class SfxFrameViewWindow_Impl : public Window +class SfxFrameViewWindow_Impl : public vcl::Window { SfxViewFrame* pFrame; public: - SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) : + SfxFrameViewWindow_Impl( SfxViewFrame* p, vcl::Window& rParent, WinBits nBits=0 ) : Window( &rParent, nBits | WB_CLIPCHILDREN ), pFrame( p ) { |