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/optgrid.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/optgrid.hxx')
| -rw-r--r-- | include/svx/optgrid.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 86e5e1d5ee96..1d6e62b6c0f5 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -100,9 +100,9 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - SvxGridTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; |