summaryrefslogtreecommitdiff
path: root/cui/source/inc/backgrnd.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/backgrnd.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/backgrnd.hxx')
-rw-r--r--cui/source/inc/backgrnd.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 0402ecb85c0d..ab4145fcece1 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -46,13 +46,13 @@ class SvxBackgroundTabPage : public SvxTabPage
{
using TabPage::DeactivatePage;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
/// Shift-ListBox activation
void ShowSelector();
@@ -67,7 +67,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
- SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
+ SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
virtual ~SvxBackgroundTabPage();
VclContainer* m_pAsGrid;