include/vcl/accessiblefactory.hxx | 7 - include/vcl/accessibletable.hxx | 53 ---------- solenv/clang-format/excludelist | 28 ++--- toolkit/Library_tk.mk | 7 + toolkit/inc/controls/table/AccessibleGridControl.hxx | 35 +++--- toolkit/inc/controls/table/AccessibleGridControlHeader.hxx | 2 toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx | 2 toolkit/inc/controls/table/AccessibleGridControlTable.hxx | 5 toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx | 2 toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx | 3 toolkit/source/controls/table/AccessibleGridControl.cxx | 9 - toolkit/source/controls/table/AccessibleGridControlBase.cxx | 2 toolkit/source/controls/table/AccessibleGridControlHeader.cxx | 7 - toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx | 2 toolkit/source/controls/table/AccessibleGridControlTable.cxx | 4 toolkit/source/controls/table/AccessibleGridControlTableBase.cxx | 2 toolkit/source/controls/table/AccessibleGridControlTableCell.cxx | 2 toolkit/source/controls/table/tablecontrol_impl.cxx | 7 - toolkit/source/controls/table/tablecontrol_impl.hxx | 10 - vcl/Library_vcl.mk | 7 - vcl/source/accessibility/acc_factory.cxx | 8 - 21 files changed, 71 insertions(+), 133 deletions(-)
New commits: commit 80409cacf1ea34f395848875d304326d2755e5c5 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 23 16:49:11 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 24 07:38:06 2025 +0100 a11y: Drop IAccessibleTableControl Now after Change-Id: Ic93796bce96916192da7cfffcf1faf00905373c7 Author: Michael Weghorn <[email protected]> Date: Thu Jan 23 16:26:57 2025 +0100 a11y: Move AccessibleGridControl* classes to toolkit , AccessibleGridControlAccess is in the toolkit library and can be used directly, which removes the need to abstract from the actual implementation by using an interface (abstract base class) IAccessibleTableControl. Therefore, drop that one and use references to AccessibleGridControlAccess instead. Change-Id: I81a0de53d0190477e238fe4c5010379bd8fd46d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180669 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx index fe99b9e7a45a..e2fb122db35d 100644 --- a/include/vcl/accessiblefactory.hxx +++ b/include/vcl/accessiblefactory.hxx @@ -66,8 +66,7 @@ namespace vcl { namespace table { - class IAccessibleTable; - class IAccessibleTableControl; + class IAccessibleTable; } } diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx index 66f5a1e5c050..5afae8d1bfd1 100644 --- a/include/vcl/accessibletable.hxx +++ b/include/vcl/accessibletable.hxx @@ -105,59 +105,6 @@ protected: ~IAccessibleTable() {} }; - -/** interface for an implementation of a table control's Accessible component -*/ -class IAccessibleTableControl : public ::cppu::WeakImplHelper< css::accessibility::XAccessible > -{ -public: - - /** disposes the accessible implementation, so that it becomes defunc - */ - virtual void DisposeAccessImpl() = 0; - - /** checks whether the accessible implementation, and its context, are still alive - @return <TRUE/>, if the object is not disposed or disposing. - */ - virtual bool isAlive() const = 0; - - /** commits the event at all listeners of the cell - @param nEventId - the event id - @param rNewValue - the new value - @param rOldValue - the old value - */ - virtual void commitCellEvent( - sal_Int16 nEventId, - const css::uno::Any& rNewValue, - const css::uno::Any& rOldValue - ) = 0; - /** commits the event at all listeners of the table - @param nEventId - the event id - @param rNewValue - the new value - @param rOldValue - the old value - */ - virtual void commitTableEvent( - sal_Int16 nEventId, - const css::uno::Any& rNewValue, - const css::uno::Any& rOldValue - ) = 0; - - ///** Commits an event to all listeners. */ - virtual void commitEvent( - sal_Int16 nEventId, - const css::uno::Any& rNewValue - ) = 0; - -protected: - ~IAccessibleTableControl() {} -}; - } // namespace vcl::table #endif // INCLUDED_VCL_ACCESSIBLETABLE_HXX diff --git a/toolkit/inc/controls/table/AccessibleGridControl.hxx b/toolkit/inc/controls/table/AccessibleGridControl.hxx index 11c08ea321d8..ee9fe3546b40 100644 --- a/toolkit/inc/controls/table/AccessibleGridControl.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx @@ -160,7 +160,8 @@ private: the context holds this instance weak.</p> */ -class AccessibleGridControlAccess final : public ::vcl::table::IAccessibleTableControl +class AccessibleGridControlAccess final + : public cppu::WeakImplHelper<css::accessibility::XAccessible> { private: css::uno::Reference< css::accessibility::XAccessible > m_xParent; @@ -176,35 +177,31 @@ public: /// returns the AccessibleContext belonging to this Accessible AccessibleGridControl* getContext() { return m_xContext.get(); } -private: - virtual ~AccessibleGridControlAccess() override; - // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; - // IAccessibleTable - void DisposeAccessImpl() override; - virtual bool isAlive() const override - { - return m_xContext.is() && m_xContext->isAlive(); - } - virtual void commitCellEvent( sal_Int16 nEventId, - const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override + void DisposeAccessImpl(); + + bool isAlive() const { return m_xContext.is() && m_xContext->isAlive(); } + + void commitCellEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue) { AccessibleGridControl* pContext( getContext() ); if ( pContext ) pContext->commitCellEvent( nEventId, rNewValue, rOldValue ); } - virtual void commitTableEvent( sal_Int16 nEventId, - const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override + + void commitTableEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue) { AccessibleGridControl* pContext( getContext() ); if ( pContext ) pContext->commitTableEvent( nEventId, rNewValue, rOldValue ); } - virtual void commitEvent( sal_Int16 nEventId, - const css::uno::Any& rNewValue ) override + + void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue) { AccessibleGridControl* pContext( getContext() ); if ( pContext ) @@ -212,6 +209,7 @@ private: } private: + virtual ~AccessibleGridControlAccess() override; AccessibleGridControlAccess( const AccessibleGridControlAccess& ) = delete; AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) = delete; }; diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx b/toolkit/source/controls/table/tablecontrol_impl.cxx index b2139285c188..931ab4b155ec 100644 --- a/toolkit/source/controls/table/tablecontrol_impl.cxx +++ b/toolkit/source/controls/table/tablecontrol_impl.cxx @@ -2368,8 +2368,8 @@ namespace svt::table impl_ni_ScrollColumns( _pScrollbar->GetDelta() ); } - - const rtl::Reference<vcl::table::IAccessibleTableControl> & TableControl_Impl::getAccessible( vcl::Window& i_parentWindow ) + const rtl::Reference<accessibility::AccessibleGridControlAccess>& + TableControl_Impl::getAccessible(vcl::Window& i_parentWindow) { if (m_pAccessibleTable) return m_pAccessibleTable; diff --git a/toolkit/source/controls/table/tablecontrol_impl.hxx b/toolkit/source/controls/table/tablecontrol_impl.hxx index a2fc6ec873d7..8fa77c18b975 100644 --- a/toolkit/source/controls/table/tablecontrol_impl.hxx +++ b/toolkit/source/controls/table/tablecontrol_impl.hxx @@ -19,12 +19,12 @@ #pragma once -#include <com/sun/star/accessibility/XAccessible.hpp> +#include <controls/table/AccessibleGridControl.hxx> #include <controls/table/tablemodel.hxx> #include <controls/table/tablecontrolinterface.hxx> +#include <com/sun/star/accessibility/XAccessible.hpp> #include <vcl/accessibletable.hxx> - #include <vcl/seleng.hxx> #include <vector> @@ -130,7 +130,7 @@ namespace svt::table RowPos m_nAnchor; bool m_bUpdatingColWidths; - rtl::Reference<vcl::table::IAccessibleTableControl> m_pAccessibleTable; + rtl::Reference<accessibility::AccessibleGridControlAccess> m_pAccessibleTable; public: void setModel( const PTableModel& _pModel ); @@ -290,8 +290,8 @@ namespace svt::table tools::Rectangle calcCellRect( sal_Int32 nRow, sal_Int32 nCol ) const; // A11Y - const rtl::Reference<vcl::table::IAccessibleTableControl> & - getAccessible( vcl::Window& i_parentWindow ); + const rtl::Reference<accessibility::AccessibleGridControlAccess>& + getAccessible(vcl::Window& i_parentWindow); void disposeAccessible(); bool isAccessibleAlive() const { return impl_isAccessibleAlive(); } commit d040635b8e0b74a1d6cfee175cdc64bd29c60a84 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 23 16:26:57 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 24 07:37:59 2025 +0100 a11y: Move AccessibleGridControl* classes to toolkit Move AccessibleGridControlAccess and all related classes from vcl to toolkit, as that is where the grid control that makes use of them is located. Stop using the AccessibleFactory to create the AccessibleGridControlAccess, but call the ctor directly in TableControl_Impl::getAccessible, now that the class is also in the toolkit module. Further simplificiation can happen in upcoming commits. Change-Id: Ic93796bce96916192da7cfffcf1faf00905373c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180668 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx index e1897e9dc4a5..fe99b9e7a45a 100644 --- a/include/vcl/accessiblefactory.hxx +++ b/include/vcl/accessiblefactory.hxx @@ -111,10 +111,6 @@ public: createAccessibleBrowseBox(const css::uno::Reference<css::accessibility::XAccessible>& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox); - static rtl::Reference<vcl::table::IAccessibleTableControl> createAccessibleTableControl( - const css::uno::Reference<css::accessibility::XAccessible>& _rxParent, - vcl::table::IAccessibleTable& _rTable); - static css::uno::Reference<css::accessibility::XAccessible> createAccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const css::uno::Reference<css::accessibility::XAccessible>& _xParent); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 69533c61e5f1..9dc0d1a2936d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -13413,6 +13413,13 @@ toolkit/inc/controls/roadmapentry.hxx toolkit/inc/controls/stdtabcontroller.hxx toolkit/inc/controls/stdtabcontrollermodel.hxx toolkit/inc/controls/svmedit.hxx +toolkit/inc/controls/table/AccessibleGridControl.hxx +toolkit/inc/controls/table/AccessibleGridControlBase.hxx +toolkit/inc/controls/table/AccessibleGridControlHeader.hxx +toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx +toolkit/inc/controls/table/AccessibleGridControlTable.hxx +toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx +toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx toolkit/inc/controls/table/defaultinputhandler.hxx toolkit/inc/controls/table/gridtablerenderer.hxx toolkit/inc/controls/table/tablecontrol.hxx @@ -13478,6 +13485,13 @@ toolkit/source/controls/spinningprogress.cxx toolkit/source/controls/stdtabcontroller.cxx toolkit/source/controls/stdtabcontrollermodel.cxx toolkit/source/controls/svtxgridcontrol.cxx +toolkit/source/controls/table/AccessibleGridControl.cxx +toolkit/source/controls/table/AccessibleGridControlBase.cxx +toolkit/source/controls/table/AccessibleGridControlHeader.cxx +toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx +toolkit/source/controls/table/AccessibleGridControlTable.cxx +toolkit/source/controls/table/AccessibleGridControlTableBase.cxx +toolkit/source/controls/table/AccessibleGridControlTableCell.cxx toolkit/source/controls/table/cellvalueconversion.cxx toolkit/source/controls/table/cellvalueconversion.hxx toolkit/source/controls/table/defaultinputhandler.cxx @@ -14067,13 +14081,6 @@ vcl/inc/accessibility/AccessibleBrowseBoxHeaderCell.hxx vcl/inc/accessibility/AccessibleBrowseBoxTable.hxx vcl/inc/accessibility/AccessibleBrowseBoxTableBase.hxx vcl/inc/accessibility/AccessibleBrowseBoxTableCell.hxx -vcl/inc/accessibility/AccessibleGridControl.hxx -vcl/inc/accessibility/AccessibleGridControlBase.hxx -vcl/inc/accessibility/AccessibleGridControlHeader.hxx -vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx -vcl/inc/accessibility/AccessibleGridControlTable.hxx -vcl/inc/accessibility/AccessibleGridControlTableBase.hxx -vcl/inc/accessibility/AccessibleGridControlTableCell.hxx vcl/inc/accessibility/IComboListBoxHelper.hxx vcl/inc/accessibility/accessiblebrowseboxcell.hxx vcl/inc/accessibility/accessibleeditbrowseboxcell.hxx @@ -14117,13 +14124,6 @@ vcl/source/accessibility/AccessibleBrowseBoxHeaderCell.cxx vcl/source/accessibility/AccessibleBrowseBoxTable.cxx vcl/source/accessibility/AccessibleBrowseBoxTableBase.cxx vcl/source/accessibility/AccessibleBrowseBoxTableCell.cxx -vcl/source/accessibility/AccessibleGridControl.cxx -vcl/source/accessibility/AccessibleGridControlBase.cxx -vcl/source/accessibility/AccessibleGridControlHeader.cxx -vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx -vcl/source/accessibility/AccessibleGridControlTable.cxx -vcl/source/accessibility/AccessibleGridControlTableBase.cxx -vcl/source/accessibility/AccessibleGridControlTableCell.cxx vcl/source/accessibility/acc_factory.cxx vcl/source/accessibility/accessiblebrowseboxcell.cxx vcl/source/accessibility/accessibleeditbrowseboxcell.cxx diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 2f676872ef50..fb88abcab4c8 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -97,6 +97,13 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/controls/tkspinbutton \ toolkit/source/controls/animatedimages \ toolkit/source/controls/spinningprogress \ + toolkit/source/controls/table/AccessibleGridControl \ + toolkit/source/controls/table/AccessibleGridControlBase \ + toolkit/source/controls/table/AccessibleGridControlHeader \ + toolkit/source/controls/table/AccessibleGridControlHeaderCell \ + toolkit/source/controls/table/AccessibleGridControlTable \ + toolkit/source/controls/table/AccessibleGridControlTableBase \ + toolkit/source/controls/table/AccessibleGridControlTableCell \ toolkit/source/controls/table/cellvalueconversion \ toolkit/source/controls/table/defaultinputhandler \ toolkit/source/controls/table/gridtablerenderer \ diff --git a/vcl/inc/accessibility/AccessibleGridControl.hxx b/toolkit/inc/controls/table/AccessibleGridControl.hxx similarity index 98% rename from vcl/inc/accessibility/AccessibleGridControl.hxx rename to toolkit/inc/controls/table/AccessibleGridControl.hxx index 399a6b453bb5..11c08ea321d8 100644 --- a/vcl/inc/accessibility/AccessibleGridControl.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx @@ -19,8 +19,9 @@ #pragma once -#include <accessibility/AccessibleGridControlBase.hxx> -#include <accessibility/AccessibleGridControlTable.hxx> +#include "AccessibleGridControlBase.hxx" +#include "AccessibleGridControlTable.hxx" + #include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> #include <vcl/accessibletable.hxx> diff --git a/vcl/inc/accessibility/AccessibleGridControlBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx similarity index 100% rename from vcl/inc/accessibility/AccessibleGridControlBase.hxx rename to toolkit/inc/controls/table/AccessibleGridControlBase.hxx diff --git a/vcl/inc/accessibility/AccessibleGridControlHeader.hxx b/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx similarity index 99% rename from vcl/inc/accessibility/AccessibleGridControlHeader.hxx rename to toolkit/inc/controls/table/AccessibleGridControlHeader.hxx index d1cabbeb4aeb..f993907b85a0 100644 --- a/vcl/inc/accessibility/AccessibleGridControlHeader.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx @@ -20,7 +20,7 @@ #pragma once -#include <accessibility/AccessibleGridControlTableBase.hxx> +#include <controls/table/AccessibleGridControlTableBase.hxx> namespace accessibility { diff --git a/vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx b/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx similarity index 98% rename from vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx rename to toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx index cd59894b92bb..8f3022807e13 100644 --- a/vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include <accessibility/AccessibleGridControlTableCell.hxx> +#include <controls/table/AccessibleGridControlTableCell.hxx> namespace accessibility { diff --git a/vcl/inc/accessibility/AccessibleGridControlTable.hxx b/toolkit/inc/controls/table/AccessibleGridControlTable.hxx similarity index 98% rename from vcl/inc/accessibility/AccessibleGridControlTable.hxx rename to toolkit/inc/controls/table/AccessibleGridControlTable.hxx index 5c043f8860a9..c2da21496119 100644 --- a/vcl/inc/accessibility/AccessibleGridControlTable.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlTable.hxx @@ -20,10 +20,11 @@ #pragma once -#include <accessibility/AccessibleGridControlTableBase.hxx> +#include <controls/table/AccessibleGridControlTableBase.hxx> +#include <controls/table/AccessibleGridControlTableCell.hxx> + #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <accessibility/AccessibleGridControlTableCell.hxx> namespace accessibility { diff --git a/vcl/inc/accessibility/AccessibleGridControlTableBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx similarity index 99% rename from vcl/inc/accessibility/AccessibleGridControlTableBase.hxx rename to toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx index 53ca49307e6b..2da1b6c007a0 100644 --- a/vcl/inc/accessibility/AccessibleGridControlTableBase.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx @@ -20,7 +20,7 @@ #pragma once -#include <accessibility/AccessibleGridControlBase.hxx> +#include <controls/table/AccessibleGridControlBase.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> diff --git a/vcl/inc/accessibility/AccessibleGridControlTableCell.hxx b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx similarity index 99% rename from vcl/inc/accessibility/AccessibleGridControlTableCell.hxx rename to toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx index 7d9053932a36..0cf3738b9a79 100644 --- a/vcl/inc/accessibility/AccessibleGridControlTableCell.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx @@ -18,9 +18,10 @@ */ #pragma once +#include <controls/table/AccessibleGridControlBase.hxx> + #include <comphelper/accessibletexthelper.hxx> #include <cppuhelper/implbase2.hxx> -#include <accessibility/AccessibleGridControlBase.hxx> #include <vcl/accessibletable.hxx> #include <com/sun/star/accessibility/AccessibleScrollType.hpp> diff --git a/vcl/source/accessibility/AccessibleGridControl.cxx b/toolkit/source/controls/table/AccessibleGridControl.cxx similarity index 97% rename from vcl/source/accessibility/AccessibleGridControl.cxx rename to toolkit/source/controls/table/AccessibleGridControl.cxx index 1a5c6b1e74ff..0cdabc96a6bb 100644 --- a/vcl/source/accessibility/AccessibleGridControl.cxx +++ b/toolkit/source/controls/table/AccessibleGridControl.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/AccessibleGridControl.hxx> -#include <accessibility/AccessibleGridControlTable.hxx> -#include <accessibility/AccessibleGridControlHeader.hxx> +#include <controls/table/AccessibleGridControl.hxx> +#include <controls/table/AccessibleGridControlTable.hxx> +#include <controls/table/AccessibleGridControlHeader.hxx> + #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> @@ -255,7 +256,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int64 nChildIndex ) rtl::Reference<AccessibleGridControlTable> AccessibleGridControl::createAccessibleTable() { css::uno::Reference< css::accessibility::XAccessible > xCreator(m_aCreator); - OSL_ENSURE( xCreator.is(), "accessibility/AccessibleGridControl::createAccessibleTable: my creator died - how this?" ); + OSL_ENSURE(xCreator.is(), "AccessibleGridControl::createAccessibleTable: my creator died - how this?"); return new AccessibleGridControlTable( xCreator, m_aTable ); } diff --git a/vcl/source/accessibility/AccessibleGridControlBase.cxx b/toolkit/source/controls/table/AccessibleGridControlBase.cxx similarity index 99% rename from vcl/source/accessibility/AccessibleGridControlBase.cxx rename to toolkit/source/controls/table/AccessibleGridControlBase.cxx index 52d9763ad50f..015baa8a8d11 100644 --- a/vcl/source/accessibility/AccessibleGridControlBase.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlBase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/AccessibleGridControlBase.hxx> +#include <controls/table/AccessibleGridControlBase.hxx> #include <utility> #include <vcl/accessibletable.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/accessibility/AccessibleGridControlHeader.cxx b/toolkit/source/controls/table/AccessibleGridControlHeader.cxx similarity index 97% rename from vcl/source/accessibility/AccessibleGridControlHeader.cxx rename to toolkit/source/controls/table/AccessibleGridControlHeader.cxx index 9a0c81539049..c7d70ef88bb3 100644 --- a/vcl/source/accessibility/AccessibleGridControlHeader.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlHeader.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <controls/table/AccessibleGridControlHeader.hxx> +#include <controls/table/AccessibleGridControlHeaderCell.hxx> + #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <accessibility/AccessibleGridControlHeader.hxx> -#include <accessibility/AccessibleGridControlHeaderCell.hxx> #include <vcl/accessibletable.hxx> #include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> @@ -45,7 +46,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader( AccessibleGridControlTableBase( rxParent, rTable, eObjType ) { OSL_ENSURE( isRowBar() || isColumnBar(), - "accessibility/AccessibleGridControlHeaderBar - invalid object type" ); + "AccessibleGridControlHeaderBar - invalid object type" ); } // XAccessibleContext --------------------------------------------------------- diff --git a/vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx b/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx similarity index 98% rename from vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx rename to toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx index a85897b83873..674052935492 100644 --- a/vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx @@ -19,7 +19,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <accessibility/AccessibleGridControlHeaderCell.hxx> +#include <controls/table/AccessibleGridControlHeaderCell.hxx> #include <vcl/accessibletable.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/accessibility/AccessibleGridControlTable.cxx b/toolkit/source/controls/table/AccessibleGridControlTable.cxx similarity index 99% rename from vcl/source/accessibility/AccessibleGridControlTable.cxx rename to toolkit/source/controls/table/AccessibleGridControlTable.cxx index ba3fb0d2b728..4ec7d08fcd31 100644 --- a/vcl/source/accessibility/AccessibleGridControlTable.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlTable.cxx @@ -21,8 +21,8 @@ #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp> #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <accessibility/AccessibleGridControlTable.hxx> -#include <accessibility/AccessibleGridControlTableCell.hxx> +#include <controls/table/AccessibleGridControlTable.hxx> +#include <controls/table/AccessibleGridControlTableCell.hxx> #include <vcl/accessibletable.hxx> #include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> diff --git a/vcl/source/accessibility/AccessibleGridControlTableBase.cxx b/toolkit/source/controls/table/AccessibleGridControlTableBase.cxx similarity index 99% rename from vcl/source/accessibility/AccessibleGridControlTableBase.cxx rename to toolkit/source/controls/table/AccessibleGridControlTableBase.cxx index 5cfb904bad5c..16614ad0b1d1 100644 --- a/vcl/source/accessibility/AccessibleGridControlTableBase.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlTableBase.cxx @@ -19,7 +19,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <accessibility/AccessibleGridControlTableBase.hxx> +#include <controls/table/AccessibleGridControlTableBase.hxx> #include <vcl/accessibletable.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequence.hxx> diff --git a/vcl/source/accessibility/AccessibleGridControlTableCell.cxx b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx similarity index 99% rename from vcl/source/accessibility/AccessibleGridControlTableCell.cxx rename to toolkit/source/controls/table/AccessibleGridControlTableCell.cxx index aa76ffe0c533..897d38136645 100644 --- a/vcl/source/accessibility/AccessibleGridControlTableCell.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/AccessibleGridControlTableCell.hxx> +#include <controls/table/AccessibleGridControlTableCell.hxx> #include <vcl/accessibletable.hxx> #include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx b/toolkit/source/controls/table/tablecontrol_impl.cxx index 695f6b71832a..b2139285c188 100644 --- a/toolkit/source/controls/table/tablecontrol_impl.cxx +++ b/toolkit/source/controls/table/tablecontrol_impl.cxx @@ -18,6 +18,7 @@ */ +#include <controls/table/AccessibleGridControl.hxx> #include <controls/table/tablecontrol.hxx> #include <controls/table/defaultinputhandler.hxx> #include <controls/table/tablemodel.hxx> @@ -2379,7 +2380,7 @@ namespace svt::table Reference< XAccessible > const xAccParent = i_parentWindow.GetAccessible(); if ( xAccParent.is() ) { - m_pAccessibleTable = AccessibleFactory::createAccessibleTableControl( + m_pAccessibleTable = new accessibility::AccessibleGridControlAccess( xAccParent, m_rAntiImpl ); } diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 769329d30cba..ef2e92721dc1 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -105,13 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/accessibility/AccessibleBrowseBoxTable \ vcl/source/accessibility/AccessibleBrowseBoxTableBase \ vcl/source/accessibility/AccessibleBrowseBoxTableCell \ - vcl/source/accessibility/AccessibleGridControl \ - vcl/source/accessibility/AccessibleGridControlBase \ - vcl/source/accessibility/AccessibleGridControlHeader \ - vcl/source/accessibility/AccessibleGridControlHeaderCell \ - vcl/source/accessibility/AccessibleGridControlTable \ - vcl/source/accessibility/AccessibleGridControlTableBase \ - vcl/source/accessibility/AccessibleGridControlTableCell \ vcl/source/accessibility/AccessibleTextAttributeHelper \ vcl/source/accessibility/acc_factory \ vcl/source/accessibility/accessiblebrowseboxcell \ diff --git a/vcl/source/accessibility/acc_factory.cxx b/vcl/source/accessibility/acc_factory.cxx index 65a634c0f405..5a81bbb21c37 100644 --- a/vcl/source/accessibility/acc_factory.cxx +++ b/vcl/source/accessibility/acc_factory.cxx @@ -49,7 +49,6 @@ #include <accessibility/AccessibleBrowseBoxTableCell.hxx> #include <accessibility/AccessibleBrowseBoxHeaderCell.hxx> #include <accessibility/AccessibleBrowseBoxCheckBoxCell.hxx> -#include <accessibility/AccessibleGridControl.hxx> #include <accessibility/accessibleeditbrowseboxcell.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/toolkit/lstbox.hxx> @@ -205,13 +204,6 @@ AccessibleFactory::createAccessibleBrowseBox(const Reference<XAccessible>& _rxPa return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox ); } -rtl::Reference<IAccessibleTableControl> -AccessibleFactory::createAccessibleTableControl(const Reference<XAccessible>& _rxParent, - IAccessibleTable& _rTable) -{ - return new AccessibleGridControlAccess( _rxParent, _rTable ); -} - Reference<XAccessible> AccessibleFactory::createAccessibleIconChoiceCtrl(SvtIconChoiceCtrl& _rIconCtrl, const Reference<XAccessible>& _xParent)
