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 /svtools/source/control/urlcontrol.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 'svtools/source/control/urlcontrol.cxx')
| -rw-r--r-- | svtools/source/control/urlcontrol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 771bd144f426..e22b6b351c26 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -26,13 +26,13 @@ namespace svt { //= OFileURLControl - OFileURLControl::OFileURLControl(Window* _pParent, WinBits nStyle) + OFileURLControl::OFileURLControl(vcl::Window* _pParent, WinBits nStyle) : SvtURLBox(_pParent, nStyle, INET_PROT_FILE) { DisableHistory(); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOFileURLControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOFileURLControl(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; |