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 /cui/source/options/optjsearch.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 'cui/source/options/optjsearch.hxx')
| -rw-r--r-- | cui/source/options/optjsearch.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 8a8bf0e96110..bb5ac7a4606e 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -24,7 +24,7 @@ #include <vcl/button.hxx> #include <sfx2/tabdlg.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; @@ -59,12 +59,12 @@ private: sal_Int32 GetTransliterationFlags_Impl(); protected: - SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxJSearchOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; |