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/itemwin.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/itemwin.hxx')
-rw-r--r-- | include/svx/itemwin.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 2bbb824b2d7e..0df5118feda8 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -46,7 +46,7 @@ class SvxLineBox : public LineLB void ReleaseFocus_Impl(); public: - SvxLineBox( Window* pParent, + SvxLineBox( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxLineBox(); @@ -84,7 +84,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxMetricField( Window* pParent, + SvxMetricField( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SvxMetricField(); @@ -99,7 +99,7 @@ public: class SvxFillTypeBox : public FillTypeLB { public: - SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); + SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxFillTypeBox(); void Selected() { bSelect = true; } @@ -122,7 +122,7 @@ private: class SvxFillAttrBox : public FillAttrLB { public: - SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); + SvxFillAttrBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxFillAttrBox(); bool IsRelease() { return bRelease;} |