summaryrefslogtreecommitdiff
path: root/cui/source/inc/border.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 /cui/source/inc/border.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 'cui/source/inc/border.hxx')
-rw-r--r--cui/source/inc/border.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index e3e352b72af9..0a5aea5504b6 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -43,7 +43,7 @@ class SvxBorderTabPage : public SfxTabPage
using TabPage::DeactivatePage;
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges();
@@ -58,7 +58,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
private:
- SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs );
+ SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs );
virtual ~SvxBorderTabPage();
// Controls