diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-19 12:16:42 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-03 06:46:24 +0100 |
| commit | fb308c193bc9f0d07ad2cccd5a0b239f86cbe442 (patch) | |
| tree | 11cbb10810a968567b3c215efb353acb4ca23194 /accessibility | |
| parent | 6ac1e9e7f0be23b529992c268d2c563fe40fff76 (diff) | |
Fix --disable-scripting for DESKTOP build
Unfortunatly we cannot add --disable-scripting to
sub_conf_defaults, because Java currently has no
equivalent to the PYTHON_FOR_BUILD setting.
Change-Id: I89938a17307a363f5de808200914940503312829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126186
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/Library_acc.mk | 13 | ||||
| -rw-r--r-- | accessibility/source/helper/acc_factory.cxx | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 815e2a88bd70..0926fee97e5d 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -64,10 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/extended/accessibleiconchoicectrlentry \ 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 \ @@ -112,4 +108,13 @@ $(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 51adeaca8d21..53ed173c15b2 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <config_feature_desktop.h> #include <toolkit/awt/vclxwindows.hxx> @@ -386,7 +387,12 @@ 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( |