ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

a11y: Move TabBar a11y classses to svtools, no longer use factory

Browse Source 
Move AccessibleTabBar and related classes to
implement accessibility for the TabBar control
to svtools, where the TabBar code is also located.
(This matches how it's organized for the Ruler control
whose a11y class AccessibleRuler is also in svtools.)

This removes the last dependency of the accessibility
module on svtools, so drop that from accessibility/Library_acc.mk.

Instead of using the AccessibleFactory to
create an instance in TabBar::CreateAccessible,
just call the AccessibleTabBar ctor directly.

Change-Id: Id6a8852de930ffe7fe7509f84f33861d274120dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178588
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2024-12-16 19:08:06 +01:00
parent 12ce6bbd53
commit a7cc36dad9
14 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/Library_acc.mk
-5
View File
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,acc,\
i18nlangtag \
sot \
svl \
svt \
tl \
utl \
vcl \
@@ -65,10 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/extended/AccessibleIconView \
accessibility/source/extended/accessiblelistbox \
accessibility/source/extended/accessiblelistboxentry \
accessibility/source/extended/accessibletabbar \
accessibility/source/extended/accessibletabbarbase \
accessibility/source/extended/accessibletabbarpage \
accessibility/source/extended/accessibletabbarpagelist \
accessibility/source/extended/accessibletablistbox \
accessibility/source/extended/accessibletablistboxtable \
accessibility/source/extended/textwindowaccessibility \
accessibility/source/helper/acc_factory.cxx
-11
View File
@@ -44,7 +44,6 @@
#include <extended/AccessibleBrowseBox.hxx>
#include <extended/accessibleiconchoicectrl.hxx>
#include <extended/AccessibleIconView.hxx>
#include <extended/accessibletabbar.hxx>
#include <extended/accessiblelistbox.hxx>
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <extended/textwindowaccessibility.hxx>
@@ -138,11 +137,6 @@ public:
const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTabBar(
TabBar& _rTabBar
) const override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleTextWindowContext(
vcl::Window* pWindow, TextEngine& rEngine, TextView& rView
@@ -356,11 +350,6 @@ Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl(
return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent );
}
Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const
{
return new AccessibleTabBar( &_rTabBar );
}
Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
vcl::Window* pWindow, TextEngine& rEngine, TextView& rView) const
{
include/vcl/accessiblefactory.hxx
-5
View File
@@ -106,11 +106,6 @@ namespace vcl
const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTabBar(
TabBar& _rTabBar
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleTextWindowContext(
vcl::Window* pWindow, TextEngine& rEngine, TextView& rView
solenv/clang-format/excludelist
+8 -8
View File
@@ -37,10 +37,6 @@ accessibility/inc/extended/accessibleiconchoicectrl.hxx
accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
accessibility/inc/extended/accessiblelistbox.hxx
accessibility/inc/extended/accessiblelistboxentry.hxx
accessibility/inc/extended/accessibletabbar.hxx
accessibility/inc/extended/accessibletabbarbase.hxx
accessibility/inc/extended/accessibletabbarpage.hxx
accessibility/inc/extended/accessibletabbarpagelist.hxx
accessibility/inc/extended/accessibletablistbox.hxx
accessibility/inc/extended/accessibletablistboxtable.hxx
accessibility/inc/extended/textwindowaccessibility.hxx
@@ -85,10 +81,6 @@ accessibility/source/extended/accessibleiconchoicectrl.cxx
accessibility/source/extended/accessibleiconchoicectrlentry.cxx
accessibility/source/extended/accessiblelistbox.cxx
accessibility/source/extended/accessiblelistboxentry.cxx
accessibility/source/extended/accessibletabbar.cxx
accessibility/source/extended/accessibletabbarbase.cxx
accessibility/source/extended/accessibletabbarpage.cxx
accessibility/source/extended/accessibletabbarpagelist.cxx
accessibility/source/extended/accessibletablistbox.cxx
accessibility/source/extended/accessibletablistboxtable.cxx
accessibility/source/extended/textwindowaccessibility.cxx
@@ -11052,6 +11044,14 @@ svtools/source/config/printoptions.cxx
svtools/source/config/test/test.cxx
svtools/source/control/accessibleruler.cxx
svtools/source/control/accessibleruler.hxx
svtools/source/control/accessibletabbar.cxx
svtools/source/control/accessibletabbar.hxx
svtools/source/control/accessibletabbarbase.cxx
svtools/source/control/accessibletabbarbase.hxx
svtools/source/control/accessibletabbarpage.cxx
svtools/source/control/accessibletabbarpage.hxx
svtools/source/control/accessibletabbarpagelist.cxx
svtools/source/control/accessibletabbarpagelist.hxx
svtools/source/control/asynclink.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/Library_svt.mk
+4
View File
@@ -89,6 +89,10 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/config/printoptions \
svtools/source/contnr/querydelete \
svtools/source/control/accessibleruler \
svtools/source/control/accessibletabbar \
svtools/source/control/accessibletabbarbase \
svtools/source/control/accessibletabbarpage \
svtools/source/control/accessibletabbarpagelist \
svtools/source/control/asynclink \
svtools/source/control/collatorres \
svtools/source/control/ctrlbox \
accessibility/source/extended/accessibletabbar.cxx → svtools/source/control/accessibletabbar.cxx
+3 -2
View File
@@ -17,9 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <extended/accessibletabbar.hxx>
#include "accessibletabbar.hxx"
#include "accessibletabbarpagelist.hxx"
#include <svtools/tabbar.hxx>
#include <extended/accessibletabbarpagelist.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
accessibility/inc/extended/accessibletabbar.hxx → svtools/source/control/accessibletabbar.hxx
+2 -2
View File
@@ -19,14 +19,14 @@
#pragma once
#include "accessibletabbarbase.hxx"
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
#include <extended/accessibletabbarbase.hxx>
#include <vector>
namespace accessibility
{
accessibility/source/extended/accessibletabbarbase.cxx → svtools/source/control/accessibletabbarbase.cxx
+3 -2
View File
@@ -17,8 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <extended/accessibletabbarbase.hxx>
#include <extended/accessibletabbarpagelist.hxx>
#include "accessibletabbarbase.hxx"
#include "accessibletabbarpagelist.hxx"
#include <svtools/tabbar.hxx>
#include <vcl/vclevent.hxx>
accessibility/inc/extended/accessibletabbarbase.hxx → svtools/source/control/accessibletabbarbase.hxx
View File
accessibility/source/extended/accessibletabbarpage.cxx → svtools/source/control/accessibletabbarpage.cxx
+2 -1
View File
@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <extended/accessibletabbarpage.hxx>
#include "accessibletabbarpage.hxx"
#include <svtools/tabbar.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
accessibility/inc/extended/accessibletabbarpage.hxx → svtools/source/control/accessibletabbarpage.hxx
+2 -2
View File
@@ -19,11 +19,11 @@
#pragma once
#include "accessibletabbarbase.hxx"
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
#include <extended/accessibletabbarbase.hxx>
namespace accessibility
{
accessibility/source/extended/accessibletabbarpagelist.cxx → svtools/source/control/accessibletabbarpagelist.cxx
+2 -1
View File
@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <extended/accessibletabbarpagelist.hxx>
#include "accessibletabbarpagelist.hxx"
#include <svtools/tabbar.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
accessibility/inc/extended/accessibletabbarpagelist.hxx → svtools/source/control/accessibletabbarpagelist.hxx
+4 -2
View File
@@ -19,12 +19,14 @@
#pragma once
#include "accessibletabbarbase.hxx"
#include "accessibletabbarpage.hxx"
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
#include <extended/accessibletabbarbase.hxx>
#include <extended/accessibletabbarpage.hxx>
#include <vector>
svtools/source/control/tabbar.cxx
+2 -5
View File
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "accessibletabbar.hxx"
#include <svtools/tabbar.hxx>
#include <tools/time.hxx>
@@ -30,8 +31,6 @@
#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/accessiblefactory.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/weldutils.hxx>
#include <svtools/svtresid.hxx>
@@ -511,8 +510,6 @@ struct TabBar_Impl
ScopedVclPtr<TabBarEdit> mxEdit;
std::vector<ImplTabBarItem> maItemList;
vcl::AccessibleFactoryAccess maAccessibleFactory;
sal_uInt16 getItemSize() const
{
return static_cast<sal_uInt16>(maItemList.size());
@@ -2536,7 +2533,7 @@ void TabBar::SetAddButtonEnabled(bool bAddButtonEnabled)
css::uno::Reference<css::accessibility::XAccessible> TabBar::CreateAccessible()
{
return mpImpl->maAccessibleFactory.getFactory().createAccessibleTabBar(*this);
return new accessibility::AccessibleTabBar(this);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */