accessibility/Library_acc.mk | 13 ++++--------- accessibility/source/helper/acc_factory.cxx | 6 ------ 2 files changed, 4 insertions(+), 15 deletions(-)
New commits: commit 42b788d090f21c05eb3a207630c4760dbc00bb16 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 18:14:24 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:52:04 2024 +0100 a11y: Make TabBar a11y independent of HAVE_FEATURE_SCRIPTING Build the code for the TabBar a11y classes independent of whether or not the scripting feature is enabled. Otherwise, e.g. the tab bar showing sheets in Calc is inaccessible in a `--disable-scripting` build, i.e. it e.g. doesn't show up in Accerciser. It was made conditional on HAVE_FEATURE_SCRIPTING in commit fb308c193bc9f0d07ad2cccd5a0b239f86cbe442 Date: Wed May 19 12:16:42 2021 +0200 Fix --disable-scripting for DESKTOP build , which doesn't give any explicit reason, so my assumption is that it had some dependency relying on that feature being enabled back then. At least a local `--disable-scripting` build of mine works fine with this enabled again now, so let's assume whatever was the problem back then is solved by now. Change-Id: I6ee2ea6823aaa30bf597678c2b3ee86b42111920 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178437 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 34b32ca27954..aafe63e86f9e 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -65,6 +65,10 @@ $(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 \ @@ -100,13 +104,4 @@ $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/standard/vclxaccessibletoolboxitem \ )) -ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) -$(eval $(call gb_Library_add_exception_objects,acc,\ - accessibility/source/extended/accessibletabbar \ - accessibility/source/extended/accessibletabbarbase \ - accessibility/source/extended/accessibletabbarpage \ - accessibility/source/extended/accessibletabbarpagelist \ -)) -endif - # vim:set noet sw=4 ts=4: diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index c68d98b7e333..e3ce283d0ed8 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> #include <config_feature_desktop.h> #include <cppuhelper/supportsservice.hxx> @@ -375,12 +374,7 @@ Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl( Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const { -#if HAVE_FEATURE_SCRIPTING return new AccessibleTabBar( &_rTabBar ); -#else - (void)_rTabBar; - return nullptr; -#endif } Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
