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 /svx/inc/svdibrow.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 'svx/inc/svdibrow.hxx')
| -rw-r--r-- | svx/inc/svdibrow.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 364e1130e3a2..52965b1149a9 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -66,7 +66,7 @@ protected: virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; public: - _SdrItemBrowserControl(Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP); + _SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP); virtual ~_SdrItemBrowserControl(); void Clear(); void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); @@ -100,7 +100,7 @@ public: class _SdrItemBrowserWindow: public FloatingWindow { _SdrItemBrowserControl aBrowse; public: - _SdrItemBrowserWindow(Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN); + _SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN); virtual ~_SdrItemBrowserWindow(); virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -118,7 +118,7 @@ class SdrItemBrowser: public _SdrItemBrowserWindow { SdrView* pView; bool bDirty; private: - static Window* ImpGetViewWin(SdrView& rView); + static vcl::Window* ImpGetViewWin(SdrView& rView); DECL_LINK(IdleHdl, void *); DECL_LINK(ChangedHdl,_SdrItemBrowserControl*); DECL_LINK(SetDirtyHdl, void *); |