refactor UnoApi class

5 files changed, 222 insertions, 286 deletions

diff --git a/offapi/Module_offapi.mk b/offapi/Module_offapi.mk
index 6f77ab6d8633..a78b14126846 100644
--- a/offapi/Module_offapi.mk
+++ b/offapi/Module_offapi.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,offapi))
 
 $(eval $(call gb_Module_add_targets,offapi,\
 	UnoApi_offapi \
-	UnoApi_types \
-	Package_offapi_idl \
-	Package_offapi_inc \
+	UnoApiMerge_types \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk
deleted file mode 100644
index e1a01fb6c9f1..000000000000
--- a/offapi/Package_offapi_idl.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_idl,offapi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk
deleted file mode 100644
index f7f7634f16c6..000000000000
--- a/offapi/Package_offapi_inc.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_inc,offapi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApiMerge_types.mk
index df0da0603c27..a97945d3dfe5 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApiMerge_types.mk
@@ -26,21 +26,21 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
+$(eval $(call gb_UnoApiMerge_UnoApiMerge,types))
 
-$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
+$(eval $(call gb_UnoApiMerge_add_rdbfiles,types,\
     udkapi \
     offapi \
 ))
 
-$(eval $(call gb_UnoApiTarget_add_reference_rdbfile,types,\
+$(eval $(call gb_UnoApiMerge_add_reference_rdbfile,types,\
     offapi/type_reference/types \
 ))
 
 # ugly hack for now!
 statistic : $(gb_Helper_MISC)/api_statistic
 
-$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiTarget_get_target,types)
-	$(PERL) util/checknewapi.pl $(call gb_UnoApiTarget_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiTarget_REGVIEWTARGET)" > $@
+$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiMerge_get_target,types)
+	$(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 23c4523c790a..1074f6fb0a8b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -26,75 +26,75 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
+$(eval $(call gb_UnoApi_UnoApi,offapi))
 
-$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
+$(eval $(call gb_UnoApi_add_api,offapi,\
     udkapi \
 ))
 
-$(eval $(call gb_UnoApiTarget_set_include,offapi,\
+$(eval $(call gb_UnoApi_set_include,offapi,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/offapi \
 	-I$(OUTDIR)/idl \
 ))
 
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
 	TargetPropertiesCreator \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
 	AsyncCallback \
 	ContainerWindowProvider \
 	DialogProvider \
 	DialogProvider2 \
 	UnoControlDialogModelProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
 	DefaultGridDataModel \
 	SortableGridDataModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
 	UnoControlTabPageModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
 	MutableTreeDataModel \
 	MutableTreeNode \
 	TreeControl \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
 	DatabaseDataProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\
     ReadOnlyAccess \
     ReadWriteAccess \
 	Update \
     theDefaultProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
 	ExtensionManager \
 	PackageInformationProvider \
 	PackageRegistryBackend \
 	UpdateInformationProvider \
 	thePackageManagerFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\
 	SmoketestCommandEnvironment \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\
 	LicenseDialog \
 	PackageManagerDialog \
 	UpdateRequiredDialog \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
 	DocumentProperties \
 	DocumentRevisionListPersistence \
 	OOXMLDocumentPropertiesImporter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
 	SlideRenderer \
 	SlideSorter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\
 	BasicPaneFactory \
 	BasicToolBarFactory \
 	BasicViewFactory \
@@ -103,33 +103,33 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw
 	ModuleController \
 	ResourceId \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
 	DocumentCloser \
 	InstanceLocker \
 	OLESimpleStorage \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
 	DefaultFormComponentInspectorModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
 	FormOperations \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
 	GraphicObject \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
 	DefaultHelpProvider \
 	GenericPropertyHandler \
 	ObjectInspector \
 	ObjectInspectorModel \
 	StringRepresentation \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
 	LanguageGuessing \
 	Proofreader \
 	ProofreadingIterator \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\
 	ConsoleHandler \
 	CsvLogFormatter \
 	DocumentIOLogRing \
@@ -138,29 +138,29 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logg
 	PlainTextFormatter \
 	SimpleLogRing \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\
 	MailMessage \
 	MailServiceProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
 	Manager \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
 	SlideShow \
 	TransitionFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\
 	BlankNode \
 	Literal \
 	Repository \
 	URI \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\
 	Canvas \
 	CanvasFactory \
 	MtfRenderer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\
 	FixedLine \
 	FixedText \
 	FormatCondition \
@@ -175,42 +175,42 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/repo
 	Section \
 	Shape \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\
 	DefaultComponentInspectorModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\
 	OfficeResourceLoader \
 	StringResource \
 	StringResourceWithLocation \
 	StringResourceWithStorage \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
 	DocumentDialogLibraryContainer \
 	DocumentScriptLibraryContainer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\
 	ScriptURIHelper \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\
 	VBAEventProcessor \
 	VBAMacroResolver \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
 	DataAccessDescriptorFactory \
 	DatabaseInteractionHandler \
 	InteractionHandler \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\
 	CopyTableWizard \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
 	ConnectionPool \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
 	CertificateContainer \
 	SerialNumberAdapter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
 	ExternalDocLink \
 	ExternalDocLinks \
 	ExternalSheetCache \
@@ -218,49 +218,49 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/shee
 	FormulaOpCodeMapper \
 	Solver \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
 	SmartTagAction \
 	SmartTagRecognizer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
 	InteractionRequestStringResolver \
 	OfficeRestartManager \
 	PasswordContainerInteractionHandler \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
 	CommandEnvironment \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
 	GlobalAcceleratorConfiguration \
 	WindowContentFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\
 	Wizard \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
 	JobManager \
 	UriAbbreviation \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
 	FastShapeContextHandler \
 	FastTokenHandler \
 ))
 
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
 	modules \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
 	AccessBridge \
 	Accessible \
 	AccessibleContext \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\
 	SSOExceptions \
 	SSOManagerFactory \
 	SSOPasswordCache \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
 	AccessibleButton \
 	AccessibleCheckBox \
 	AccessibleComboBox \
@@ -359,21 +359,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a
 	UnoControlTimeField \
 	UnoControlTimeFieldModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
 	DefaultGridColumnModel \
 	GridColumn \
 	UnoControlGrid \
 	UnoControlGridModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\
 	UnoControlTabPage \
 	UnoControlTabPageContainer \
 	UnoControlTabPageContainerModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\
 	TreeControlModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\
 	AccessibleChartDocumentView \
 	AccessibleChartElement \
 	AreaDiagram \
@@ -410,7 +410,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c
 	StockDiagram \
 	XYDiagram \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\
 	Axis \
 	CandleStickChartType \
 	ChartDocument \
@@ -440,7 +440,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c
 	StandardDiagramCreationParameters \
 	Title \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\
 	DataFilter \
 	DataProvider \
 	DataSequence \
@@ -451,7 +451,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c
 	RangeHighlightListener \
 	TabularDataProviderArguments \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\
 	AccessRootElement \
 	AdministrationProvider \
 	ConfigurationAccess \
@@ -472,7 +472,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c
 	SimpleSetUpdate \
 	UpdateRootElement \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\
 	Backend \
 	BackendAdapter \
 	CopyImporter \
@@ -507,30 +507,30 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c
 	SystemIntegration \
 	UpdatableLayer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\
 	LayerParser \
 	LayerWriter \
 	SchemaParser \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\
 	BootstrapContext \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\
 	DataFormatTranslator \
 	MimeContentTypeFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\
 	ClipboardManager \
 	GenericClipboard \
 	SystemClipboard \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\
 	OleDragSource \
 	OleDropTarget \
 	X11DragSource \
 	X11DropTarget \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\
 	DocumentInfo \
 	EventDescriptor \
 	Events \
@@ -555,7 +555,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d
 	XMLOasisBasicExporter \
 	XMLOasisBasicImporter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
 	AccessibleDrawDocumentView \
 	AccessibleGraphControl \
 	AccessibleGraphicShape \
@@ -626,7 +626,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d
 	TransparencyGradientTable \
 	modules \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
 	BaseStorage \
 	EmbeddedObjectDescriptor \
 	FileSystemStorage \
@@ -635,7 +635,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/e
 	StorageFactory \
 	StorageStream \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
 	DataAwareControlModel \
 	FormComponent \
 	FormComponents \
@@ -646,7 +646,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	PropertyBrowserController \
 	modules \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
 	BindableControlModel \
 	BindableDataAwareControlModel \
 	BindableDatabaseCheckBox \
@@ -662,7 +662,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	ListEntrySource \
 	ValueBinding \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\
 	CheckBox \
 	ComboBox \
 	CommandButton \
@@ -702,7 +702,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	TextField \
 	TimeField \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\
 	CheckBox \
 	ComboBox \
 	CommandButton \
@@ -723,7 +723,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	TextField \
 	TimeField \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\
 	ButtonNavigationHandler \
 	CellBindingPropertyHandler \
 	EditPropertyHandler \
@@ -733,19 +733,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	XMLFormsPropertyHandler \
 	XSDValidationPropertyHandler \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/runtime,\
 	FormController \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\
 	ValidatableBindableControlModel \
 	ValidatableControlModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\
 	AccessibleFormulaText \
 	AccessibleFormulaView \
 	FormulaProperties \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
 	Components \
 	ContentHandler \
 	ContentHandlerFactory \
@@ -780,12 +780,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	ToolbarController \
 	TransientDocumentsDocumentContentFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\
 	GalleryItem \
 	GalleryTheme \
 	GalleryThemeProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
 	Graphic \
 	GraphicDescriptor \
 	GraphicProvider \
@@ -793,7 +793,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/g
 	GraphicRendererVCL \
 	MediaProperties \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
 	BreakIterator \
 	ChapterCollator \
 	CharacterClassification \
@@ -808,21 +808,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i
 	TextConversion \
 	Transliteration \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\
 	ImageMap \
 	ImageMapCircleObject \
 	ImageMapObject \
 	ImageMapPolygonObject \
 	ImageMapRectangleObject \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/installation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/installation,\
 	InstallationCheck \
 	InstallationCheckService \
 	InternetSettings \
 	ProtocolHandlerCheck \
 	ProtocolHandlerCheckService \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\
 	ConversionDictionary \
 	ConversionDictionaryList \
 	Dictionary \
@@ -834,24 +834,24 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/l
 	SpellChecker \
 	Thesaurus \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
 	MenuProxy \
 	MenuProxyListener \
 	MozillaBootstrap \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
 	Package \
 	PackageFolder \
 	PackageFolderEnumeration \
 	PackageStream \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
 	ZipFileAccess \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\
 	PluginManager \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
 	ChartShape \
 	CustomPresentation \
 	CustomPresentationAccess \
@@ -880,33 +880,33 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/p
 	SubtitleShape \
 	TitleTextShape \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\
 	DateTime \
 	Footer \
 	Header \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
 	BitmapCanvas \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\
 	modules \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
 	DataProviderHandler \
 	ReportComponentHandler \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scaddins,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/scaddins,\
 	analysisadd \
 	dateadd \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\
 	ScannerManager \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
 	BrowseNode \
 	BrowseNodeFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\
 	LanguageScriptProvider \
 	MasterScriptProvider \
 	MasterScriptProviderFactory \
@@ -916,11 +916,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	ScriptProviderForJava \
 	ScriptProviderForJavaScript \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\
 	VBASpreadsheetEventProcessor \
 	VBATextEventProcessor \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\
 	CallableStatement \
 	Column \
 	ColumnDescriptorControl \
@@ -968,10 +968,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	TableDescriptor \
 	TableDesign \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\
 	DefaultViewController \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\
 	CallableStatement \
 	Connection \
 	ConnectionProperties \
@@ -987,7 +987,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	RowSet \
 	Statement \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
 	Column \
 	ColumnDescriptor \
 	Container \
@@ -1015,14 +1015,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	View \
 	ViewDescriptor \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/security,\
 	DocumentDigitalSignatures \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\
 	ProductRegistration \
 	Setup \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
 	AccessibleCell \
 	AccessibleCsvCell \
 	AccessibleCsvRuler \
@@ -1135,7 +1135,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	UniqueCellFormatRangesEnumeration \
 	VolatileResult \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
 	CellStyle \
 	CharacterProperties \
 	CharacterPropertiesAsian \
@@ -1154,11 +1154,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	StyleFamilies \
 	StyleFamily \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\
 	SyncCollector \
 	Synchronizer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\
 	ProxySettings \
 	SOffice52ProxySettings \
 	SimpleCommandMail \
@@ -1166,7 +1166,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	SystemProxySettings \
 	SystemShellExecute \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
 	AccessibleCellView \
 	AccessibleTableView \
 	Cell \
@@ -1188,14 +1188,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	TableSortDescriptor \
 	TableSortDescriptor2 \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
 	AsyncJob \
 	InteractionHandler \
 	Job \
 	JobExecutor \
 	PasswordContainer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
 	AccessibleEndnoteView \
 	AccessibleFootnoteView \
 	AccessibleHeaderFooterView \
@@ -1307,14 +1307,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	ViewSettings \
 	WebDocument \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\
 	Bibliography \
 	DDE \
 	Database \
 	SetExpression \
 	User \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\
 	Annotation \
 	Author \
 	Bibliography \
@@ -1357,7 +1357,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	User \
 	WordCount \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\
 	ChangeAuthor \
 	ChangeDateTime \
 	CreateAuthor \
@@ -1376,7 +1376,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	Subject \
 	Title \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
 	AnyCompareFactory \
 	CachedContentResultSet \
 	CachedContentResultSetFactory \
@@ -1437,7 +1437,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
 	WebDAVDocumentContent \
 	WebDAVFolderContent \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
 	ActionTrigger \
 	ActionTriggerContainer \
 	ActionTriggerSeparator \
@@ -1457,12 +1457,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
 	UIElementSettings \
 	WindowStateConfiguration \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\
 	FilePicker \
 	FilterOptionsDialog \
 	FolderPicker \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
 	NumberFormatProperties \
 	NumberFormatSettings \
 	NumberFormats \
@@ -1479,7 +1479,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
 	TextSearch \
 	URLTransformer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
 	OfficeDocumentView \
 	PrintOptions \
 	PrintSettings \
@@ -1488,10 +1488,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/v
 	RenderOptions \
 	ViewSettings \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\
 	Binding \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
 	AttributeContainer \
 	ExportFilter \
 	ImportFilter \
@@ -1503,7 +1503,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x
 	XMLExportFilter \
 	XMLImportFilter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\
 	SEInitializer \
 	SecurityEnvironment \
 	XMLEncryption \
@@ -1512,29 +1512,29 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x
 	XMLSignature \
 	XMLSignatureTemplate \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\
 	Decryptor \
 	Encryptor \
 	SAXEventKeeper \
 	SignatureCreator \
 	SignatureVerifier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\
 	SAXDocumentBuilder \
 	DocumentBuilder \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\
 	SaxDocumentHandler \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\
 	XMLDocumentWrapper \
 	XMLElementWrapper \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/xpath,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/xpath,\
 	XPathAPI \
 	XPathExtension \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\
 	Boolean \
 	Date \
 	DateTime \
@@ -1547,7 +1547,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x
 ))
 
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\
 	AccessibleEventId \
 	AccessibleEventObject \
 	AccessibleRelation \
@@ -1581,7 +1581,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/accessibil
 	XAccessibleTextMarkup \
 	XAccessibleValue \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/animations,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\
 	AnimationAdditiveMode \
 	AnimationCalcMode \
 	AnimationColorSpace \
@@ -1614,7 +1614,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/animations
 	XTimeContainer \
 	XTransitionFilter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/auth,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\
 	AuthenticationFailedException \
 	InvalidArgumentException \
 	InvalidContextException \
@@ -1629,7 +1629,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/auth,\
 	XSSOManagerFactory \
 	XSSOPasswordCache \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
 	ActionEvent \
 	AdjustmentEvent \
 	AdjustmentType \
@@ -1826,7 +1826,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\
 	XWindowListener2 \
 	XWindowPeer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
 	GridColumnEvent \
 	GridDataEvent \
 	GridInvalidDataException \
@@ -1846,7 +1846,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
 	XSortableGridData \
 	XSortableMutableGridDataModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
 	TabPageActivatedEvent \
 	XTabPage \
 	XTabPageContainer \
@@ -1854,7 +1854,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
 	XTabPageContainerModel \
 	XTabPageModel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
 	ExpandVetoException \
 	TreeDataModelEvent \
 	TreeExpansionEvent \
@@ -1867,7 +1867,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
 	XTreeExpansionListener \
 	XTreeNode \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\
 	ChartAxisArrangeOrderType \
 	ChartAxisAssign \
 	ChartAxisLabelPosition \
@@ -1916,7 +1916,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart,\
 	XTwoAxisXSupplier \
 	XTwoAxisYSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
 	AxisOrientation \
 	AxisType \
 	CoordinateSystemTypeID \
@@ -1969,7 +1969,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
 	XTitled \
 	XTransformation \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
 	DataSequenceRole \
 	HighlightedRange \
 	LabelOrigin \
@@ -1986,7 +1986,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/dat
 	XSheetDataProvider \
 	XTextualDataSequence \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
 	CannotLoadConfigurationException \
 	CorruptedConfigurationException \
 	CorruptedUIConfigurationException \
@@ -1998,7 +1998,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configurat
 	XTemplateInstance \
 	XUpdate \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\
 	AuthenticationFailedException \
 	BackendAccessException \
 	BackendSetupException \
@@ -2032,7 +2032,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configurat
 	XUpdateHandler \
 	XVersionedSchemaSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\
 	DataFlavor \
 	UnsupportedFlavorException \
 	XDataFormatTranslator \
@@ -2045,7 +2045,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf
 	XTransferableSource \
 	XTransferableSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\
 	ClipboardEvent \
 	RenderingCapabilities \
 	XClipboard \
@@ -2057,7 +2057,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf
 	XClipboardOwner \
 	XFlushableClipboard \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\
 	DNDConstants \
 	DragGestureEvent \
 	DragSourceDragEvent \
@@ -2079,7 +2079,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf
 	XDropTargetDropContext \
 	XDropTargetListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/deployment,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\
 	DependencyException \
 	DeploymentException \
 	ExtensionRemovedException \
@@ -2099,7 +2099,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/deployment
 	XPackageTypeInfo \
 	XUpdateInformationProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
 	AmbigousFilterRequest \
 	BrokenPackageRequest \
 	ChangedByOthersRequest \
@@ -2167,7 +2167,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/document,\
 	XVbaMethodParameter \
 	XViewDataSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
 	Alignment \
 	Arrangement \
 	BezierPoint \
@@ -2284,7 +2284,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
 	XSlideSorterBase \
 	XUniversalShapeDescriptor \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\
 	AnchorBindingMode \
 	BorderType \
 	ConfigurationChangeEvent \
@@ -2310,7 +2310,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing/fr
 	XToolBar \
 	XView \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\
 	Actions \
 	Aspects \
 	ElementModes \
@@ -2377,7 +2377,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/embed,\
 	XVisualObject \
 	XWindowSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\
 	DataSelectionType \
 	DatabaseDeleteEvent \
 	DatabaseParameterEvent \
@@ -2428,7 +2428,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form,\
 	XUpdateBroadcaster \
 	XUpdateListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\
 	IncompatibleTypesException \
 	InvalidBindingStateException \
 	ListEntryEvent \
@@ -2438,7 +2438,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/bindi
 	XListEntrySource \
 	XValueBinding \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\
 	FeatureState \
 	FilterEvent \
 	FormFeature \
@@ -2449,22 +2449,22 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/runti
 	XFormControllerContext \
 	XFormOperations \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\
 	XSubmission \
 	XSubmissionSupplier \
 	XSubmissionVetoListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\
 	XFormComponentValidityListener \
 	XValidatable \
 	XValidatableFormComponent \
 	XValidator \
 	XValidityConstraintListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/formula,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\
 	SymbolDescriptor \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
 	BorderWidths \
 	CommandGroup \
 	ControlCommand \
@@ -2557,7 +2557,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\
 	XUrlList \
 	XWindowArranger \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\
 	ClipboardFormats \
 	FontHeight \
 	ItemState \
@@ -2569,13 +2569,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame/stat
 	Verb \
 	Visibility \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/gallery,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\
 	GalleryItemType \
 	XGalleryItem \
 	XGalleryTheme \
 	XGalleryThemeProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
 	AffineMatrix2D \
 	AffineMatrix3D \
 	EllipticalArc \
@@ -2591,7 +2591,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
 	RealSize2D \
 	XMapping2D \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
 	GraphicColorMode \
 	GraphicType \
 	XGraphic \
@@ -2604,7 +2604,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
 	XPrimitive3D \
 	XPrimitiveFactory2D \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
 	AmPmValue \
 	Boundary \
 	BreakType \
@@ -2682,7 +2682,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
 	XTransliteration \
 	reservedWords \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\
 	InteractiveSelectionResult \
 	LineDescriptor \
 	PropertyCategoryDescriptor \
@@ -2701,17 +2701,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/inspection
 	XStringListControl \
 	XStringRepresentation \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/installation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/installation,\
 	ProtDlgRes \
 	XInstallationCheck \
 	XProtocolHandlerCheck \
 	protocols \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ldap,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\
 	LdapConnectionException \
 	LdapGenericException \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\
 	ConversionDictionaryType \
 	ConversionDirection \
 	ConversionPropertyType \
@@ -2755,7 +2755,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/linguistic
 	XSupportedLocales \
 	XThesaurus \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\
 	LogLevel \
 	LogRecord \
 	XConsoleHandler \
@@ -2766,7 +2766,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/logging,\
 	XLoggerPool \
 	XSimpleLogRing \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mail,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\
 	MailAttachment \
 	MailException \
 	MailServiceType \
@@ -2780,14 +2780,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mail,\
 	XMailServiceProvider \
 	XSmtpService \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/media,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/media,\
 	XFrameGrabber \
 	XManager \
 	XPlayer \
 	XPlayerWindow \
 	ZoomLevel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
 	MenuMultipleChange \
 	MenuSingleChange \
 	MozillaProductType \
@@ -2806,30 +2806,30 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
 	XProxyRunner \
 	XRemoteServiceManagerProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/office,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\
 	XAnnotation \
 	XAnnotationAccess \
 	XAnnotationEnumeration \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\
 	EncryptionNotAllowedException \
 	NoEncryptionException \
 	NoRawFormatException \
 	WrongPasswordException \
 	XDataSinkEncrSupport \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\
 	XManifestReader \
 	XManifestWriter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
 	XZipFileAccess \
 	ZipConstants \
 	ZipEntry \
 	ZipException \
 	ZipIOException \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
 	PluginDescription \
 	PluginException \
 	PluginMode \
@@ -2838,7 +2838,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
 	XPluginContext \
 	XPluginManager \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
 	AnimationEffect \
 	AnimationSpeed \
 	ClickAction \
@@ -2864,7 +2864,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/presentati
 	XTransition \
 	XTransitionFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
 	FileFormat \
 	ParseException \
 	QueryException \
@@ -2885,7 +2885,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
 	XResource \
 	XURI \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\
 	ARGBColor \
 	AnimationAttributes \
 	AnimationRepeat \
@@ -2963,7 +2963,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rendering,
 	XTextLayout \
 	XVolatileBitmap \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\
 	Calculation \
 	ForceNewPage \
 	GroupKeepTogether \
@@ -2989,13 +2989,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report,\
 	XSection \
 	XShape \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\
 	XFormulaParser \
 	XFunctionCategory \
 	XFunctionDescription \
 	XFunctionManager \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\
 	MissingResourceException \
 	XLocale \
 	XResourceBundle \
@@ -3007,14 +3007,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\
 	XStringResourceWithLocation \
 	XStringResourceWithStorage \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/scanner,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/scanner,\
 	ScanError \
 	ScannerContext \
 	ScannerException \
 	XScannerManager \
 	XScannerManager2 \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\
 	LibraryNotLoadedException \
 	ModuleInfo \
 	ModuleSizeExceededRequest \
@@ -3029,13 +3029,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\
 	XPersistentLibraryContainer \
 	XStorageBasedLibraryContainer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\
 	BrowseNodeFactoryViewTypes \
 	BrowseNodeTypes \
 	XBrowseNode \
 	XBrowseNodeFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\
 	ScriptErrorRaisedException \
 	ScriptExceptionRaisedException \
 	ScriptFrameworkErrorException \
@@ -3047,7 +3047,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/pro
 	XScriptProviderSupplier \
 	XScriptURIHelper \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\
 	VBAEventId \
 	VBAScriptEvent \
 	VBAScriptEventId \
@@ -3057,7 +3057,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/vba
 	XVBAModuleInfo \
 	XVBAScriptListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
 	BooleanComparisonMode \
 	CommandType \
 	DatabaseRegistrationEvent \
@@ -3109,7 +3109,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
 	XSingleSelectQueryComposer \
 	XSubDocument \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\
 	CopyTableContinuation \
 	CopyTableOperation \
 	CopyTableRowEvent \
@@ -3121,7 +3121,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/applic
 	XDatabaseDocumentUI \
 	XTableUIProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\
 	CompositionType \
 	XConnectionSupplier \
 	XConnectionTools \
@@ -3134,7 +3134,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,
 	XTableRename \
 	XViewAccess \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
 	BatchUpdateException \
 	BestRowScope \
 	BestRowType \
@@ -3194,7 +3194,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
 	XStruct \
 	XWarningsSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
 	CheckOption \
 	CompareBookmark \
 	KeyType \
@@ -3221,7 +3221,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
 	XUsersSupplier \
 	XViewsSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\
 	CertAltNameEntry \
 	CertificateCharacters \
 	CertificateContainerStatus \
@@ -3243,7 +3243,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/security,\
 	XSanExtension \
 	XSerialNumberAdapter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/setup,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/setup,\
 	ActionType \
 	BaseAction \
 	CopyFileAction \
@@ -3273,7 +3273,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/setup,\
 	WindowsRegistryAction \
 	XSetup \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
 	ActivationEvent \
 	AddressConvention \
 	Border \
@@ -3472,12 +3472,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
 	XVolatileResult \
 	_NamedRange \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\
 	SmartTagRecognizerMode \
 	XSmartTagAction \
 	XSmartTagRecognizer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/style,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\
 	BreakType \
 	CaseMap \
 	DropCapFormat \
@@ -3505,11 +3505,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/style,\
 	XStyleLoader \
 	XStyleSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/svg,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\
 	XSVGPrinter \
 	XSVGWriter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync,\
 	FilterData \
 	SyncAction \
 	SyncElement \
@@ -3522,10 +3522,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync,\
 	XSyncCollector \
 	XSynchronizer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync2,\
 	BadPartnershipException \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/system,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
 	SimpleMailClientFlags \
 	SystemShellExecuteException \
 	SystemShellExecuteFlags \
@@ -3535,7 +3535,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/system,\
 	XSimpleMailMessage \
 	XSystemShellExecute \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
 	BorderLine \
 	BorderLine2 \
 	BorderLineStyle \
@@ -3569,7 +3569,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\
 	XTableColumns \
 	XTableRows \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\
 	ClassifiedInteractionRequest \
 	DocumentMSPasswordRequest \
 	DocumentMSPasswordRequest2 \
@@ -3608,7 +3608,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/task,\
 	XStatusIndicatorSupplier \
 	XUrlContainer \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
 	AuthorDisplayFormat \
 	BibliographyDataField \
 	BibliographyDataType \
@@ -3734,7 +3734,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/text,\
 	XTextViewCursorSupplier \
 	XWordCursor \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
 	AlreadyInitializedException \
 	AuthenticationRequest \
 	CHAOSProgressStart \
@@ -3907,7 +3907,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
 	XSourceInitialization \
 	XWebDAVCommandEnvironment \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
 	ActionTriggerSeparatorType \
 	ConfigurationEvent \
 	ContextMenuExecuteEvent \
@@ -3937,7 +3937,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui,\
 	XUIElementSettings \
 	XUIFunctionListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\
 	CommonFilePickerElementIds \
 	ControlActions \
 	DialogClosedEvent \
@@ -3968,7 +3968,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs
 	XWizardController \
 	XWizardPage \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
 	AliasProgrammaticPair \
 	AtomClassRequest \
 	AtomDescription \
@@ -4066,7 +4066,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/util,\
 	XUniqueIDFactory \
 	XUpdatable \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/view,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\
 	DocumentZoomType \
 	DuplexMode \
 	PaperFormat \
@@ -4094,7 +4094,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/view,\
 	XViewCursor \
 	XViewSettingsSupplier \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
 	InvalidDataOnSubmitException \
 	XDataTypeRepository \
 	XFormsEvent \
@@ -4103,14 +4103,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
 	XModel \
 	XSubmission \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml,\
 	Attribute \
 	AttributeData \
 	FastAttribute \
 	XExportFilter \
 	XImportFilter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\
 	CipherID \
 	DigestID \
 	SecurityOperationStatus \
@@ -4130,7 +4130,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto
 	XXMLSignature \
 	XXMLSignatureTemplate \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\
 	ConstOfSecurityId \
 	ElementMarkPriority \
 	ElementMarkType \
@@ -4156,11 +4156,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto
 	XSignatureVerifyResultBroadcaster \
 	XSignatureVerifyResultListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\
 	XCompressedDocumentHandler \
 	XMLAttribute \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
 	DOMException \
 	DOMExceptionType \
 	NodeType \
@@ -4185,7 +4185,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
 	XSAXDocumentBuilder \
 	XText \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
 	AttrChangeType \
 	EventException \
 	EventType \
@@ -4198,17 +4198,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/ev
 	XMutationEvent \
 	XUIEvent \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\
 	XAbstractView \
 	XDocumentView \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\
 	XAttributes \
 	XElement \
 	XNamespaceMapping \
 	XRoot \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
 	FastToken \
 	InputSource \
 	SAXException \
@@ -4232,11 +4232,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
 	XParser \
 	XSAXSerializable \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\
 	XXMLDocumentWrapper \
 	XXMLElementWrapper \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\
 	Libxml2ExtensionHandle \
 	XPathException \
 	XPathObjectType \
@@ -4244,7 +4244,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,
 	XXPathExtension \
 	XXPathObject \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
 	DataTypeClass \
 	WhiteSpaceTreatment \
 	XDataType \