739b071650
Other than most of the a11y implementations for vcl classes, VCLXAccessiblePopupMenu etc. do not make use of any VCLXWindow (i.e. UNO/toolkit wrapper of a vcl::Window) and thus do not depend on the toolkit module, which the accessibility module depends on. Therefore, there's also no need to use the accessible factory to create them (which is needed when toolkit classes are involved to avoid a dependency cycle). Move those classes from the accessibility module to vcl and add a new method Menu::CreateAccessible and move the logic from AccessibleFactory::createAccessible there. Drop the now unnecessary factory methods previously used for those classes. No change in behavior intended (yet), but this also simplifies the code involved for the tdf#164093 scenario. Change-Id: Ie3f6f1a02bf6662206d31383473cdc868e1f9164 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177812 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
113 lines
4.7 KiB
Makefile
113 lines
4.7 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,acc))
|
|
|
|
$(eval $(call gb_Library_set_componentfile,acc,accessibility/util/acc,services))
|
|
|
|
$(eval $(call gb_Library_set_include,acc,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/accessibility/inc \
|
|
-I$(SRCDIR)/accessibility/source/inc \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_precompiled_header,acc,accessibility/inc/pch/precompiled_acc))
|
|
|
|
$(eval $(call gb_Library_use_external,acc,boost_headers))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,acc))
|
|
|
|
$(eval $(call gb_Library_use_libraries,acc,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
salhelper \
|
|
i18nlangtag \
|
|
sot \
|
|
svl \
|
|
svt \
|
|
tk \
|
|
tl \
|
|
utl \
|
|
vcl \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,acc,\
|
|
-DVCL_INTERNALS \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,acc,\
|
|
accessibility/source/extended/AccessibleBrowseBox \
|
|
accessibility/source/extended/AccessibleBrowseBoxBase \
|
|
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell \
|
|
accessibility/source/extended/AccessibleBrowseBoxHeaderBar \
|
|
accessibility/source/extended/AccessibleBrowseBoxHeaderCell \
|
|
accessibility/source/extended/AccessibleBrowseBoxTable \
|
|
accessibility/source/extended/AccessibleBrowseBoxTableBase \
|
|
accessibility/source/extended/AccessibleBrowseBoxTableCell \
|
|
accessibility/source/extended/AccessibleGridControl \
|
|
accessibility/source/extended/AccessibleGridControlBase \
|
|
accessibility/source/extended/AccessibleGridControlHeader \
|
|
accessibility/source/extended/AccessibleGridControlHeaderCell \
|
|
accessibility/source/extended/AccessibleGridControlTable \
|
|
accessibility/source/extended/AccessibleGridControlTableBase \
|
|
accessibility/source/extended/AccessibleGridControlTableCell \
|
|
accessibility/source/extended/accessiblebrowseboxcell \
|
|
accessibility/source/extended/accessibleeditbrowseboxcell \
|
|
accessibility/source/extended/accessibleiconchoicectrl \
|
|
accessibility/source/extended/accessibleiconchoicectrlentry \
|
|
accessibility/source/extended/AccessibleIconView \
|
|
accessibility/source/extended/accessiblelistbox \
|
|
accessibility/source/extended/accessiblelistboxentry \
|
|
accessibility/source/extended/accessibletablistbox \
|
|
accessibility/source/extended/accessibletablistboxtable \
|
|
accessibility/source/extended/textwindowaccessibility \
|
|
accessibility/source/helper/acc_factory \
|
|
accessibility/source/helper/accresmgr \
|
|
accessibility/source/helper/IComboListBoxHelper \
|
|
accessibility/source/standard/floatingwindowaccessible \
|
|
accessibility/source/standard/svtaccessiblenumericfield \
|
|
accessibility/source/standard/vclxaccessiblebox \
|
|
accessibility/source/standard/vclxaccessiblebutton \
|
|
accessibility/source/standard/vclxaccessiblecheckbox \
|
|
accessibility/source/standard/vclxaccessiblecombobox \
|
|
accessibility/source/standard/vclxaccessibledropdowncombobox \
|
|
accessibility/source/standard/vclxaccessibledropdownlistbox \
|
|
accessibility/source/standard/vclxaccessibleedit \
|
|
accessibility/source/standard/vclxaccessiblefixedhyperlink \
|
|
accessibility/source/standard/vclxaccessiblefixedtext \
|
|
accessibility/source/standard/vclxaccessibleheaderbar \
|
|
accessibility/source/standard/vclxaccessibleheaderbaritem \
|
|
accessibility/source/standard/vclxaccessiblelist \
|
|
accessibility/source/standard/vclxaccessiblelistbox \
|
|
accessibility/source/standard/vclxaccessiblelistitem \
|
|
accessibility/source/standard/vclxaccessibleradiobutton \
|
|
accessibility/source/standard/vclxaccessiblescrollbar \
|
|
accessibility/source/standard/vclxaccessiblestatusbar \
|
|
accessibility/source/standard/vclxaccessiblestatusbaritem \
|
|
accessibility/source/standard/vclxaccessibletabcontrol \
|
|
accessibility/source/standard/vclxaccessibletabpage \
|
|
accessibility/source/standard/vclxaccessibletabpagewindow \
|
|
accessibility/source/standard/vclxaccessibletextcomponent \
|
|
accessibility/source/standard/vclxaccessibletextfield \
|
|
accessibility/source/standard/vclxaccessibletoolbox \
|
|
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:
|