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 /svtools/inc/table | |
| 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 'svtools/inc/table')
| -rw-r--r-- | svtools/inc/table/gridtablerenderer.hxx | 4 | ||||
| -rw-r--r-- | svtools/inc/table/tablecontrol.hxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index 9bd98251cff4..4df38f8eeaf5 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -83,8 +83,8 @@ namespace svt { namespace table bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle ) SAL_OVERRIDE; - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; virtual bool FitsIntoCell( ::com::sun::star::uno::Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos, diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 4cf5b4c0f5fe..7b0e01bf0b8d 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -65,7 +65,7 @@ namespace svt { namespace table public: - TableControl( Window* _pParent, WinBits _nStyle ); + TableControl( vcl::Window* _pParent, WinBits _nStyle ); virtual ~TableControl(); /// sets a new table model @@ -141,7 +141,7 @@ namespace svt { namespace table if the row, which should be removed, is selected, it will be erased from the vector */ SelectionEngine* getSelEngine(); - Window& getDataWindow(); + vcl::Window& getDataWindow(); // Window overridables virtual void GetFocus() SAL_OVERRIDE; @@ -166,11 +166,11 @@ namespace svt { namespace table // IAccessibleTable - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; virtual long GetRowCount() const SAL_OVERRIDE; |