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/fntctrl.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/fntctrl.hxx')
| -rw-r--r-- | include/svx/fntctrl.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index aaa73142dd7f..0c9461f73891 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -34,7 +34,7 @@ class FontPrevWin_Impl; // class SvxFontPrevWindow ----------------------------------------------- -class SVX_DLLPUBLIC SvxFontPrevWindow : public Window +class SVX_DLLPUBLIC SvxFontPrevWindow : public vcl::Window { using OutputDevice::SetFont; private: @@ -46,8 +46,8 @@ private: SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); public: - SvxFontPrevWindow( Window* pParent, const ResId& rId ); - SvxFontPrevWindow(Window* pParent, WinBits nStyle); + SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ); + SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); virtual ~SvxFontPrevWindow(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; |