summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/optcomp.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /sw/source/uibase/inc/optcomp.hxx
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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 'sw/source/uibase/inc/optcomp.hxx')
-rw-r--r--sw/source/uibase/inc/optcomp.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index 935f53dc2d8d..8a1675176575 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -60,10 +60,10 @@ private:
void WriteOptions();
public:
- SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet );
+ SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SwCompatibilityOptPage();
- 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;