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/sidebar/SidebarPanelBase.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/sidebar/SidebarPanelBase.hxx')
-rw-r--r-- | include/sfx2/sidebar/SidebarPanelBase.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 537c085280f4..6215f6d03e64 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -35,7 +35,7 @@ #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -61,7 +61,7 @@ public: static css::uno::Reference<css::ui::XUIElement> Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pControl, + vcl::Window* pControl, const css::ui::LayoutSize& rLayoutSize); // XContextChangeEventListener @@ -103,7 +103,7 @@ protected: SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize); virtual ~SidebarPanelBase (void); @@ -111,7 +111,7 @@ protected: throw (css::uno::RuntimeException) SAL_OVERRIDE; private: - Window* mpControl; + vcl::Window* mpControl; const ::rtl::OUString msResourceURL; const css::ui::LayoutSize maLayoutSize; }; |