diff options
| -rw-r--r-- | odk/CustomTarget_idl.mk | 22 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 1 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 448 | ||||
| -rw-r--r-- | scp2/source/sdkoo/module_sdkoo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 14 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 17 | ||||
| -rw-r--r-- | solenv/gbuild/ZipUnoApi.mk | 56 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 | ||||
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 85 |
9 files changed, 337 insertions, 309 deletions
diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk deleted file mode 100644 index b3ef74ed207b..000000000000 --- a/odk/CustomTarget_idl.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/idl)) - -odkcommon_ZIPLIST += $(subst $(SRCDIR)/udkapi/,idl/,$(shell find $(SRCDIR)/udkapi/com -type f)) -odkcommon_ZIPLIST += $(subst $(SRCDIR)/offapi/,idl/,$(shell find $(SRCDIR)/offapi/com -type f)) - -$(call gb_CustomTarget_get_target,odk/odkcommon/idl) : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - mkdir -p $(odk_WORKDIR)/idl - cp -rf $(SRCDIR)/udkapi/com $(odk_WORKDIR)/idl - cp -rf $(SRCDIR)/offapi/com $(odk_WORKDIR)/idl - touch $@ - -# vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index c66e1dd65a14..9a384d174a94 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_lib \ CustomTarget_settings \ CustomTarget_autodoc \ - CustomTarget_idl \ Executable_unoapploader \ Zip_odkexamples \ )) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 186e2458d067..e6b2b75636b4 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_ZipUnoApi_ZipUnoApi,offapi)) $(eval $(call gb_UnoApi_use_api,offapi,\ udkapi \ @@ -30,18 +30,18 @@ $(eval $(call gb_UnoApi_set_include,offapi,\ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\ AccessBridge \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ +$(eval $(call gb_ZipUnoApi_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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/auth,\ SSOManagerFactory \ SSOPasswordCache \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ AsyncCallback \ ContainerWindowProvider \ DialogProvider \ @@ -52,55 +52,55 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ Toolkit \ UnoControlDialogModelProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ DefaultGridDataModel \ SortableGridDataModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ UnoControlTabPageModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ DefaultTreeDataModel \ MutableTreeDataModel \ MutableTreeNode \ TreeControl \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ DatabaseDataProvider \ LabeledDataSequence \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/cui,\ ColorPicker \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\ DataFormatTranslator \ MimeContentTypeFactory \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\ SystemClipboard \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\ SmoketestCommandEnvironment \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\ DocumentProperties \ DocumentRevisionListPersistence \ IndexedPropertyValues \ @@ -113,13 +113,13 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\ ModuleDispatcher \ ShapeCollection \ SlideRenderer \ SlideSorter \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ BasicPaneFactory \ BasicToolBarFactory \ BasicViewFactory \ @@ -128,7 +128,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ DocumentCloser \ EmbeddedObjectCreator \ FileSystemStorageFactory \ @@ -139,17 +139,17 @@ $(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/control,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/control,\ FilterControl \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ DefaultFormComponentInspectorModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ FormController \ FormOperations \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ AutoRecovery \ Desktop \ DispatchHelper \ @@ -166,18 +166,18 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ GraphicObject \ GraphicProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\ BreakIterator \ CharacterClassification \ Collator \ @@ -190,7 +190,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionaryList \ DictionaryList \ LanguageGuessing \ @@ -198,7 +198,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\ ConsoleHandler \ CsvLogFormatter \ DocumentIOLogRing \ @@ -207,39 +207,39 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\ MailMessage \ MailServiceProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\ Manager \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\ MozillaBootstrap \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\ ManifestReader \ ManifestWriter \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\ PluginManager \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\ SlideShow \ TransitionFactory \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\ Canvas \ CanvasFactory \ MtfRenderer \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\ FixedLine \ FixedText \ FormatCondition \ @@ -255,32 +255,32 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\ DefaultComponentInspectorModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\ ScannerManager \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ DocumentDialogLibraryContainer \ DocumentScriptLibraryContainer \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\ VBAEventProcessor \ VBAMacroResolver \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ DataAccessDescriptorFactory \ DatabaseContext \ DatabaseInteractionHandler \ @@ -291,22 +291,22 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ ReportDesign \ TableDefinition \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\ CopyTableWizard \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ ConnectionPool \ DriverManager \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ CertificateContainer \ DocumentDigitalSignatures \ SerialNumberAdapter \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/setup,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/setup,\ UpdateCheckConfig \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ ExternalDocLink \ ExternalDocLinks \ ExternalSheetCache \ @@ -315,16 +315,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\ SmartTagAction \ SmartTagRecognizer \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\ SimpleCommandMail \ SimpleSystemMail \ SystemShellExecute \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ InteractionHandler \ InteractionRequestStringResolver \ JobExecutor \ @@ -333,10 +333,10 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\ DefaultNumberingProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ AnyCompareFactory \ CachedContentResultSetFactory \ CachedContentResultSetStubFactory \ @@ -350,7 +350,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ AddressBookSourceDialog \ GlobalAcceleratorConfiguration \ ModuleUIConfigurationManagerSupplier \ @@ -360,13 +360,13 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ AddressBookSourcePilot \ FilePicker \ FolderPicker \ Wizard \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ JobManager \ NumberFormatter \ NumberFormatsSupplier \ @@ -376,41 +376,41 @@ $(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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xforms,\ Model \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\ NSSInitializer \ SEInitializer \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,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_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xslt,\ XSLTTransformer \ XSLT2Transformer \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ modules \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ Accessible \ AccessibleContext \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ AccessibleButton \ AccessibleCheckBox \ AccessibleComboBox \ @@ -505,21 +505,21 @@ $(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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ DefaultGridColumnModel \ GridColumn \ UnoControlGrid \ UnoControlGridModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\ TreeControlModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\ AccessibleChartDocumentView \ AccessibleChartElement \ AreaDiagram \ @@ -556,7 +556,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\ Axis \ CandleStickChartType \ ChartDocument \ @@ -586,7 +586,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\ DataFilter \ DataProvider \ DataSequence \ @@ -596,7 +596,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\ AccessRootElement \ AdministrationProvider \ ConfigurationAccess \ @@ -617,7 +617,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\ Backend \ BackendAdapter \ CopyImporter \ @@ -652,25 +652,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_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\ BootstrapContext \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\ EventDescriptor \ Events \ ExportFilter \ @@ -689,7 +689,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\ AccessibleDrawDocumentView \ AccessibleGraphControl \ AccessibleGraphicShape \ @@ -759,14 +759,14 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing TransparencyGradientTable \ modules \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ DataAwareControlModel \ FormComponent \ FormComponents \ @@ -777,7 +777,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ PropertyBrowserController \ modules \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\ BindableControlModel \ BindableDataAwareControlModel \ BindableDatabaseCheckBox \ @@ -793,7 +793,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\ CheckBox \ ComboBox \ CommandButton \ @@ -833,7 +833,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\ CheckBox \ ComboBox \ CommandButton \ @@ -854,7 +854,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\ ButtonNavigationHandler \ CellBindingPropertyHandler \ EditPropertyHandler \ @@ -864,16 +864,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\ ValidatableBindableControlModel \ ValidatableControlModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\ AccessibleFormulaText \ AccessibleFormulaView \ FormulaProperties \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ Components \ ContentHandler \ ContentHandlerFactory \ @@ -899,30 +899,30 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ ToolbarController \ TransientDocumentsDocumentContentFactory \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\ GalleryItem \ GalleryTheme \ GalleryThemeProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ ChapterCollator \ IndexEntrySupplier \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionary \ Dictionary \ HangulHanjaConversionDictionary \ @@ -931,20 +931,20 @@ $(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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\ MenuProxy \ MenuProxyListener \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ Package \ PackageFolder \ PackageFolderEnumeration \ PackageStream \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ ZipFileAccess \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ ChartShape \ CustomPresentation \ CustomPresentationAccess \ @@ -973,26 +973,26 @@ $(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_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\ BitmapCanvas \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\ modules \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\ LanguageScriptProvider \ MasterScriptProvider \ ScriptProvider \ @@ -1001,11 +1001,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\ VBASpreadsheetEventProcessor \ VBATextEventProcessor \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\ CallableStatement \ Column \ ColumnDescriptorControl \ @@ -1051,10 +1051,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\ DefaultViewController \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\ CallableStatement \ Connection \ ConnectionProperties \ @@ -1069,7 +1069,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\ Column \ ColumnDescriptor \ Container \ @@ -1097,7 +1097,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ AccessibleCell \ AccessibleCsvCell \ AccessibleCsvRuler \ @@ -1209,7 +1209,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ CellStyle \ CharacterProperties \ CharacterPropertiesAsian \ @@ -1228,7 +1228,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ AccessibleCellView \ AccessibleTableView \ Cell \ @@ -1250,11 +1250,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\ AsyncJob \ Job \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ AccessibleEndnoteView \ AccessibleFootnoteView \ AccessibleHeaderFooterView \ @@ -1360,14 +1360,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_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\ Annotation \ Author \ Bibliography \ @@ -1410,10 +1410,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\ ChangeAuthor \ ChangeDateTime \ CreateAuthor \ @@ -1428,8 +1428,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,\ - AnyCompareFactory \ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ CachedContentResultSet \ CachedContentResultSetStub \ CachedDynamicResultSet \ @@ -1479,7 +1478,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ WebDAVDocumentContent \ WebDAVFolderContent \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ ActionTrigger \ ActionTriggerContainer \ ActionTriggerSeparator \ @@ -1494,10 +1493,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\ FilterOptionsDialog \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\ NumberFormatProperties \ NumberFormatSettings \ NumberFormats \ @@ -1509,7 +1508,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\ OfficeDocumentView \ PrintOptions \ PrintSettings \ @@ -1518,10 +1517,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\ Binding \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ AttributeContainer \ ExportFilter \ ImportFilter \ @@ -1532,8 +1531,7 @@ $(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,\ - SEInitializer \ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\ SecurityEnvironment \ XMLEncryption \ XMLEncryptionTemplate \ @@ -1541,21 +1539,21 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/cry XMLSignature \ XMLSignatureTemplate \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,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_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\ SaxDocumentHandler \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\ XMLDocumentWrapper \ XMLElementWrapper \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\ Boolean \ Date \ DateTime \ @@ -1568,7 +1566,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\ AccessibleEventId \ AccessibleEventObject \ AccessibleRelation \ @@ -1602,7 +1600,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\ AnimationAdditiveMode \ AnimationCalcMode \ AnimationColorSpace \ @@ -1635,7 +1633,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\ AuthenticationFailedException \ InvalidArgumentException \ InvalidContextException \ @@ -1650,7 +1648,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ ActionEvent \ AdjustmentEvent \ AdjustmentType \ @@ -1849,7 +1847,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ GridColumnEvent \ GridDataEvent \ GridInvalidDataException \ @@ -1864,11 +1862,10 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ XGridRowSelection \ XGridSelectionListener \ XMutableGridDataModel \ - XMutableGridDataModel \ XSortableGridData \ XSortableMutableGridDataModel \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ TabPageActivatedEvent \ XTabPage \ XTabPageContainer \ @@ -1876,7 +1873,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ ExpandVetoException \ TreeDataModelEvent \ TreeExpansionEvent \ @@ -1889,7 +1886,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\ ChartAxisArrangeOrderType \ ChartAxisAssign \ ChartAxisLabelPosition \ @@ -1938,7 +1935,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ AxisOrientation \ AxisType \ CoordinateSystemTypeID \ @@ -1991,7 +1988,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\ DataSequenceRole \ HighlightedRange \ LabelOrigin \ @@ -2009,7 +2006,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\ CannotLoadConfigurationException \ CorruptedConfigurationException \ CorruptedUIConfigurationException \ @@ -2021,7 +2018,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\ AuthenticationFailedException \ BackendAccessException \ BackendSetupException \ @@ -2055,7 +2052,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\ DataFlavor \ UnsupportedFlavorException \ XDataFormatTranslator \ @@ -2068,7 +2065,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\ ClipboardEvent \ RenderingCapabilities \ XClipboard \ @@ -2081,7 +2078,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\ DNDConstants \ DragGestureEvent \ DragSourceDragEvent \ @@ -2103,7 +2100,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\ DependencyException \ DeploymentException \ ExtensionRemovedException \ @@ -2123,7 +2120,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\ AmbigousFilterRequest \ BrokenPackageRequest \ ChangedByOthersRequest \ @@ -2190,7 +2187,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ Alignment \ Arrangement \ BezierPoint \ @@ -2308,7 +2305,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\ AnchorBindingMode \ BorderType \ ConfigurationChangeEvent \ @@ -2334,7 +2331,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\ Actions \ Aspects \ ElementModes \ @@ -2402,7 +2399,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\ DataSelectionType \ DatabaseDeleteEvent \ DatabaseParameterEvent \ @@ -2453,7 +2450,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\ IncompatibleTypesException \ InvalidBindingStateException \ ListEntryEvent \ @@ -2463,7 +2460,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\ FeatureState \ FilterEvent \ FormFeature \ @@ -2474,22 +2471,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\ SymbolDescriptor \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ BorderWidths \ CommandGroup \ ControlCommand \ @@ -2585,7 +2582,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\ ClipboardFormats \ FontHeight \ ItemState \ @@ -2597,13 +2594,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\ GalleryItemType \ XGalleryItem \ XGalleryTheme \ XGalleryThemeProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ AffineMatrix2D \ AffineMatrix3D \ EllipticalArc \ @@ -2619,7 +2616,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ GraphicColorMode \ GraphicType \ SvgTools \ @@ -2635,7 +2632,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ AmPmValue \ Boundary \ BreakType \ @@ -2649,7 +2646,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ CalendarItem2 \ CharType \ CharacterIteratorMode \ - Collator \ CollatorOptions \ Currency \ Currency2 \ @@ -2714,7 +2710,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\ InteractiveSelectionResult \ LineDescriptor \ PropertyCategoryDescriptor \ @@ -2733,11 +2729,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\ LdapConnectionException \ LdapGenericException \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionaryType \ ConversionDirection \ ConversionPropertyType \ @@ -2782,7 +2778,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\ LogLevel \ LogRecord \ XConsoleHandler \ @@ -2793,7 +2789,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\ MailAttachment \ MailException \ MailServiceType \ @@ -2807,14 +2803,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ MenuMultipleChange \ MenuSingleChange \ MozillaProductType \ @@ -2833,30 +2829,30 @@ $(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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\ XAnnotation \ XAnnotationAccess \ XAnnotationEnumeration \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\ XManifestReader \ XManifestWriter \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\ XZipFileAccess \ ZipConstants \ ZipEntry \ ZipException \ ZipIOException \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ PluginDescription \ PluginException \ PluginMode \ @@ -2865,7 +2861,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\ AnimationEffect \ AnimationSpeed \ ClickAction \ @@ -2891,10 +2887,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/qa,\ XDumper \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ FileFormat \ ParseException \ QueryException \ @@ -2915,7 +2911,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\ ARGBColor \ AnimationAttributes \ AnimationRepeat \ @@ -2993,7 +2989,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\ Calculation \ ForceNewPage \ GroupKeepTogether \ @@ -3019,13 +3015,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\ MissingResourceException \ XLocale \ XResourceBundle \ @@ -3037,14 +3033,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\ LibraryNotLoadedException \ ModuleInfo \ ModuleSizeExceededRequest \ @@ -3059,13 +3055,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\ ScriptErrorRaisedException \ ScriptExceptionRaisedException \ ScriptFrameworkErrorException \ @@ -3077,7 +3073,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\ VBAEventId \ VBAScriptEvent \ VBAScriptEventId \ @@ -3087,7 +3083,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ BooleanComparisonMode \ CommandType \ DatabaseRegistrationEvent \ @@ -3140,7 +3136,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ XSingleSelectQueryComposer \ XSubDocument \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\ CopyTableContinuation \ CopyTableOperation \ CopyTableRowEvent \ @@ -3152,7 +3148,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\ CompositionType \ XConnectionSupplier \ XConnectionTools \ @@ -3165,7 +3161,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ BatchUpdateException \ BestRowScope \ BestRowType \ @@ -3227,7 +3223,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ CheckOption \ CompareBookmark \ KeyType \ @@ -3254,7 +3250,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\ CertAltNameEntry \ CertificateCharacters \ CertificateContainerStatus \ @@ -3276,7 +3272,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ ActivationEvent \ AddressConvention \ Border \ @@ -3475,12 +3471,12 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ XVolatileResult \ _NamedRange \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\ SmartTagRecognizerMode \ XSmartTagAction \ XSmartTagRecognizer \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\ BreakType \ CaseMap \ DropCapFormat \ @@ -3507,11 +3503,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\ XSVGPrinter \ XSVGWriter \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ SimpleMailClientFlags \ SystemShellExecuteException \ SystemShellExecuteFlags \ @@ -3520,7 +3516,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ XSimpleMailMessage \ XSystemShellExecute \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\ BorderLine \ BorderLine2 \ BorderLineStyle \ @@ -3555,7 +3551,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\ ClassifiedInteractionRequest \ DocumentMSPasswordRequest \ DocumentMSPasswordRequest2 \ @@ -3595,7 +3591,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ AuthorDisplayFormat \ BibliographyDataField \ BibliographyDataType \ @@ -3719,7 +3715,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ AlreadyInitializedException \ AuthenticationRequest \ CheckinArgument \ @@ -3890,7 +3886,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\ ActionTriggerSeparatorType \ ConfigurationEvent \ ContextMenuExecuteEvent \ @@ -3922,7 +3918,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\ CommonFilePickerElementIds \ ControlActions \ DialogClosedEvent \ @@ -3955,7 +3951,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\ AliasProgrammaticPair \ AtomClassRequest \ AtomDescription \ @@ -4049,7 +4045,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\ DocumentZoomType \ DuplexMode \ PaperFormat \ @@ -4076,7 +4072,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ InvalidDataOnSubmitException \ XDataTypeRepository \ XFormsEvent \ @@ -4086,14 +4082,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\ CipherID \ DigestID \ SecurityOperationStatus \ @@ -4114,7 +4110,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\ ConstOfSecurityId \ ElementMarkPriority \ ElementMarkType \ @@ -4140,11 +4136,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\ XCompressedDocumentHandler \ XMLAttribute \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ DOMException \ DOMExceptionType \ NodeType \ @@ -4170,7 +4166,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\ AttrChangeType \ EventException \ EventType \ @@ -4183,17 +4179,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ FastToken \ InputSource \ SAXException \ @@ -4217,11 +4213,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\ XXMLDocumentWrapper \ XXMLElementWrapper \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ Libxml2ExtensionHandle \ XPathException \ XPathObjectType \ @@ -4230,22 +4226,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_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xslt,\ XXSLTTransformer \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\ DataTypeClass \ WhiteSpaceTreatment \ XDataType \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\ XSyncDbusSessionHelper \ XModify \ XQuery \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/PackageKit,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/PackageKit,\ SyncDbusSessionHelper \ )) diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index 732388c86739..5adfdf8e7f2d 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -34,6 +34,8 @@ Module gid_Module_Optional_Sdkoo ParentID = gid_Module_Optional; Default = NO; Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon, + gid_File_Zip_OdkIdl_udkapi, + gid_File_Zip_OdkIdl_offapi, gid_File_Zip_Odkheaders_sal_generated, gid_File_Zip_Odkheaders_sal, gid_File_Zip_Odkheaders_salhelper, diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 02dc53672cd7..5bd19087fc56 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -131,6 +131,20 @@ File gid_File_Zip_Odkcommon Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); End +File gid_File_Zip_OdkIdl_udkapi + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "udkapi.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_OdkIdl_offapi + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "offapi.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + File gid_File_Zip_Odkheaders_sal_generated TXT_FILE_BODY; Dir = gid_Dir_Basis_Sdk; diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 7dd961c9995f..43b7b77b0af8 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -33,21 +33,17 @@ $(call gb_UnoApi_get_clean_target,%) : define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) -$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(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_Package_get_target,$(1)_idl) $(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_inc) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) -$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc) -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) $(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) @@ -57,11 +53,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef -define gb_UnoApi__add_idlfile -$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(2)),$(2)) - -endef - define gb_UnoApi__add_headerfile_impl $(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3)) $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3)) @@ -75,13 +66,7 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 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 @@ -121,13 +106,11 @@ endef # for old-style services and modules define gb_UnoApi_add_idlfile_noheader $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) -$(call gb_UnoApi__add_idlfile_noheader,$(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))) endef diff --git a/solenv/gbuild/ZipUnoApi.mk b/solenv/gbuild/ZipUnoApi.mk new file mode 100644 index 000000000000..8e76dff71abf --- /dev/null +++ b/solenv/gbuild/ZipUnoApi.mk @@ -0,0 +1,56 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# ZipUnoApi class +# this is a bit of a hack, hopefully needed only temporarily because +# scp2 can easily deal with zip files but not so easily with 100s of +# individual files; ideally the Package itself should be sufficient. + +define gb_ZipUnoApi_ZipUnoApi +$(call gb_UnoApi_UnoApi,$(1),$(2)) +$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1)) +$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1)) + cp $$< $$@ +$(call gb_Zip_get_outdir_bin_target,$(1)) :| $(dir $(call gb_Zip_get_outdir_bin_target,$(1))).dir +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) +$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Zip_get_target,$(1)) + +endef + +# hard-code "idl" path in zip so we don't need another parameter +define gb_ZipUnoApi__add_idlfiles +$(foreach file,$(3),$(call gb_Zip_add_file,$(1),$(patsubst $(1)/%,idl/%,$(2))/$(file).idl,$(SRCDIR)/$(2)/$(file).idl)) + +endef + +# sadly source files in udkapi/ but ODK path is idl/ so need to +# copy files +# $(1) package +# $(2) dir in source +# $(3) file list +define gb_ZipUnoApi_add_idlfiles +$(call gb_UnoApi_add_idlfiles,$(1),$(2),$(3)) +$(call gb_ZipUnoApi__add_idlfiles,$(1),$(2),$(3)) + +endef + +define gb_ZipUnoApi_add_idlfiles_nohdl +$(call gb_UnoApi_add_idlfiles_nohdl,$(1),$(2),$(3)) +$(call gb_ZipUnoApi__add_idlfiles,$(1),$(2),$(3)) + +endef + +define gb_ZipUnoApi_add_idlfiles_noheader +$(call gb_UnoApi_add_idlfiles_noheader,$(1),$(2),$(3)) +$(call gb_ZipUnoApi__add_idlfiles,$(1),$(2),$(3)) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index f9ce8d6d6694..aff848b27899 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -333,6 +333,7 @@ include $(foreach class, \ CliUnoApi \ Zip \ ZipPackage \ + ZipUnoApi \ AllLangZip \ Configuration \ HelpTarget \ diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index a226b4271817..004218a70823 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -26,22 +26,21 @@ # #************************************************************************* -$(eval $(call gb_UnoApi_UnoApi,udkapi)) +$(eval $(call gb_ZipUnoApi_ZipUnoApi,udkapi)) $(eval $(call gb_UnoApi_set_include,udkapi,\ $$(INCLUDE) \ -I$(SRCDIR)/udkapi \ )) - -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ udk-modules \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ PropertyBag \ PropertySet \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\ Bridge \ IiopBridge \ OleApplicationRegistration \ @@ -51,12 +50,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge, OleObjectFactory \ UrpBridge \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ ApplicationRegistration \ BridgeSupplier \ Factory \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ DataInputStream \ DataOutputStream \ MarkableInputStream \ @@ -65,50 +64,50 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ ObjectOutputStream \ Pump \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ MultiServiceFactory \ RegistryServiceManager \ ServiceManager \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\ Dynamic \ Java \ Java2 \ SharedLibrary \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\ CoreReflection \ TypeDescriptionManager \ TypeDescriptionProvider \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ DefaultRegistry \ NestedRegistry \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ Engine \ InvocationAdapterFactory \ JavaScript \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ BootstrapMacroExpander \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\ Introspection \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ BridgeFactory \ UnoUrlResolver \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\ Acceptor \ Connector \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\ EnumerableMap \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ Pipe \ SequenceInputStream \ SequenceOutputStream \ @@ -116,43 +115,43 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ TextInputStream \ TextOutputStream \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\ JavaVirtualMachine \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\ theCoreReflection \ ProxyFactory \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\ ImplementationRegistration \ SimpleRegistry \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\ AccessController \ Policy \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\ AllListenerAdapter \ Converter \ Invocation \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\ NamingService \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ ExternalUriReferenceTranslator \ UriReferenceFactory \ UriSchemeParser_vndDOTsunDOTstarDOTexpand \ UriSchemeParser_vndDOTsunDOTstarDOTscript \ VndSunStarPkgUrlReferenceFactory \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\ MacroExpander \ theMacroExpander \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ Ambiguous \ Defaulted \ GetDirectPropertyTolerantResult \ @@ -207,7 +206,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ XTolerantMultiPropertySet \ XVetoableChangeListener \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ BridgeExistsException \ InvalidProtocolChangeException \ ModelDependent \ @@ -221,7 +220,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ XProtocolProperties \ XUnoUrlResolver \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ Currency \ Date \ Decimal \ @@ -230,7 +229,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautoma SCode \ XAutomationObject \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ AlreadyAcceptingException \ ConnectionSetupException \ NoConnectException \ @@ -241,7 +240,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ XConnectionBroadcaster \ XConnector \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ ContainerEvent \ ElementExistException \ NoSuchElementException \ @@ -280,7 +279,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ XStringKeyMap \ XUniqueIDAccess \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ AlreadyConnectedException \ BufferSizeExceededException \ ConnectException \ @@ -326,7 +325,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ XTruncate \ XXMLExtractor \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ InvalidJavaSettingsException \ JavaDisabledException \ JavaInitializationException \ @@ -339,7 +338,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ XJavaThreadRegister_11 \ XJavaVM \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ ArrayIndexOutOfBoundsException \ ClassNotFoundException \ DisposedException \ @@ -376,11 +375,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ XTypeProvider \ XUnoTunnel \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\ CannotActivateFactoryException \ XImplementationLoader \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ FieldAccessMode \ InvalidTypeNameException \ InvocationTargetException \ @@ -426,7 +425,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ XTypeDescriptionEnumerationAccess \ XUnionTypeDescription \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ CannotRegisterImplementationException \ InvalidRegistryException \ InvalidValueException \ @@ -438,7 +437,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ XRegistryKey \ XSimpleRegistry \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ AllEventObject \ ArrayWrapper \ BasicErrorException \ @@ -482,7 +481,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ XStarBasicModuleInfo \ XTypeConverter \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ AccessControlException \ AllPermission \ RuntimePermission \ @@ -491,7 +490,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ XAction \ XPolicy \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ XInteractionAbort \ XInteractionContinuation \ XInteractionHandler \ @@ -499,7 +498,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ XInteractionRequest \ XInteractionRetry \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ DeploymentException \ Exception \ RuntimeException \ @@ -516,7 +515,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ XUnloadingPreference \ XWeak \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ RelativeUriExcessParentSegments \ XExternalUriReferenceTranslator \ XUriReference \ @@ -528,7 +527,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ XVndSunStarScriptUrl \ XVndSunStarScriptUrlReference \ )) -$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\ XMacroExpander \ XVeto \ )) |