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 /sw/source/uibase/inc/unotools.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 'sw/source/uibase/inc/unotools.hxx')
-rw-r--r-- | sw/source/uibase/inc/unotools.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index b01c859d4f13..2fd2b4384280 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -39,7 +39,7 @@ class SwFrmCtrlWindow : public VclEventBox { SwOneExampleFrame* pExampleFrame; public: - SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame); + SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwOneExampleFrame SAL_DLLPRIVATE void DisposeControl(); public: - SwOneExampleFrame(Window& rWin, + SwOneExampleFrame(vcl::Window& rWin, sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT, const Link* pInitalizedLink = 0, const OUString* pURL = 0); @@ -113,7 +113,7 @@ public: void CreatePopup(const Point& rPt); - static void CreateErrorMessage(Window* pParent); + static void CreateErrorMessage(vcl::Window* pParent); }; #endif |