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/app.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/app.hxx')
-rw-r--r-- | include/sfx2/app.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index ca2200067552..5c456af41ded 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -81,7 +81,7 @@ class SfxWorkWindow; class SfxFilterMatcher; class SfxModule; class SfxModule; -class Window; +namespace vcl { class Window; } struct SfxChildWinFactory; struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; @@ -176,7 +176,7 @@ public: */ sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 ); SfxTemplateDialog* GetTemplateDialog(); - Window* GetTopWindow() const; + vcl::Window* GetTopWindow() const; // members SfxFilterMatcher& GetFilterMatcher(); |