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 /sd/source/ui/inc/gluectrl.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 'sd/source/ui/inc/gluectrl.hxx')
-rw-r--r-- | sd/source/ui/inc/gluectrl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index fefe754006cf..d3b2e0a8055b 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -31,7 +31,7 @@ class GlueEscDirLB : public ListBox private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; public: - GlueEscDirLB( Window* pParent, + GlueEscDirLB( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); virtual ~GlueEscDirLB(); @@ -51,7 +51,7 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); |