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/dialog/relfld.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/dialog/relfld.cxx')
-rw-r--r-- | svx/source/dialog/relfld.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index b4db0011d6c2..6e177aa02cb2 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -23,7 +23,7 @@ SvxRelativeField::SvxRelativeField( - Window *const pParent, WinBits const nBits, FieldUnit const eUnit) + vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit) : MetricField( pParent, nBits) , nRelMin(0) , nRelMax(0) @@ -39,8 +39,8 @@ SvxRelativeField::SvxRelativeField( SetMax( 9999 ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL -makeSvxRelativeField(Window *const pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL +makeSvxRelativeField(vcl::Window *const pParent, VclBuilder::stringmap & rMap) { OString const custom(VclBuilder::extractCustomProperty(rMap)); FieldUnit const eUnit(VclBuilder::detectUnit(custom)); |