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 /include/sfx2/module.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 'include/sfx2/module.hxx')
| -rw-r--r-- | include/sfx2/module.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index cf9130f97b8a..77ba76675543 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -46,7 +46,7 @@ struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; class SfxTabPage; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace frame { class XFrame; @@ -86,7 +86,7 @@ public: void RegisterMenuControl(SfxMenuCtrlFactory*); virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rSet ); virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; |