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/numvset.hxx | |
parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip |
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/numvset.hxx')
-rw-r--r-- | include/svx/numvset.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index ff64b4850175..eefdcb9c8ed7 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::container::XIndexAccess> > aOutlineSettings; public: - SvxNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); + SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); void init(sal_uInt16 nType); virtual ~SvxNumValueSet(); @@ -105,7 +105,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); + SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); virtual ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; |