Michael Weghorn
7503bb286f
Drop the com.sun.star.accessibility.GetStandardAccessibleFactoryService
UNO service that was used to create instances of
the a11y classes for (mainly vcl) widgets.
The service was needed to break a dependency cycle.
However, with
Change-Id: Ib46c87446dc9121d3b8e735e0e5a40594da73cc5
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Tue Dec 17 12:04:04 2024 +0100
a11y: Merge accessibility module into vcl
and all the preparatory commits in place, there
is no more dependency cycle, as the a11y classes
for vcl widgets no longer depend on any modules
"above" vcl.
Therefore, drop the UNO service and the abstract
vcl::IAccessibleFactory class and other related
classes.
Make all methods in the AccessibleFactory class
(that was previously subclassing the abstract
IAccessibleFactory) static helper methods,
and call them directly.
The UNO service dropped in this commit was
introduced in
commit 1af510e951
Date: Wed Feb 21 11:30:47 2024 +0200
Create an UNO service to do the symbol lookup in toolkit::AccessibilityClient
and its documentation was already clearly stating
that it's only meant for LibreOffice internal use:
> /**
> The toolkit module uses this to get a pointer to the AccessibleFactory from the acc module.
> Because we have a dependency in our modules that goes the "wrong" way.
>
> @since LibreOffice 24.8
>
> @internal
>
> ATTENTION: This is marked <em>internal</em> and does not
> have the <em>published</em> flag, which means it is subject to
> change without notice and should not be used outside the LibreOffice core.
> */
Change-Id: Ib97396a4bad486d9530361dd851ad3ee0f9681b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178689
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
148 lines
5.1 KiB
Makefile
148 lines
5.1 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/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,tk))
|
|
|
|
$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk,services))
|
|
|
|
$(eval $(call gb_Library_use_externals,tk,\
|
|
boost_headers \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_include,tk,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/toolkit/inc \
|
|
-I$(SRCDIR)/toolkit/source \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,tk,\
|
|
-DTOOLKIT_DLLIMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,tk))
|
|
|
|
$(eval $(call gb_Library_use_libraries,tk,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
salhelper \
|
|
i18nlangtag \
|
|
svl \
|
|
tl \
|
|
utl \
|
|
vcl \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,tk,\
|
|
toolkit/source/awt/asynccallback \
|
|
toolkit/source/awt/stylesettings \
|
|
toolkit/source/awt/scrollabledialog \
|
|
toolkit/source/awt/vclxbitmap \
|
|
toolkit/source/awt/vclxcontainer \
|
|
toolkit/source/awt/vclxdevice \
|
|
toolkit/source/awt/vclxfont \
|
|
toolkit/source/awt/vclxgraphics \
|
|
toolkit/source/awt/vclxmenu \
|
|
toolkit/source/awt/vclxpointer \
|
|
toolkit/source/awt/vclxprinter \
|
|
toolkit/source/awt/vclxregion \
|
|
toolkit/source/awt/vclxspinbutton \
|
|
toolkit/source/awt/vclxsystemdependentwindow \
|
|
toolkit/source/awt/vclxtabpagecontainer \
|
|
toolkit/source/awt/animatedimagespeer \
|
|
toolkit/source/awt/vclxtoolkit \
|
|
toolkit/source/awt/vclxtopwindow \
|
|
toolkit/source/awt/vclxwindow \
|
|
toolkit/source/awt/vclxwindow1 \
|
|
toolkit/source/awt/vclxwindows \
|
|
toolkit/source/controls/accessiblecontrolcontext \
|
|
toolkit/source/controls/controlmodelcontainerbase \
|
|
toolkit/source/controls/dialogcontrol \
|
|
toolkit/source/controls/eventcontainer \
|
|
toolkit/source/controls/filectrl \
|
|
toolkit/source/controls/formattedcontrol \
|
|
toolkit/source/controls/geometrycontrolmodel \
|
|
toolkit/source/controls/grid/defaultgridcolumnmodel \
|
|
toolkit/source/controls/grid/defaultgriddatamodel \
|
|
toolkit/source/controls/grid/gridcolumn \
|
|
toolkit/source/controls/grid/grideventforwarder \
|
|
toolkit/source/controls/grid/sortablegriddatamodel \
|
|
toolkit/source/controls/grid/gridcontrol \
|
|
toolkit/source/controls/roadmapcontrol \
|
|
toolkit/source/controls/roadmapentry \
|
|
toolkit/source/controls/svtxgridcontrol \
|
|
toolkit/source/controls/svmedit \
|
|
toolkit/source/controls/tabpagecontainer \
|
|
toolkit/source/controls/tabpagemodel \
|
|
toolkit/source/controls/stdtabcontroller \
|
|
toolkit/source/controls/stdtabcontrollermodel \
|
|
toolkit/source/controls/tkscrollbar \
|
|
toolkit/source/controls/tkspinbutton \
|
|
toolkit/source/controls/animatedimages \
|
|
toolkit/source/controls/spinningprogress \
|
|
toolkit/source/controls/table/cellvalueconversion \
|
|
toolkit/source/controls/table/defaultinputhandler \
|
|
toolkit/source/controls/table/gridtablerenderer \
|
|
toolkit/source/controls/table/mousefunction \
|
|
toolkit/source/controls/table/tablecontrol \
|
|
toolkit/source/controls/table/tablecontrol_impl \
|
|
toolkit/source/controls/table/tabledatawindow \
|
|
toolkit/source/controls/table/tablegeometry \
|
|
toolkit/source/controls/tree/treecontrol \
|
|
toolkit/source/controls/tree/treecontrolpeer \
|
|
toolkit/source/controls/tree/treedatamodel \
|
|
toolkit/source/controls/unocontrol \
|
|
toolkit/source/controls/unocontrolbase \
|
|
toolkit/source/controls/unocontrolcontainer \
|
|
toolkit/source/controls/unocontrolcontainermodel \
|
|
toolkit/source/controls/unocontrolmodel \
|
|
toolkit/source/controls/unocontroltablemodel \
|
|
toolkit/source/controls/unocontrols \
|
|
toolkit/source/controls/unogridcolumnfacade \
|
|
toolkit/source/hatchwindow/documentcloser \
|
|
toolkit/source/hatchwindow/hatchwindow \
|
|
toolkit/source/hatchwindow/hatchwindowfactory \
|
|
toolkit/source/hatchwindow/ipwin \
|
|
toolkit/source/helper/btndlg \
|
|
toolkit/source/helper/imagealign \
|
|
toolkit/source/helper/listenermultiplexer \
|
|
toolkit/source/helper/property \
|
|
toolkit/source/helper/tkresmgr \
|
|
toolkit/source/helper/unopropertyarrayhelper \
|
|
toolkit/source/helper/unowrapper \
|
|
toolkit/source/helper/vclunohelper \
|
|
))
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_Library_add_cxxflags,tk,\
|
|
$(gb_OBJCXXFLAGS) \
|
|
))
|
|
$(eval $(call gb_Library_add_libs,tk,\
|
|
-lobjc \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),iOS)
|
|
$(eval $(call gb_Library_add_cxxflags,tk,\
|
|
$(gb_OBJCXXFLAGS)))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|