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/svx/fillctrl.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/svx/fillctrl.hxx')
| -rw-r--r-- | include/svx/fillctrl.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 215ce4de56a8..c8878d9f8355 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -67,12 +67,12 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; void Update(const SfxPoolItem* pState); - virtual Window* CreateItemWindow(Window* pParent) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow(vcl::Window* pParent) SAL_OVERRIDE; }; -class FillControl : public Window +class FillControl : public vcl::Window { private: friend class SvxFillToolBoxControl; @@ -99,7 +99,7 @@ private: void updateLastFillAttrControlSelectEntryPos(); public: - FillControl(Window* pParent, WinBits nStyle = 0); + FillControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~FillControl(); virtual void Resize() SAL_OVERRIDE; |