[Libreoffice-commits] core.git: cppuhelper/InternalUnoApi_cppuhelper.mk cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk cppu/InternalUnoApi_cppu_qa_types.mk jurt/InternalUnoApi_test_urp.mk offapi/type_reference offapi/UnoApi_offapi.mk oovbaapi/UnoApi_oovbaapi.mk RepositoryModule_build.mk scaddins/InternalUnoApi_scaddins.mk solenv/bin solenv/gbuild testtools/InternalUnoApi_bridgetest.mk testtools/InternalUnoApi_performance.mk touch/InternalUnoApi_touch.mk udkapi/UnoApi_udkapi.mk unoidl/README
Stephan Bergmann
sbergman at redhat.com
Thu Sep 19 06:51:08 PDT 2013
RepositoryModule_build.mk | 1
cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk | 11
cppu/InternalUnoApi_cppu_qa_types.mk | 11
cppuhelper/InternalUnoApi_cppuhelper.mk | 9
jurt/InternalUnoApi_test_urp.mk | 11
offapi/UnoApi_offapi.mk | 456 ++++++++++++-------------
offapi/type_reference/offapi.idl | 22 -
oovbaapi/UnoApi_oovbaapi.mk | 35 -
scaddins/InternalUnoApi_scaddins.mk | 11
solenv/bin/concat-deps.c | 5
solenv/gbuild/InternalUnoApi.mk | 9
solenv/gbuild/LinkTarget.mk | 1
solenv/gbuild/TargetLocations.mk | 3
solenv/gbuild/UnoApi.mk | 52 --
solenv/gbuild/UnoApiTarget.mk | 202 +----------
solenv/gbuild/extensions/pre_BuildTools.mk | 3
testtools/InternalUnoApi_bridgetest.mk | 11
testtools/InternalUnoApi_performance.mk | 11
touch/InternalUnoApi_touch.mk | 10
udkapi/UnoApi_udkapi.mk | 87 ++--
unoidl/README | 15
21 files changed, 337 insertions(+), 639 deletions(-)
New commits:
commit 6db34b6b33ba8e3b13683efd05df8441b87e9c92
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Sep 19 15:11:30 2013 +0200
Directly build UNOIDL .rdb files from .idl files
...via unoidl-write and the new source-format registry provicers, instead of
using idlc to produce .urd files, regmerge to merge them into legacy .rdb files,
and unoidl-write to translate those to new UNOIDL .rdb files.
gb_UnoApi and gb_InternalUnoApi ctors take an additional argument now that is
the path (below $(SRCDIR)) of the source-format registry from which to obtain
UNOIDL entity definitions. It can either be an .idl file (in which case no
*_add_idlfiles calls should be used and the resulting .rdb will contain all the
entities from that one .idl file; used in some tests to conveniently define all
test-specific entities in a single file) or a directory denoting the root of an
.idl file tree (in which case *_add_idlfiles calls specify the entites to
include in the resulting .idl file). (In the first case, the generated .rdb
file needs to depend on that single .idl file, so the gb_UnoApiTarget ctor
contains a dependency on that additional argument, which happens, as a side
effect, to trigger rebuilds in the second, tree-based case when addition/removal
of .idl files in the tree causes updates of directory time-stamps.)
UnoApiPartTarget and all the dependency-tracking logic based on .urd files in
solenv/gbuild/UnoApiTarget.mk is gone. Generation of an .rdb file now depends
on its source registry (see previous paragraph) and all the .idl files specified
with *_add_idlfiles (in the second, tree-based case above).
A consequence of that is that gb_UnoApi_add_idlfile, -_nohdl, and -_noheader all
do the same now. I left them in for now anyway, maybe they become relevant
again when the use of cppumaker is changed to read directly from a source-format
registry instead of going via a .rdb registry.
The legacy tools idlc, regcompare, regmerge, and regview are still contained in
the URE or SDK for now.
cb344cd59e1ddb7c6db66dbd9263b4755969d4ba "Revert 'Looks like idlc resolved
typedefs inside sequence<...>'" is re-reverted as now "the current offapi.rdb is
generated via unoidl-write instead of idlc."
Change-Id: I3d9d92f17326bc9f49dd934c85aab6a17951d06d
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 65cbd69..92ab57e 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
i18nutil \
i18npool \
idl \
- idlc \
io \
javaunohelper \
jurt \
diff --git a/cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk b/cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk
index 01fc9e7..3464bd4 100644
--- a/cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk
+++ b/cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk
@@ -7,19 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_cppumaker_types))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_cppumaker_types,cppu/qa/cppumaker/types.idl))
$(eval $(call gb_InternalUnoApi_use_api,cppu_qa_cppumaker_types,\
udkapi \
))
-$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_cppumaker_types,\
- -I$(SRCDIR)/udkapi \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu_qa_cppumaker_types,cppu/qa/cppumaker,\
- types \
-))
-
# vim:set noet sw=4 ts=4:
diff --git a/cppu/InternalUnoApi_cppu_qa_types.mk b/cppu/InternalUnoApi_cppu_qa_types.mk
index f94eaeb..3457226 100644
--- a/cppu/InternalUnoApi_cppu_qa_types.mk
+++ b/cppu/InternalUnoApi_cppu_qa_types.mk
@@ -7,19 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_types))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_types,cppu/qa/types.idl))
$(eval $(call gb_InternalUnoApi_use_api,cppu_qa_types,\
udkapi \
))
-$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_types,\
- -I$(SRCDIR)/udkapi \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu_qa_types,cppu/qa,\
- types \
-))
-
# vim:set noet sw=4 ts=4:
diff --git a/cppuhelper/InternalUnoApi_cppuhelper.mk b/cppuhelper/InternalUnoApi_cppuhelper.mk
index 31129cf..d2849b0 100644
--- a/cppuhelper/InternalUnoApi_cppuhelper.mk
+++ b/cppuhelper/InternalUnoApi_cppuhelper.mk
@@ -7,18 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppuhelper))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppuhelper,cppuhelper/unotypes))
$(eval $(call gb_InternalUnoApi_use_api,cppuhelper,\
udkapi \
))
-$(eval $(call gb_InternalUnoApi_set_include,cppuhelper,\
- -I$(SRCDIR)/udkapi \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppuhelper,cppuhelper/unotypes/cppuhelper/detail,\
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppuhelper,cppuhelper/detail,\
XExceptionThrower \
))
diff --git a/jurt/InternalUnoApi_test_urp.mk b/jurt/InternalUnoApi_test_urp.mk
index 36c885e..637ce1b 100644
--- a/jurt/InternalUnoApi_test_urp.mk
+++ b/jurt/InternalUnoApi_test_urp.mk
@@ -7,19 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,test_urp))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl))
$(eval $(call gb_InternalUnoApi_use_api,test_urp,\
udkapi \
))
-$(eval $(call gb_InternalUnoApi_set_include,test_urp,\
- -I$(SRCDIR)/udkapi \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp,\
- interfaces \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index adfb9c9..be91841 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_UnoApi_UnoApi,offapi))
+$(eval $(call gb_UnoApi_UnoApi,offapi,offapi))
$(eval $(call gb_UnoApi_install,offapi,$(gb_PROGRAMDIRNAME)/types/offapi.rdb))
@@ -27,17 +27,11 @@ $(eval $(call gb_UnoApi_use_api,offapi,\
udkapi \
))
-$(eval $(call gb_UnoApi_set_include,offapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/udkapi \
- -I$(SRCDIR)/offapi \
-))
-
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/accessibility,\
AccessBridge \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/animations,\
AnimateColor \
AnimateMotion \
AnimateSet \
@@ -48,11 +42,11 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations
SequenceTimeContainer \
TargetPropertiesCreator \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/auth,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/auth,\
SSOManagerFactory \
SSOPasswordCache \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/awt,\
AsyncCallback \
ContainerWindowProvider \
DialogProvider \
@@ -65,20 +59,20 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
UnoControlDialog \
UnoControlDialogModelProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/awt/grid,\
DefaultGridColumnModel \
DefaultGridDataModel \
SortableGridDataModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/awt/tab,\
UnoControlTabPageModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/awt/tree,\
MutableTreeDataModel \
MutableTreeNode \
TreeControl \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/chart2,\
CartesianCoordinateSystem2d \
CartesianCoordinateSystem3d \
ExponentialRegressionCurve \
@@ -97,42 +91,42 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2,\
RegressionEquation \
Scaling \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/chart2/data,\
DatabaseDataProvider \
LabeledDataSequence \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/configuration,\
ReadOnlyAccess \
ReadWriteAccess \
Update \
theDefaultProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/cui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/cui,\
ColorPicker \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/datatransfer,\
DataFormatTranslator \
MimeContentTypeFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/datatransfer/clipboard,\
SystemClipboard \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/deployment,\
ExtensionManager \
PackageInformationProvider \
PackageRegistryBackend \
UpdateInformationProvider \
thePackageManagerFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/deployment/test,\
SmoketestCommandEnvironment \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/deployment/ui,\
LicenseDialog \
PackageManagerDialog \
UpdateRequiredDialog \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/document,\
DocumentProperties \
DocumentRevisionListPersistence \
IndexedPropertyValues \
@@ -145,7 +139,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
XMLOasisBasicExporter \
XMLOasisBasicImporter \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/drawing,\
ColorTable \
GraphicExportFilter \
ModuleDispatcher \
@@ -153,7 +147,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
SlideRenderer \
SlideSorter \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/drawing/framework,\
BasicPaneFactory \
BasicToolBarFactory \
BasicViewFactory \
@@ -162,7 +156,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/fr
ModuleController \
ResourceId \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/embed,\
DocumentCloser \
EmbeddedObjectCreator \
FileSystemStorageFactory \
@@ -174,23 +168,23 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
OOoEmbeddedObjectFactory \
StorageFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/form,\
ControlFontDialog \
Forms \
TabOrderDialog \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/control,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/form/control,\
FilterControl \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/form/inspection,\
DefaultFormComponentInspectorModel \
FormComponentPropertyHandler \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/form/runtime,\
FormController \
FormOperations \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/frame,\
AutoRecovery \
AppDispatchProvider \
Bibliography \
@@ -212,20 +206,20 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
TaskCreator \
UICommandDescription \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/graphic,\
GraphicObject \
GraphicProvider \
Primitive2DTools \
SvgTools \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/inspection,\
DefaultHelpProvider \
GenericPropertyHandler \
ObjectInspector \
ObjectInspectorModel \
StringRepresentation \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/i18n,\
BreakIterator \
CharacterClassification \
Collator \
@@ -239,7 +233,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
TextConversion \
Transliteration \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/linguistic2,\
ConversionDictionaryList \
DictionaryList \
LanguageGuessing \
@@ -248,7 +242,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic
Proofreader \
ProofreadingIterator \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/logging,\
ConsoleHandler \
CsvLogFormatter \
DocumentIOLogRing \
@@ -257,45 +251,45 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\
PlainTextFormatter \
SimpleLogRing \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/mail,\
MailMessage \
MailServiceProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/media,\
Manager \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/mozilla,\
MozillaBootstrap \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/office,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/office,\
Quickstart \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/packages/manifest,\
ManifestReader \
ManifestWriter \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/zip,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/packages/zip,\
ZipFileAccess \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/plugin,\
PluginManager \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/presentation,\
SlideShow \
TransitionFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/rdf,\
BlankNode \
Literal \
Repository \
URI \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/rendering,\
Canvas \
CanvasFactory \
MtfRenderer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/report,\
FixedLine \
FixedText \
FormatCondition \
@@ -311,35 +305,35 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\
Section \
Shape \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/report/inspection,\
DefaultComponentInspectorModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/resource,\
OfficeResourceLoader \
StringResource \
StringResourceWithLocation \
StringResourceWithStorage \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/scanner,\
ScannerManager \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/script,\
DocumentDialogLibraryContainer \
DocumentScriptLibraryContainer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/script/browse,\
theBrowseNodeFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/script/provider,\
theMasterScriptProviderFactory \
MasterScriptProviderFactory \
ScriptURIHelper \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/script/vba,\
VBAEventProcessor \
VBAMacroResolver \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/sdb,\
CommandDefinition \
DataAccessDescriptorFactory \
DatabaseContext \
@@ -353,27 +347,27 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
TableDefinition \
TextConnectionSettings \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/sdb/application,\
CopyTableWizard \
MacroMigrationWizard \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/tools,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/sdb/tools,\
ConnectionTools \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/sdbc,\
ConnectionPool \
DriverManager \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/security,\
CertificateContainer \
DocumentDigitalSignatures \
SerialNumberAdapter \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/setup,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/setup,\
UpdateCheck \
UpdateCheckConfig \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/sheet,\
ExternalDocLink \
ExternalDocLinks \
ExternalSheetCache \
@@ -383,16 +377,16 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
RecentFunctions \
Solver \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/smarttags,\
SmartTagAction \
SmartTagRecognizer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/system,\
SimpleCommandMail \
SimpleSystemMail \
SystemShellExecute \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/task,\
InteractionHandler \
InteractionRequestStringResolver \
JobExecutor \
@@ -401,11 +395,11 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
PasswordContainerInteractionHandler \
StatusIndicatorFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/text,\
AutoTextContainer \
DefaultNumberingProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/ucb,\
AnyCompareFactory \
CachedContentResultSetFactory \
CachedContentResultSetStubFactory \
@@ -419,7 +413,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
Store \
UniversalContentBroker \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/ui,\
AddressBookSourceDialog \
DocumentAcceleratorConfiguration \
GlobalAcceleratorConfiguration \
@@ -433,14 +427,14 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
WindowContentFactoryManager \
WindowStateConfiguration \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/ui/dialogs,\
AddressBookSourcePilot \
FilePicker \
FolderPicker \
Wizard \
XSLTFilterDialog \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/util,\
JobManager \
NumberFormatter \
NumberFormatsSupplier \
@@ -451,11 +445,11 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
UriAbbreviation \
URLTransformer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xforms,\
Model \
XForms \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/crypto,\
NSSInitializer \
SecurityEnvironment \
SEInitializer \
@@ -463,31 +457,31 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto
XMLSecurityContext \
XMLSignatureTemplate \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/dom,\
DocumentBuilder \
SAXDocumentBuilder \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/sax,\
FastShapeContextHandler \
FastTokenHandler \
Parser \
Writer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xpath,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/xpath,\
XPathAPI \
XPathExtension \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xslt,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/xslt,\
XSLTTransformer \
XSLT2Transformer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/accessibility,\
Accessible \
AccessibleContext \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt,\
AccessibleButton \
AccessibleCheckBox \
AccessibleComboBox \
@@ -577,20 +571,20 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
UnoControlTimeField \
UnoControlTimeFieldModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt/grid,\
GridColumn \
UnoControlGrid \
UnoControlGridModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt/tab,\
UnoControlTabPage \
UnoControlTabPageContainer \
UnoControlTabPageContainerModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt/tree,\
TreeControlModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/chart,\
AccessibleChartDocumentView \
AccessibleChartElement \
AreaDiagram \
@@ -627,7 +621,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\
StockDiagram \
XYDiagram \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/chart2,\
Axis \
CandleStickChartType \
ChartDocument \
@@ -651,7 +645,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,
StandardDiagramCreationParameters \
Title \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/chart2/data,\
DataFilter \
DataProvider \
DataSequence \
@@ -661,7 +655,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/
RangeHighlightListener \
TabularDataProviderArguments \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/configuration,\
AccessRootElement \
AdministrationProvider \
ConfigurationAccess \
@@ -682,7 +676,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configu
SimpleSetUpdate \
UpdateRootElement \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/configuration/backend,\
Backend \
BackendAdapter \
CopyImporter \
@@ -717,25 +711,25 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configu
SystemIntegration \
UpdatableLayer \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/configuration/backend/xml,\
LayerParser \
LayerWriter \
SchemaParser \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/configuration/bootstrap,\
BootstrapContext \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/datatransfer/clipboard,\
ClipboardManager \
GenericClipboard \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/datatransfer/dnd,\
OleDragSource \
OleDropTarget \
X11DragSource \
X11DropTarget \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/document,\
EventDescriptor \
Events \
ExportFilter \
@@ -754,7 +748,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/documen
TypeDetection \
XMLBasicImporter \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/drawing,\
AccessibleDrawDocumentView \
AccessibleGraphControl \
AccessibleGraphicShape \
@@ -822,14 +816,14 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing
TextShape \
TransparencyGradientTable \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/embed,\
BaseStorage \
EmbeddedObjectDescriptor \
FileSystemStorage \
Storage \
StorageStream \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form,\
DataAwareControlModel \
FormComponent \
FormComponents \
@@ -838,7 +832,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
FormControllerDispatcher \
PropertyBrowserController \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/binding,\
BindableControlModel \
BindableDataAwareControlModel \
BindableDatabaseCheckBox \
@@ -854,7 +848,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/bi
ListEntrySource \
ValueBinding \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/component,\
CheckBox \
ComboBox \
CommandButton \
@@ -894,7 +888,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/co
TextField \
TimeField \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/control,\
CheckBox \
ComboBox \
CommandButton \
@@ -915,7 +909,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/co
TextField \
TimeField \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/inspection,\
ButtonNavigationHandler \
CellBindingPropertyHandler \
EditPropertyHandler \
@@ -924,16 +918,16 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/in
XMLFormsPropertyHandler \
XSDValidationPropertyHandler \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/validation,\
ValidatableBindableControlModel \
ValidatableControlModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/formula,\
AccessibleFormulaText \
AccessibleFormulaView \
FormulaProperties \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/frame,\
Components \
ContentHandler \
Controller \
@@ -957,29 +951,29 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
ToolbarControllerFactory \
TransientDocumentsDocumentContentFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/gallery,\
GalleryItem \
GalleryTheme \
GalleryThemeProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/graphic,\
Graphic \
GraphicDescriptor \
GraphicRasterizer \
GraphicRendererVCL \
MediaProperties \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/i18n,\
ChapterCollator \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/image,\
ImageMap \
ImageMapCircleObject \
ImageMapObject \
ImageMapPolygonObject \
ImageMapRectangleObject \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/linguistic2,\
ConversionDictionary \
Dictionary \
HangulHanjaConversionDictionary \
@@ -987,17 +981,17 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguis
SpellChecker \
Thesaurus \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/mozilla,\
MenuProxy \
MenuProxyListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/packages,\
Package \
PackageFolder \
PackageFolderEnumeration \
PackageStream \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/presentation,\
ChartShape \
CustomPresentation \
CustomPresentationAccess \
@@ -1026,23 +1020,23 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/present
SubtitleShape \
TitleTextShape \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/presentation/textfield,\
DateTime \
Footer \
Header \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/rendering,\
BitmapCanvas \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/report/inspection,\
DataProviderHandler \
ReportComponentHandler \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/script/browse,\
BrowseNode \
BrowseNodeFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/script/provider,\
LanguageScriptProvider \
MasterScriptProvider \
ScriptProvider \
@@ -1051,11 +1045,11 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/
ScriptProviderForJava \
ScriptProviderForJavaScript \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/script/vba,\
VBASpreadsheetEventProcessor \
VBATextEventProcessor \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/sdb,\
CallableStatement \
Column \
ColumnDescriptorControl \
@@ -1100,10 +1094,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\
TableDescriptor \
TableDesign \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/sdb/application,\
DefaultViewController \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/sdbc,\
CallableStatement \
Connection \
ConnectionProperties \
@@ -1118,7 +1112,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\
RowSet \
Statement \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/sdbcx,\
Column \
ColumnDescriptor \
Container \
@@ -1146,7 +1140,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
View \
ViewDescriptor \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/sheet,\
AccessibleCell \
AccessibleCsvCell \
AccessibleCsvRuler \
@@ -1257,7 +1251,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
UniqueCellFormatRangesEnumeration \
VolatileResult \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/style,\
CellStyle \
CharacterProperties \
CharacterPropertiesAsian \
@@ -1276,7 +1270,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
StyleFamilies \
StyleFamily \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/table,\
AccessibleCellView \
AccessibleTableView \
Cell \
@@ -1298,11 +1292,11 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
TableSortDescriptor \
TableSortDescriptor2 \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/task,\
AsyncJob \
Job \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/text,\
AccessibleEndnoteView \
AccessibleFootnoteView \
AccessibleHeaderFooterView \
@@ -1407,14 +1401,14 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
ViewSettings \
WebDocument \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/text/fieldmaster,\
Bibliography \
DDE \
Database \
SetExpression \
User \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/text/textfield,\
Annotation \
Author \
Bibliography \
@@ -1457,10 +1451,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/te
User \
WordCount \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/text/textfield,\
Type \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/text/textfield/docinfo,\
ChangeAuthor \
ChangeDateTime \
CreateAuthor \
@@ -1475,7 +1469,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/te
Subject \
Title \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/ucb,\
CachedContentResultSet \
CachedContentResultSetStub \
CachedDynamicResultSet \
@@ -1526,7 +1520,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
WebDAVFolderContent \
WebDAVHTTPMethod \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/ui,\
ActionTrigger \
ActionTriggerContainer \
ActionTriggerSeparator \
@@ -1539,10 +1533,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
UIElementFactory \
UIElementSettings \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/ui/dialogs,\
FilterOptionsDialog \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/util,\
NumberFormatProperties \
NumberFormatSettings \
NumberFormats \
@@ -1553,7 +1547,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
SortDescriptor2 \
Sortable \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/view,\
OfficeDocumentView \
PrintOptions \
PrintSettings \
@@ -1562,10 +1556,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
RenderOptions \
ViewSettings \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xforms,\
Binding \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml,\
AttributeContainer \
ExportFilter \
ImportFilter \
@@ -1576,25 +1570,25 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
XMLExportFilter \
XMLImportFilter \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/crypto,\
XMLEncryption \
XMLSignature \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/crypto/sax,\
Decryptor \
Encryptor \
SAXEventKeeper \
SignatureCreator \
SignatureVerifier \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/input,\
SaxDocumentHandler \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/wrapper,\
XMLDocumentWrapper \
XMLElementWrapper \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xsd,\
Boolean \
Date \
DateTime \
@@ -1607,7 +1601,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/accessibility,\
AccessibleEventId \
AccessibleEventObject \
AccessibleRelation \
@@ -1641,7 +1635,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\
XAccessibleTextMarkup \
XAccessibleValue \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/animations,\
AnimationAdditiveMode \
AnimationCalcMode \
AnimationColorSpace \
@@ -1675,7 +1669,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\
XTimeContainer \
XTransitionFilter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/auth,\
AuthenticationFailedException \
InvalidArgumentException \
InvalidContextException \
@@ -1690,7 +1684,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\
XSSOManagerFactory \
XSSOPasswordCache \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt,\
ActionEvent \
AdjustmentEvent \
AdjustmentType \
@@ -1887,7 +1881,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
XWindowListener2 \
XWindowPeer \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt/grid,\
GridColumnEvent \
GridDataEvent \
GridInvalidDataException \
@@ -1905,7 +1899,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
XSortableGridData \
XSortableMutableGridDataModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt/tab,\
TabPageActivatedEvent \
XTabPage \
XTabPageContainer \
@@ -1913,7 +1907,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
XTabPageContainerModel \
XTabPageModel \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt/tree,\
ExpandVetoException \
TreeDataModelEvent \
TreeExpansionEvent \
@@ -1926,7 +1920,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
XTreeExpansionListener \
XTreeNode \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart,\
ChartAxisArrangeOrderType \
ChartAxisAssign \
ChartAxisLabelPosition \
@@ -1975,7 +1969,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\
XTwoAxisXSupplier \
XTwoAxisYSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart2,\
AxisOrientation \
AxisType \
CoordinateSystemTypeID \
@@ -2029,7 +2023,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
XTitled \
XTransformation \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart2/data,\
DataSequenceRole \
HighlightedRange \
LabelOrigin \
@@ -2047,7 +2041,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
XSheetDataProvider \
XTextualDataSequence \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/configuration,\
CannotLoadConfigurationException \
CorruptedConfigurationException \
CorruptedUIConfigurationException \
@@ -2059,7 +2053,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
XTemplateInstance \
XUpdate \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/configuration/backend,\
AuthenticationFailedException \
BackendAccessException \
BackendSetupException \
@@ -2093,7 +2087,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/ba
XUpdateHandler \
XVersionedSchemaSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/datatransfer,\
DataFlavor \
UnsupportedFlavorException \
XDataFormatTranslator \
@@ -2106,7 +2100,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\
XTransferableSource \
XTransferableSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/datatransfer/clipboard,\
ClipboardEvent \
RenderingCapabilities \
XClipboard \
@@ -2119,7 +2113,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/cli
XFlushableClipboard \
XSystemClipboard \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/datatransfer/dnd,\
DNDConstants \
DragGestureEvent \
DragSourceDragEvent \
@@ -2141,7 +2135,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd
XDropTargetDropContext \
XDropTargetListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/deployment,\
DependencyException \
DeploymentException \
ExtensionRemovedException \
@@ -2161,7 +2155,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\
XPackageTypeInfo \
XUpdateInformationProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/document,\
AmbigousFilterRequest \
BrokenPackageRequest \
ChangedByOthersRequest \
@@ -2230,7 +2224,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
XXMLBasicExporter \
XXMLOasisBasicImporter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing,\
Alignment \
Arrangement \
BezierPoint \
@@ -2350,7 +2344,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
XSlideSorterBase \
XUniversalShapeDescriptor \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
AnchorBindingMode \
BorderType \
ConfigurationChangeEvent \
@@ -2376,7 +2370,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framewor
XToolBar \
XView \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/embed,\
Actions \
Aspects \
ElementModes \
@@ -2444,7 +2438,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\
XVisualObject \
XWindowSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/form,\
DataSelectionType \
DatabaseDeleteEvent \
DatabaseParameterEvent \
@@ -2496,7 +2490,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\
XUpdateBroadcaster \
XUpdateListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/form/binding,\
IncompatibleTypesException \
InvalidBindingStateException \
ListEntryEvent \
@@ -2506,7 +2500,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\
XListEntrySource \
XValueBinding \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/form/runtime,\
FeatureState \
FilterEvent \
FormFeature \
@@ -2517,22 +2511,22 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\
XFormControllerContext \
XFormOperations \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/form/submission,\
XSubmission \
XSubmissionSupplier \
XSubmissionVetoListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/form/validation,\
XFormComponentValidityListener \
XValidatable \
XValidatableFormComponent \
XValidator \
XValidityConstraintListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/formula,\
SymbolDescriptor \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/frame,\
BorderWidths \
CommandGroup \
ControlCommand \
@@ -2632,7 +2626,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
XUrlList \
XWindowArranger \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/frame/status,\
ClipboardFormats \
FontHeight \
ItemState \
@@ -2644,13 +2638,13 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\
Verb \
Visibility \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/gallery,\
GalleryItemType \
XGalleryItem \
XGalleryTheme \
XGalleryThemeProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/geometry,\
AffineMatrix2D \
AffineMatrix3D \
EllipticalArc \
@@ -2666,7 +2660,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
RealSize2D \
XMapping2D \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/graphic,\
GraphicColorMode \
GraphicType \
PrimitiveFactory2D \
@@ -2682,7 +2676,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
XPrimitiveFactory2D \
XSvgParser \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/i18n,\
AmPmValue \
Boundary \
BreakType \
@@ -2760,7 +2754,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
XTransliteration \
reservedWords \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/inspection,\
InteractiveSelectionResult \
LineDescriptor \
PropertyCategoryDescriptor \
@@ -2779,11 +2773,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\
XStringListControl \
XStringRepresentation \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/ldap,\
LdapConnectionException \
LdapGenericException \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/linguistic2,\
ConversionDictionaryType \
ConversionDirection \
ConversionPropertyType \
@@ -2829,7 +2823,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\
XSupportedLocales \
XThesaurus \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/logging,\
LogLevel \
LogRecord \
XConsoleHandler \
@@ -2840,7 +2834,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\
XLoggerPool \
XSimpleLogRing \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/mail,\
MailAttachment \
MailException \
MailServiceType \
@@ -2854,14 +2848,14 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\
XMailServiceProvider \
XSmtpService \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/media,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/media,\
XFrameGrabber \
XManager \
XPlayer \
XPlayerWindow \
ZoomLevel \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/mozilla,\
MenuMultipleChange \
MenuSingleChange \
MozillaProductType \
@@ -2880,23 +2874,23 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
XProxyRunner \
XRemoteServiceManagerProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/office,\
XAnnotation \
XAnnotationAccess \
XAnnotationEnumeration \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/packages,\
EncryptionNotAllowedException \
NoEncryptionException \
NoRawFormatException \
WrongPasswordException \
XDataSinkEncrSupport \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/packages/manifest,\
XManifestReader \
XManifestWriter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/packages/zip,\
XZipFileAccess \
XZipFileAccess2 \
ZipConstants \
@@ -2904,7 +2898,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
ZipException \
ZipIOException \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/plugin,\
PluginDescription \
PluginException \
PluginMode \
@@ -2913,7 +2907,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
XPluginContext \
XPluginManager \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/presentation,\
AnimationEffect \
AnimationSpeed \
ClickAction \
@@ -2939,10 +2933,10 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
XTransition \
XTransitionFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/qa,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/qa,\
XDumper \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/rdf,\
FileFormat \
ParseException \
QueryException \
@@ -2963,7 +2957,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
XResource \
XURI \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/rendering,\
ARGBColor \
AnimationAttributes \
AnimationRepeat \
@@ -3041,7 +3035,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\
XTextLayout \
XVolatileBitmap \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/report,\
Calculation \
ForceNewPage \
GroupKeepTogether \
@@ -3067,13 +3061,13 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\
XSection \
XShape \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/report/meta,\
XFormulaParser \
XFunctionCategory \
XFunctionDescription \
XFunctionManager \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/resource,\
MissingResourceException \
XLocale \
XResourceBundle \
@@ -3085,14 +3079,14 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\
XStringResourceWithLocation \
XStringResourceWithStorage \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/scanner,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/scanner,\
ScanError \
ScannerContext \
ScannerException \
XScannerManager \
XScannerManager2 \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/script,\
LibraryNotLoadedException \
ModuleInfo \
ModuleSizeExceededRequest \
@@ -3107,13 +3101,13 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\
XPersistentLibraryContainer \
XStorageBasedLibraryContainer \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/script/browse,\
BrowseNodeFactoryViewTypes \
BrowseNodeTypes \
XBrowseNode \
XBrowseNodeFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/script/provider,\
ScriptErrorRaisedException \
ScriptExceptionRaisedException \
ScriptFrameworkErrorException \
@@ -3125,7 +3119,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,
XScriptProviderSupplier \
XScriptURIHelper \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/script/vba,\
VBAEventId \
VBAScriptEvent \
VBAScriptEventId \
@@ -3135,7 +3129,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\
XVBAModuleInfo \
XVBAScriptListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdb,\
BooleanComparisonMode \
CommandType \
DatabaseRegistrationEvent \
@@ -3190,7 +3184,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
XSubDocument \
XTextConnectionSettings \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdb/application,\
CopyTableContinuation \
CopyTableOperation \
CopyTableRowEvent \
@@ -3202,7 +3196,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,
XDatabaseDocumentUI \
XTableUIProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdb/tools,\
CompositionType \
XConnectionSupplier \
XConnectionTools \
@@ -3215,7 +3209,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\
XTableRename \
XViewAccess \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdbc,\
BatchUpdateException \
BestRowScope \
BestRowType \
@@ -3277,7 +3271,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
XStruct \
XWarningsSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdbcx,\
CheckOption \
CompareBookmark \
KeyType \
@@ -3304,7 +3298,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
XUsersSupplier \
XViewsSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/security,\
CertAltNameEntry \
CertificateCharacters \
CertificateContainerStatus \
@@ -3326,7 +3320,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\
XSanExtension \
XSerialNumberAdapter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet,\
ActivationEvent \
AddressConvention \
Border \
@@ -3525,13 +3519,13 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
XViewSplitable \
XVolatileResult \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/smarttags,\
SmartTagRecognizerMode \
XRangeBasedSmartTagRecognizer \
XSmartTagAction \
XSmartTagRecognizer \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/style,\
BreakType \
CaseMap \
DropCapFormat \
@@ -3558,11 +3552,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\
XStyleLoader \
XStyleSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/svg,\
XSVGPrinter \
XSVGWriter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/system,\
SimpleMailClientFlags \
SystemShellExecuteException \
SystemShellExecuteFlags \
@@ -3572,7 +3566,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
XSimpleMailMessage2 \
XSystemShellExecute \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/table,\
BorderLine \
BorderLine2 \
BorderLineStyle \
@@ -3607,7 +3601,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
XTableColumns \
XTableRows \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/task,\
ClassifiedInteractionRequest \
DocumentMSPasswordRequest \
DocumentMSPasswordRequest2 \
@@ -3647,7 +3641,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\
XStatusIndicatorSupplier \
XUrlContainer \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/text,\
AuthorDisplayFormat \
BibliographyDataField \
BibliographyDataType \
@@ -3773,7 +3767,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
XTextViewCursorSupplier \
XWordCursor \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/ucb,\
AlreadyInitializedException \
AuthenticationRequest \
CheckinArgument \
@@ -3945,7 +3939,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
XUniversalContentBroker \
XWebDAVCommandEnvironment \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/ui,\
ActionTriggerSeparatorType \
ConfigurationEvent \
ContextChangeEventMultiplexer \
@@ -3987,7 +3981,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
XUIElementSettings \
XUIFunctionListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/ui/dialogs,\
CommonFilePickerElementIds \
ControlActions \
DialogClosedEvent \
@@ -4020,7 +4014,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\
XWizardController \
XWizardPage \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/util,\
AliasProgrammaticPair \
AtomClassRequest \
AtomDescription \
@@ -4118,7 +4112,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
XUniqueIDFactory \
XUpdatable \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/view,\
DocumentZoomType \
DuplexMode \
PaperFormat \
@@ -4145,7 +4139,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\
XViewCursor \
XViewSettingsSupplier \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xforms,\
InvalidDataOnSubmitException \
XDataTypeRepository \
XFormsEvent \
@@ -4155,14 +4149,14 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
XModel2 \
XSubmission \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml,\
Attribute \
AttributeData \
FastAttribute \
XExportFilter \
XImportFilter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/crypto,\
CipherID \
DigestID \
SecurityOperationStatus \
@@ -4183,7 +4177,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\
XXMLSignature \
XXMLSignatureTemplate \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/crypto/sax,\
ConstOfSecurityId \
ElementMarkPriority \
ElementMarkType \
@@ -4209,11 +4203,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\
XSignatureVerifyResultBroadcaster \
XSignatureVerifyResultListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/csax,\
XCompressedDocumentHandler \
XMLAttribute \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/dom,\
DOMException \
DOMExceptionType \
NodeType \
@@ -4239,7 +4233,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
XSAXDocumentBuilder2 \
XText \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/dom/events,\
AttrChangeType \
EventException \
EventType \
@@ -4252,17 +4246,17 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
XMutationEvent \
XUIEvent \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/dom/views,\
XAbstractView \
XDocumentView \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/input,\
XAttributes \
XElement \
XNamespaceMapping \
XRoot \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/sax,\
FastToken \
InputSource \
SAXException \
@@ -4286,11 +4280,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
XSAXSerializable \
XWriter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/wrapper,\
XXMLDocumentWrapper \
XXMLElementWrapper \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/xpath,\
Libxml2ExtensionHandle \
XPathException \
XPathObjectType \
@@ -4299,22 +4293,22 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\
XXPathObject \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xslt,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/xslt,\
XXSLTTransformer \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/xsd,\
DataTypeClass \
WhiteSpaceTreatment \
XDataType \
))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,org/freedesktop/PackageKit,\
XSyncDbusSessionHelper \
XModify \
XQuery \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/PackageKit,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,org/freedesktop/PackageKit,\
SyncDbusSessionHelper \
))
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index a1f36b8..7647760 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -2429,7 +2429,7 @@ module com {
[property, maybevoid] ::com::sun::star::util::Color InactiveSelectionBackgroundColor;
[property, maybevoid] ::com::sun::star::util::Color ActiveSelectionTextColor;
[property, maybevoid] ::com::sun::star::util::Color InactiveSelectionTextColor;
- [property, maybevoid] sequence< long > RowBackgroundColors;
+ [property, maybevoid] sequence< ::com::sun::star::util::Color > RowBackgroundColors;
[property] ::com::sun::star::style::VerticalAlignment VerticalAlign;
[property] ::com::sun::star::awt::FontDescriptor FontDescriptor;
[property, maybevoid] ::com::sun::star::util::Color TextColor;
@@ -2848,8 +2848,10 @@ module com {
CONTROL = 2,
SYMMETRIC = 3
};
- published typedef sequence< sequence< ::com::sun::star::drawing::PolygonFlags > > FlagSequenceSequence;
- published typedef sequence< sequence< ::com::sun::star::awt::Point > > PointSequenceSequence;
+ published typedef sequence< ::com::sun::star::drawing::PolygonFlags > FlagSequence;
+ published typedef sequence< ::com::sun::star::drawing::FlagSequence > FlagSequenceSequence;
+ published typedef sequence< ::com::sun::star::awt::Point > PointSequence;
+ published typedef sequence< ::com::sun::star::drawing::PointSequence > PointSequenceSequence;
published struct PolyPolygonBezierCoords {
::com::sun::star::drawing::PointSequenceSequence Coordinates;
::com::sun::star::drawing::FlagSequenceSequence Flags;
@@ -5219,7 +5221,7 @@ module com {
interface ::com::sun::star::drawing::XControlShape;
};
published typedef sequence< long > CoordinateSequence;
- published typedef sequence< sequence< long > > CoordinateSequenceSequence;
+ published typedef sequence< ::com::sun::star::drawing::CoordinateSequence > CoordinateSequenceSequence;
published service DashTable {
interface ::com::sun::star::container::XNameContainer;
};
@@ -5281,7 +5283,7 @@ module com {
[property, optional] boolean ParagraphSummation;
};
published typedef sequence< double > DoubleSequence;
- published typedef sequence< sequence< double > > DoubleSequenceSequence;
+ published typedef sequence< ::com::sun::star::drawing::DoubleSequence > DoubleSequenceSequence;
published interface XShapes;
published interface XShapeBinder {
interface ::com::sun::star::uno::XInterface;
@@ -5533,7 +5535,6 @@ module com {
HORIZONTAL = 5,
VERTICAL = 6
};
- published typedef sequence< ::com::sun::star::drawing::PolygonFlags > FlagSequence;
/** @deprecated */ published struct GluePoint {
::com::sun::star::awt::Point Position;
short EscapeDirection;
@@ -5721,7 +5722,6 @@ module com {
[property] string PluginURL;
[property] sequence< ::com::sun::star::beans::PropertyValue > PluginCommands;
};
- published typedef sequence< ::com::sun::star::awt::Point > PointSequence;
published service PolyLineShape {
service ::com::sun::star::drawing::Shape;
service ::com::sun::star::drawing::LineProperties;
@@ -14164,7 +14164,7 @@ module com {
published interface XDefaultNumberingProvider {
interface ::com::sun::star::uno::XInterface;
sequence< ::com::sun::star::container::XIndexAccess > getDefaultOutlineNumberings([in] ::com::sun::star::lang::Locale aLocale);
- sequence< sequence< ::com::sun::star::beans::PropertyValue > > getDefaultContinuousNumberingLevels([in] ::com::sun::star::lang::Locale aLocale);
+ sequence< ::com::sun::star::beans::PropertyValues > getDefaultContinuousNumberingLevels([in] ::com::sun::star::lang::Locale aLocale);
};
published service DefaultNumberingProvider: ::com::sun::star::text::XDefaultNumberingProvider;
published service Defaults {
@@ -15347,8 +15347,8 @@ module com {
};
published interface XRubySelection {
interface ::com::sun::star::uno::XInterface;
- sequence< sequence< ::com::sun::star::beans::PropertyValue > > getRubyList([in] boolean Automatic);
- void setRubyList([in] sequence< sequence< ::com::sun::star::beans::PropertyValue > > RubyList, [in] boolean Automatic);
+ sequence< ::com::sun::star::beans::PropertyValues > getRubyList([in] boolean Automatic);
+ void setRubyList([in] sequence< ::com::sun::star::beans::PropertyValues > RubyList, [in] boolean Automatic);
};
published interface XTextCopy {
interface ::com::sun::star::uno::XInterface;
@@ -15371,7 +15371,7 @@ module com {
[property] boolean IsSortByPosition;
[property] string BracketBefore;
[property] string BracketAfter;
- [property] sequence< sequence< ::com::sun::star::beans::PropertyValue > > SortKeys;
+ [property] sequence< ::com::sun::star::beans::PropertyValues > SortKeys;
[property] ::com::sun::star::lang::Locale Locale;
[property] string SortAlgorithm;
};
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 3f8918a..e545cbc3 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_UnoApi_UnoApi,oovbaapi))
+$(eval $(call gb_UnoApi_UnoApi,oovbaapi,oovbaapi))
$(eval $(call gb_UnoApi_install,oovbaapi,$(gb_PROGRAMDIRNAME)/types/oovbaapi.rdb))
@@ -26,14 +26,7 @@ $(eval $(call gb_UnoApi_use_api,oovbaapi,\
offapi \
))
-$(eval $(call gb_UnoApi_set_include,oovbaapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/oovbaapi \
- -I$(SRCDIR)/offapi \
- -I$(SRCDIR)/udkapi \
-))
-
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,ooo/vba/excel,\
Globals \
Hyperlink \
Range \
@@ -43,15 +36,15 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
Worksheet \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,ooo/vba,\
ControlProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,ooo/vba/excel,\
Button \
Buttons \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba,\
FormShowConstants \
VbAppWinStyle \
VbCalendar \
@@ -96,7 +89,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
XVBAToOOEventDescGen \
XWindowBase \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/access,\
AcCloseSave \
AcColorIndex \
AcCommand \
@@ -151,7 +144,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
ProcKind \
RefKind \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/adodb,\
ADCPROP_ASYNCTHREADPRIORITY_ENUM \
ADCPROP_AUTORECALC_ENUM \
ADCPROP_UPDATECRITERIA_ENUM \
@@ -192,7 +185,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
StringFormatEnum \
XactAttributeEnum \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/dao,\
CollatingOrderEnum \
CommitTransOptionsEnum \
CursorDriverEnum \
@@ -219,7 +212,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
UpdateTypeEnum \
WorkspaceTypeEnum \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/excel,\
Constants \
XApplication \
XAxes \
@@ -485,7 +478,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
XWorksheetFunction \
XWorksheets \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/msforms,\
fmAction \
fmAlignment \
fmBackStyle \
@@ -560,7 +553,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
XToggleButton \
XUserForm \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/office,\
DocProperties \
MailFormat \
MsoAlertButtonType \
@@ -684,7 +677,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
MsoWizardMsgType \
MsoZOrderCmd \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/powerpoint,\
MsoAnimAccumulate \
MsoAnimAdditive \
MsoAnimAfterEffect \
@@ -755,11 +748,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\
PpViewType \
PpWindowState \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/stdole,\
LoadPictureConstants \
OLE_TRISTATE \
))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/word,\
WdAlertLevel \
WdAnimation \
WdArabicNumeral \
diff --git a/scaddins/InternalUnoApi_scaddins.mk b/scaddins/InternalUnoApi_scaddins.mk
index 63ff836..74d4648 100644
--- a/scaddins/InternalUnoApi_scaddins.mk
+++ b/scaddins/InternalUnoApi_scaddins.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins,scaddins/idl))
$(eval $(call gb_InternalUnoApi_use_api,scaddins,\
offapi \
@@ -18,14 +18,7 @@ $(eval $(call gb_InternalUnoApi_define_api_dependencies,scaddins,offapi,\
udkapi \
))
-$(eval $(call gb_InternalUnoApi_set_include,scaddins,\
- -I$(SRCDIR)/scaddins/idl \
- -I$(SRCDIR)/offapi \
- -I$(SRCDIR)/udkapi \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,scaddins/idl/com/sun/star/sheet/addin,\
+$(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,com/sun/star/sheet/addin,\
Analysis \
DateFunctions \
PricingFunctions \
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 5c4d123..ebabdd0 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1015,11 +1015,6 @@ off_t size;
created_line = generate_phony_line(src_relative+10, "o");
rc = generate_phony_file(fn, created_line);
}
- else if(strncmp(fn+work_dir_len+5, "UnoApiPartTarget/", 17) == 0)
- {
- created_line = generate_phony_line(src_relative+17, "urd");
- rc = generate_phony_file(fn, created_line);
- }
else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0)
{
created_line = generate_phony_line(src_relative+14, "");
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 869b6a7..296c783 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -24,11 +24,9 @@ $(call gb_InternalUnoApi_get_clean_target,%) :
rm -f $(call gb_InternalUnoApi_get_target,$*))
define gb_InternalUnoApi_InternalUnoApi
-$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(2))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
-$(call gb_UnoApiTarget_set_root,$(1),UCR)
-
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
@@ -80,9 +78,4 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(de
endef
-define gb_InternalUnoApi_set_include
-$(call gb_UnoApiTarget_set_include,$(1),$(2))
-
-endef
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dc213bd..7ad0d9c 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -849,7 +849,6 @@ gb_BUILD_HELPER_LIBS := basegfx \
xmlreader \
gb_BUILD_HELPER_TOOLS := cppumaker \
- idlc \
regmerge \
rsc \
svidl \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 007e730..73c55d7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -196,7 +196,6 @@ gb_UnoApiHeadersTarget_get_real_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/nor
gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap).done
gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive).done
gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),normal).done
-gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1)
gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org
gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update
@@ -334,8 +333,6 @@ $(eval $(call gb_Helper_make_dep_targets,\
SdiTarget \
SrsPartTarget \
SrsTarget \
- UnoApiTarget \
- UnoApiPartTarget \
))
# other getters
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index eb3d7fb..79da2d9 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -15,15 +15,13 @@ $(call gb_UnoApi_get_clean_target,%) :
rm -f $(call gb_UnoApi_get_target,$*))
define gb_UnoApi_UnoApi
-$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(2))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
endif
-$(call gb_UnoApiTarget_set_root,$(1),UCR)
-
$(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir
$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
@@ -57,7 +55,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1
endef
define gb_UnoApi__add_idlfile
-$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2)),$(2))
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2).idl),$(2).idl)
endef
@@ -68,72 +66,43 @@ gb_UnoApi__add_idlfile :=
endif
-define gb_UnoApi__add_headerfile_impl
-$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
-
-endef
-
-# Note: the expression in 3rd arg of call of gb_UnoApi__add_headerfile_impl
-# removes the leftmost dir in the subpath .-)
-define gb_UnoApi__add_headerfile
-$(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$(words $(subst /, ,$(2))),$(subst /, ,$(2)))))
-
-endef
-
-define gb_UnoApi__add_idlfile_noheader
-$(call gb_UnoApi__add_idlfile,$(1),$(2).idl)
-
-endef
-
-define gb_UnoApi__add_idlfile_nohdl
-$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2))
-$(call gb_UnoApi__add_headerfile,$(1),$(2).hpp)
-
-endef
-
-define gb_UnoApi__add_idlfile_full
-$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2))
-$(call gb_UnoApi__add_headerfile,$(1),$(2).hdl)
-
-endef
-
# For enum types, plain struct types, polymorphic struct type templates,
# exception types, interface types, typedefs, and constant groups:
define gb_UnoApi_add_idlfile
$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
-$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(3))
+$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3))
endef
define gb_UnoApi_add_idlfiles
$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
-$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(idl)))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl)))
endef
# For single-interface--based services and interface-based singletons:
define gb_UnoApi_add_idlfile_nohdl
$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
-$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(3))
+$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3))
endef
define gb_UnoApi_add_idlfiles_nohdl
$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
-$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(idl)))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl)))
endef
# For accumulation-based services and service-based singletons:
define gb_UnoApi_add_idlfile_noheader
$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
-$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3))
+$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3))
endef
define gb_UnoApi_add_idlfiles_noheader
$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
-$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl)))
endef
@@ -154,9 +123,4 @@ $(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
endef
-define gb_UnoApi_set_include
-$(call gb_UnoApiTarget_set_include,$(1),$(2))
-
-endef
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 7fef392..adab8cc 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -17,202 +17,57 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-# UnoApiPartTarget
-
-gb_UnoApiPartTarget_IDLCDEPS := $(call gb_Executable_get_runtime_dependencies,idlc)
-gb_UnoApiPartTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,idlc)
-
-# The .urd files are actually created by the gb_UnoApiPartTarget__command,
-# invoked for the per-directory .done files.
-# The reason why .urd files are tracked is so new files that are added are
-# picked up and cause a rebuild, even if older than the .done file (also, as a
-# convenience for users who delete them from the workdir by hand; this dummy
-# rule plus the dependency from the .done target to the .urd file plus the
-# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be
-# invoked with the .idl file corresponding to the .urd in that case.
-# Touch the .urd file, so it is newer than the .done file, causing that to
-# be rebuilt and overwriting the .urd file again.
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_UnoApiPartTarget_get_target,%.urd) :
- touch $@
-
-# TODO:
-# - get idlc switch "-P" (generate .urd into package dir)
-# - empty $? in headertarget?
-
-define gb_UnoApiPartTarget__command
- $(call gb_Output_announce,$(2),$(true),IDL,2)
- mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
- $(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3)))) && \
- $(gb_UnoApiPartTarget_IDLCCOMMAND) \
- $(INCLUDE) \
- -M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \
- -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose \
- @$${RESPONSEFILE} > /dev/null && \
- rm -f $${RESPONSEFILE} && \
- touch $(1)
-
-endef
-
-# If idlc changed, rebuild everything; otherwise just the changed files.
-# In order for this to work the .urd files need to have a dependency on
-# idlc as well so their dummy rule fires if that changes.
-$(call gb_UnoApiPartTarget_get_target,%.done) : $(gb_UnoApiPartTarget_IDLCDEPS)
- $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCDEPS),$(if $(filter $(gb_UnoApiPartTarget_IDLCDEPS),$?),$^,$?)))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(dir $(call gb_UnoApiPartTarget_get_dep_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_UnoApiPartTarget_get_dep_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_UnoApiPartTarget_get_dep_target,%) :
- $(if $(wildcard $@),touch $@)
-
-endif
-
# UnoApiTarget
+gb_UnoApiTarget_UNOIDLWRITEDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-write)
+gb_UnoApiTarget_UNOIDLWRITECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,unoidl-write)
+
gb_UnoApiTarget_UNOIDLCHECKDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-check)
gb_UnoApiTarget_UNOIDLCHECKCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,unoidl-check)
-gb_UnoApiTarget_REGMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,regmerge) $(call gb_Executable_get_runtime_dependencies,unoidl-write)
-gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regmerge)
-
-gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types)
-
-define gb_UnoApiTarget__command_impl
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(1).oldformat $(2) $(3)) && \
-$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE} && \
-SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin \
- $(call gb_Executable_get_command,unoidl-write) \
- $(foreach rdb,$(4),$(call gb_UnoApiTarget_get_target,$(rdb))) \
- $(1).oldformat $(1)
-endef
-# first delete target rdb file to detect problems when removing IDL files
define gb_UnoApiTarget__command
$(call gb_Output_announce,$(2),$(true),UNO,4)
-mkdir -p $(dir $(1)) && \
-rm -f $(1) && \
-$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES),$(UNOAPI_DEPRDBS)) \
+mkdir -p $(dir $(1)) \
+$(if $(UNOAPI_ENTITIES), \
+ && RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(UNOAPI_ENTITIES))) \
+&& $(gb_UnoApiTarget_UNOIDLWRITECOMMAND) \
+ $(foreach rdb,$(UNOAPI_DEPRDBS),$(call gb_UnoApiTarget_get_target,$(rdb))) \
+ $(SRCDIR)/$(gb_UnoApiTarget_REG_$(2)) $(if $(UNOAPI_ENTITIES),@$${RESPONSEFILE}) $(1) \
+$(if $(UNOAPI_ENTITIES),&& rm -f $${RESPONSEFILE}) \
$(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$(2),$(true),DBc,3) \
&& $(gb_UnoApiTarget_UNOIDLCHECKCOMMAND) $(UNOAPI_REFERENCE) -- \
- $(foreach rdb,$(4),$(call gb_UnoApiTarget_get_target,$(rdb))) $(1))
+ $(foreach rdb,$(UNOAPI_DEPRDBS),$(call gb_UnoApiTarget_get_target,$(rdb))) \
+ $(1))
endef
-define gb_UnoApiTarget__check_mode
-$(if $(UNOAPI_FILES),,$(error No IDL files have been set for the rdb file))
-$(if $(UNOAPI_ROOT),,$(error No root has been set for the rdb file))
-endef
-
-# This recipe actually also builds the dep-target as a side-effect, which
-# is an optimization to reduce incremental build time.
-# Note this requires the variable UNOAPI_DEPFILES to be in sync on both targets.
$(call gb_UnoApiTarget_get_target,%) :
-ifeq ($(gb_FULLDEPS),$(true))
- $(call gb_UnoApiTarget__command_dep,$(call gb_UnoApiTarget_get_dep_target,$*),$*)
-endif
- $(call gb_UnoApiTarget__check_mode)
$(call gb_UnoApiTarget__command,$@,$*)
.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
$(call gb_UnoApiTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\
- rm -rf $(call gb_UnoApiTarget_get_target,$*) \
- $(call gb_UnoApiTarget_get_target,$*).oldformat \
- $(call gb_UnoApiTarget_get_dep_target,$*) \
- $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
- $(call gb_UnoApiPartTarget_get_target,$*))
-
-# cat the deps of all IDLs in one file, then we need only open that one file
-define gb_UnoApiTarget__command_dep
-$(call gb_Output_announce,IDL:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
- $(foreach idl,$(UNOAPI_DEPFILES),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \
- $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
- rm -f $${RESPONSEFILE}
-
-endef
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(dir $(call gb_UnoApiTarget_get_dep_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_UnoApiTarget_get_dep_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_Executable_get_runtime_dependencies,concat-deps)
- $(call gb_UnoApiTarget__command_dep,$@,$*)
-
-endif
+ rm -rf $(call gb_UnoApiTarget_get_target,$*))
define gb_UnoApiTarget_UnoApiTarget
-$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE :=
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES :=
+gb_UnoApiTarget_REG_$(1) := $(2)
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ENTITIES :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE :=
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPRDBS :=
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPFILES :=
-$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_DEPFILES :=
--include $(call gb_UnoApiTarget_get_dep_target,$(1))
-$(call gb_UnoApiTarget_get_dep_target,$(1)) :| $(dir $(call gb_UnoApiTarget_get_dep_target,$(1))).dir
-endif
-
-endef
-
-define gb_UnoApiTarget__add_urdfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES += $(2)
-$(call gb_UnoApiTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_UnoApiTarget__add_idlfile
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
- $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
-$(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
-$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) \
- : $(gb_UnoApiPartTarget_IDLCDEPS) \
- | $(call gb_UnoApiPartTarget_get_target,$(2)/.dir)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPFILES += $(2)/$(3)
-$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_DEPFILES += $(2)/$(3)
-$(call gb_UnoApiTarget_get_dep_target,$(1)) : \
- $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
-$(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) :| $(dir $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))).dir
-endif
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_UNOIDLWRITEDEPS)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(SRCDIR)/$(2) # may be dir, though
endef
-define gb_UnoApiTarget__add_idlfiles
-$(call gb_UnoApiTarget_get_target,$(1)) : \
- $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
- $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
+define gb_UnoApiTarget_add_idlfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ENTITIES += $(subst /,.,$(2))$(if $(2),.)$(3)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(SRCDIR)/$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3).idl
endef
define gb_UnoApiTarget_add_idlfiles
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
-$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS)
-
-endef
-
-define gb_UnoApiTarget_add_idlfile
-$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
endef
@@ -223,16 +78,6 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_UNOIDLCHECKDEPS)
endef
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list