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 /svx/source/tbxctrls/fillctrl.cxx | |
| 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 'svx/source/tbxctrls/fillctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 2a5b26a0e3a2..5b4aa1aaf5d5 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -502,7 +502,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } } -Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) +vcl::Window* SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) { if(GetSlotId() == SID_ATTR_FILL_STYLE) { @@ -533,7 +533,7 @@ Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) return NULL; } -FillControl::FillControl(Window* pParent,WinBits nStyle) +FillControl::FillControl(vcl::Window* pParent,WinBits nStyle) : Window(pParent,nStyle | WB_DIALOGCONTROL), mpLbFillType(new SvxFillTypeBox(this)), mpLbFillAttr(new SvxFillAttrBox(this)), |