diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-17 21:37:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-21 22:08:04 +0100 |
| commit | 47897fdd936d9b6e9ac8cb6110c79352ab080df7 (patch) | |
| tree | c657b53080caa94590d1e9b1fd4383d6dc795728 /svtools/inc/table | |
| parent | cfa76f538a44d4396574ece59e8a3953c22c6eb7 (diff) | |
weld SwCondCollPage
and put back original SvTreeListBox a11y factory use
Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/inc/table')
| -rw-r--r-- | svtools/inc/table/tablecontrol.hxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 00b04baae59d..e57801b6b0a5 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -22,8 +22,8 @@ #include <svtools/svtdllapi.h> #include <svtools/table/tablemodel.hxx> -#include <svtools/accessibletable.hxx> -#include <svtools/accessiblefactory.hxx> +#include <vcl/accessibletable.hxx> +#include <vcl/accessiblefactory.hxx> #include <vcl/ctrl.hxx> #include <vcl/seleng.hxx> @@ -32,8 +32,6 @@ namespace svt { namespace table { - - class TableControl_Impl; @@ -55,7 +53,7 @@ namespace svt { namespace table cell). The control supports accessibility, this is encapsulated in IAccessibleTable */ - class SVT_DLLPUBLIC TableControl : public Control, public IAccessibleTable + class SVT_DLLPUBLIC TableControl : public Control, public vcl::table::IAccessibleTable { private: std::shared_ptr<TableControl_Impl> m_pImpl; @@ -118,10 +116,10 @@ namespace svt { namespace table /** Creates and returns the accessible object of the whole GridControl. */ SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override; - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(vcl::table::AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override; SVT_DLLPRIVATE virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override; - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType) const override; - SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const override; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(vcl::table::AccessibleTableControlObjType eObjType) const override; + SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, vcl::table::AccessibleTableControlObjType eObjType ) const override; // temporary methods // Those do not really belong into the public API - they're intended for firing A11Y-related events. However, |