Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3152

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/1

use filelist install method for udkapi and offapi

... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
---
M instsetoo_native/util/openoffice.lst.in
M offapi/UnoApi_offapi.mk
M scp2/source/sdkoo/sdkoo.scp
M solenv/gbuild/UnoApi.mk
D solenv/gbuild/ZipUnoApi.mk
M solenv/gbuild/gbuild.mk
M udkapi/UnoApi_udkapi.mk
7 files changed, 294 insertions(+), 326 deletions(-)



diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 994e640..71e5844 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -179,7 +179,7 @@
         active 1
         compression 5
         script sdkoo
-        include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
+        include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -224,7 +224,7 @@
         active 1
         compression 5
         script sdkoo
-        include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
+        include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
     }
 }
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 2c18bf8..cd5129f 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_ZipUnoApi_ZipUnoApi,offapi))
+$(eval $(call gb_UnoApi_UnoApi,offapi))
 
 $(eval $(call gb_UnoApi_use_api,offapi,\
     udkapi \
@@ -30,18 +30,18 @@
 ))
 
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\
        AccessBridge \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
        SequenceTimeContainer \
        TargetPropertiesCreator \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/auth,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/auth,\
        SSOManagerFactory \
        SSOPasswordCache \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
        AsyncCallback \
        ContainerWindowProvider \
        DialogProvider \
@@ -52,55 +52,55 @@
        Toolkit \
        UnoControlDialogModelProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
        DefaultGridDataModel \
        SortableGridDataModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
        UnoControlTabPageModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
        DefaultTreeDataModel \
        MutableTreeDataModel \
        MutableTreeNode \
        TreeControl \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
        DatabaseDataProvider \
     LabeledDataSequence \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\
     ReadOnlyAccess \
     ReadWriteAccess \
        Update \
     theDefaultProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/cui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/cui,\
     ColorPicker \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\
        DataFormatTranslator \
        MimeContentTypeFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\
        SystemClipboard \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
        ExtensionManager \
        PackageInformationProvider \
        PackageRegistryBackend \
        UpdateInformationProvider \
        thePackageManagerFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\
        SmoketestCommandEnvironment \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\
        LicenseDialog \
        PackageManagerDialog \
        UpdateRequiredDialog \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
        DocumentProperties \
        DocumentRevisionListPersistence \
        IndexedPropertyValues \
@@ -113,14 +113,14 @@
        XMLOasisBasicExporter \
        XMLOasisBasicImporter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
        GraphicExportFilter \
        ModuleDispatcher \
        ShapeCollection \
        SlideRenderer \
        SlideSorter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\
        BasicPaneFactory \
        BasicToolBarFactory \
        BasicViewFactory \
@@ -129,7 +129,7 @@
        ModuleController \
        ResourceId \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
        DocumentCloser \
        EmbeddedObjectCreator \
        FileSystemStorageFactory \
@@ -140,17 +140,17 @@
        OOoEmbeddedObjectFactory \
        StorageFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/control,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/control,\
        FilterControl \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
        DefaultFormComponentInspectorModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
        FormController \
        FormOperations \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
        AutoRecovery \
        Bibliography \
        Desktop \
@@ -168,18 +168,18 @@
     TaskCreator \
        UICommandDescription \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
        GraphicObject \
        GraphicProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
        DefaultHelpProvider \
        GenericPropertyHandler \
        ObjectInspector \
        ObjectInspectorModel \
        StringRepresentation \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
        BreakIterator \
        CharacterClassification \
        Collator \
@@ -193,7 +193,7 @@
        TextConversion \
        Transliteration \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
        ConversionDictionaryList \
        DictionaryList \
        LanguageGuessing \
@@ -201,7 +201,7 @@
        Proofreader \
        ProofreadingIterator \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\
        ConsoleHandler \
        CsvLogFormatter \
        DocumentIOLogRing \
@@ -210,39 +210,39 @@
        PlainTextFormatter \
        SimpleLogRing \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\
        MailMessage \
        MailServiceProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
        Manager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
        MozillaBootstrap \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\
        ManifestReader \
        ManifestWriter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
        PluginManager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
        SlideShow \
        TransitionFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\
        BlankNode \
        Literal \
        Repository \
        URI \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\
        Canvas \
        CanvasFactory \
        MtfRenderer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\
        FixedLine \
        FixedText \
        FormatCondition \
@@ -258,32 +258,32 @@
        Section \
        Shape \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\
        DefaultComponentInspectorModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\
        OfficeResourceLoader \
        StringResource \
        StringResourceWithLocation \
        StringResourceWithStorage \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
        ScannerManager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
        DocumentDialogLibraryContainer \
        DocumentScriptLibraryContainer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\
        theMasterScriptProviderFactory \
        MasterScriptProviderFactory \
        ScriptURIHelper \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\
        VBAEventProcessor \
        VBAMacroResolver \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
        CommandDefinition \
        DataAccessDescriptorFactory \
        DatabaseContext \
@@ -296,23 +296,23 @@
        TableDefinition \
        TextConnectionSettings \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\
        CopyTableWizard \
        MacroMigrationWizard \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
        ConnectionPool \
        DriverManager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
        CertificateContainer \
        DocumentDigitalSignatures \
        SerialNumberAdapter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/setup,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/setup,\
        UpdateCheckConfig \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
        ExternalDocLink \
        ExternalDocLinks \
        ExternalSheetCache \
@@ -321,16 +321,16 @@
        RecentFunctions \
        Solver \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
        SmartTagAction \
        SmartTagRecognizer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\
        SimpleCommandMail \
        SimpleSystemMail \
        SystemShellExecute \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
        InteractionHandler \
        InteractionRequestStringResolver \
        JobExecutor \
@@ -339,11 +339,11 @@
        PasswordContainerInteractionHandler \
        StatusIndicatorFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
        AutoTextContainer \
        DefaultNumberingProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
        AnyCompareFactory \
        CachedContentResultSetFactory \
        CachedContentResultSetStubFactory \
@@ -357,7 +357,7 @@
        Store \
        UniversalContentBroker \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
     AddressBookSourceDialog \
        GlobalAcceleratorConfiguration \
     ModuleUIConfigurationManagerSupplier \
@@ -367,14 +367,14 @@
     WindowContentFactoryManager \
        WindowStateConfiguration \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\
        AddressBookSourcePilot \
        FilePicker \
        FolderPicker \
        Wizard \
        XSLTFilterDialog \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
        JobManager \
        NumberFormatter \
        NumberFormatsSupplier \
@@ -384,41 +384,41 @@
        UriAbbreviation \
        URLTransformer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xforms,\
        Model \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\
        NSSInitializer \
        SEInitializer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\
        DocumentBuilder \
        SAXDocumentBuilder \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
        FastShapeContextHandler \
        FastTokenHandler \
        Parser \
     Writer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xpath,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xpath,\
        XPathAPI \
        XPathExtension \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xslt,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xslt,\
        XSLTTransformer \
        XSLT2Transformer \
 ))
 
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
        modules \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
        Accessible \
        AccessibleContext \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
        AccessibleButton \
        AccessibleCheckBox \
        AccessibleComboBox \
@@ -513,21 +513,21 @@
        UnoControlTimeField \
        UnoControlTimeFieldModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
        DefaultGridColumnModel \
        GridColumn \
        UnoControlGrid \
        UnoControlGridModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\
        UnoControlTabPage \
        UnoControlTabPageContainer \
        UnoControlTabPageContainerModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\
        TreeControlModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\
        AccessibleChartDocumentView \
        AccessibleChartElement \
        AreaDiagram \
@@ -564,7 +564,7 @@
        StockDiagram \
        XYDiagram \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\
        Axis \
        CandleStickChartType \
        ChartDocument \
@@ -594,7 +594,7 @@
        StandardDiagramCreationParameters \
        Title \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\
        DataFilter \
        DataProvider \
        DataSequence \
@@ -604,7 +604,7 @@
        RangeHighlightListener \
        TabularDataProviderArguments \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\
        AccessRootElement \
        AdministrationProvider \
        ConfigurationAccess \
@@ -625,7 +625,7 @@
        SimpleSetUpdate \
        UpdateRootElement \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\
        Backend \
        BackendAdapter \
        CopyImporter \
@@ -660,25 +660,25 @@
        SystemIntegration \
        UpdatableLayer \
 ))
-$(eval $(call 
gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\
+$(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\
        LayerParser \
        LayerWriter \
        SchemaParser \
 ))
-$(eval $(call 
gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\
        BootstrapContext \
 ))
-$(eval $(call 
gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\
        ClipboardManager \
        GenericClipboard \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\
        OleDragSource \
        OleDropTarget \
        X11DragSource \
        X11DropTarget \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\
        EventDescriptor \
        Events \
        ExportFilter \
@@ -697,7 +697,7 @@
        TypeDetection \
        XMLBasicImporter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
        AccessibleDrawDocumentView \
        AccessibleGraphControl \
        AccessibleGraphicShape \
@@ -766,14 +766,14 @@
        TransparencyGradientTable \
        modules \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
        BaseStorage \
        EmbeddedObjectDescriptor \
        FileSystemStorage \
        Storage \
        StorageStream \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
        DataAwareControlModel \
        FormComponent \
        FormComponents \
@@ -784,7 +784,7 @@
        PropertyBrowserController \
        modules \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
        BindableControlModel \
        BindableDataAwareControlModel \
        BindableDatabaseCheckBox \
@@ -800,7 +800,7 @@
        ListEntrySource \
        ValueBinding \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\
        CheckBox \
        ComboBox \
        CommandButton \
@@ -840,7 +840,7 @@
        TextField \
        TimeField \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\
        CheckBox \
        ComboBox \
        CommandButton \
@@ -861,7 +861,7 @@
        TextField \
        TimeField \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\
        ButtonNavigationHandler \
        CellBindingPropertyHandler \
        EditPropertyHandler \
@@ -871,16 +871,16 @@
        XMLFormsPropertyHandler \
        XSDValidationPropertyHandler \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\
        ValidatableBindableControlModel \
        ValidatableControlModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\
        AccessibleFormulaText \
        AccessibleFormulaView \
        FormulaProperties \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
        Components \
        ContentHandler \
        ContentHandlerFactory \
@@ -906,29 +906,29 @@
        ToolbarController \
        TransientDocumentsDocumentContentFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\
        GalleryItem \
        GalleryTheme \
        GalleryThemeProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
        Graphic \
        GraphicDescriptor \
        GraphicRasterizer \
        GraphicRendererVCL \
        MediaProperties \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
        ChapterCollator \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\
        ImageMap \
        ImageMapCircleObject \
        ImageMapObject \
        ImageMapPolygonObject \
        ImageMapRectangleObject \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\
        ConversionDictionary \
        Dictionary \
        HangulHanjaConversionDictionary \
@@ -937,20 +937,20 @@
        SpellChecker \
        Thesaurus \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
        MenuProxy \
        MenuProxyListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
        Package \
        PackageFolder \
        PackageFolderEnumeration \
        PackageStream \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
        ZipFileAccess \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
        ChartShape \
        CustomPresentation \
        CustomPresentationAccess \
@@ -979,26 +979,26 @@
        SubtitleShape \
        TitleTextShape \
 ))
-$(eval $(call 
gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\
        DateTime \
        Footer \
        Header \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
        BitmapCanvas \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\
        modules \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
        DataProviderHandler \
        ReportComponentHandler \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
        BrowseNode \
        BrowseNodeFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\
        LanguageScriptProvider \
        MasterScriptProvider \
        ScriptProvider \
@@ -1007,11 +1007,11 @@
        ScriptProviderForJava \
        ScriptProviderForJavaScript \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\
        VBASpreadsheetEventProcessor \
        VBATextEventProcessor \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\
        CallableStatement \
        Column \
        ColumnDescriptorControl \
@@ -1057,10 +1057,10 @@
        TableDescriptor \
        TableDesign \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\
        DefaultViewController \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\
        CallableStatement \
        Connection \
        ConnectionProperties \
@@ -1075,7 +1075,7 @@
        RowSet \
        Statement \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
        Column \
        ColumnDescriptor \
        Container \
@@ -1103,7 +1103,7 @@
        View \
        ViewDescriptor \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
        AccessibleCell \
        AccessibleCsvCell \
        AccessibleCsvRuler \
@@ -1215,7 +1215,7 @@
        UniqueCellFormatRangesEnumeration \
        VolatileResult \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
        CellStyle \
        CharacterProperties \
        CharacterPropertiesAsian \
@@ -1234,7 +1234,7 @@
        StyleFamilies \
        StyleFamily \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
        AccessibleCellView \
        AccessibleTableView \
        Cell \
@@ -1256,11 +1256,11 @@
        TableSortDescriptor \
        TableSortDescriptor2 \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
        AsyncJob \
        Job \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
        AccessibleEndnoteView \
        AccessibleFootnoteView \
        AccessibleHeaderFooterView \
@@ -1365,14 +1365,14 @@
        ViewSettings \
        WebDocument \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\
        Bibliography \
        DDE \
        Database \
        SetExpression \
        User \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\
        Annotation \
        Author \
        Bibliography \
@@ -1415,10 +1415,10 @@
        User \
        WordCount \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/text/textfield,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text/textfield,\
        Type \
 ))
-$(eval $(call 
gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\
        ChangeAuthor \
        ChangeDateTime \
        CreateAuthor \
@@ -1433,7 +1433,8 @@
        Subject \
        Title \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
+       AnyCompareFactory \
        CachedContentResultSet \
        CachedContentResultSetStub \
        CachedDynamicResultSet \
@@ -1483,7 +1484,7 @@
        WebDAVDocumentContent \
        WebDAVFolderContent \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
        ActionTrigger \
        ActionTriggerContainer \
        ActionTriggerSeparator \
@@ -1498,10 +1499,10 @@
        UIElementFactory \
        UIElementSettings \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\
        FilterOptionsDialog \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
        NumberFormatProperties \
        NumberFormatSettings \
        NumberFormats \
@@ -1513,7 +1514,7 @@
        SortDescriptor2 \
        Sortable \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
        OfficeDocumentView \
        PrintOptions \
        PrintSettings \
@@ -1522,10 +1523,10 @@
        RenderOptions \
        ViewSettings \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\
        Binding \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
        AttributeContainer \
        ExportFilter \
        ImportFilter \
@@ -1536,7 +1537,8 @@
        XMLExportFilter \
        XMLImportFilter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\
+       SEInitializer \
        SecurityEnvironment \
        XMLEncryption \
        XMLEncryptionTemplate \
@@ -1544,21 +1546,21 @@
        XMLSignature \
        XMLSignatureTemplate \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\
        Decryptor \
        Encryptor \
        SAXEventKeeper \
        SignatureCreator \
        SignatureVerifier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\
        SaxDocumentHandler \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\
        XMLDocumentWrapper \
        XMLElementWrapper \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\
        Boolean \
        Date \
        DateTime \
@@ -1571,7 +1573,7 @@
 ))
 
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\
        AccessibleEventId \
        AccessibleEventObject \
        AccessibleRelation \
@@ -1605,7 +1607,7 @@
        XAccessibleTextMarkup \
        XAccessibleValue \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\
        AnimationAdditiveMode \
        AnimationCalcMode \
        AnimationColorSpace \
@@ -1638,7 +1640,7 @@
        XTimeContainer \
        XTransitionFilter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\
        AuthenticationFailedException \
        InvalidArgumentException \
        InvalidContextException \
@@ -1653,7 +1655,7 @@
        XSSOManagerFactory \
        XSSOPasswordCache \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
        ActionEvent \
        AdjustmentEvent \
        AdjustmentType \
@@ -1852,7 +1854,7 @@
        XWindowListener2 \
        XWindowPeer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\
        GridColumnEvent \
        GridDataEvent \
        GridInvalidDataException \
@@ -1867,10 +1869,11 @@
        XGridRowSelection \
        XGridSelectionListener \
        XMutableGridDataModel \
+       XMutableGridDataModel \
        XSortableGridData \
        XSortableMutableGridDataModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\
        TabPageActivatedEvent \
        XTabPage \
        XTabPageContainer \
@@ -1878,7 +1881,7 @@
        XTabPageContainerModel \
        XTabPageModel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\
        ExpandVetoException \
        TreeDataModelEvent \
        TreeExpansionEvent \
@@ -1891,7 +1894,7 @@
        XTreeExpansionListener \
        XTreeNode \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\
        ChartAxisArrangeOrderType \
        ChartAxisAssign \
        ChartAxisLabelPosition \
@@ -1940,7 +1943,7 @@
        XTwoAxisXSupplier \
        XTwoAxisYSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\
        AxisOrientation \
        AxisType \
        CoordinateSystemTypeID \
@@ -1993,7 +1996,7 @@
        XTitled \
        XTransformation \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
        DataSequenceRole \
        HighlightedRange \
        LabelOrigin \
@@ -2011,7 +2014,7 @@
        XSheetDataProvider \
        XTextualDataSequence \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
        CannotLoadConfigurationException \
        CorruptedConfigurationException \
        CorruptedUIConfigurationException \
@@ -2023,7 +2026,7 @@
        XTemplateInstance \
        XUpdate \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\
        AuthenticationFailedException \
        BackendAccessException \
        BackendSetupException \
@@ -2057,7 +2060,7 @@
        XUpdateHandler \
        XVersionedSchemaSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\
        DataFlavor \
        UnsupportedFlavorException \
        XDataFormatTranslator \
@@ -2070,7 +2073,7 @@
        XTransferableSource \
        XTransferableSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\
        ClipboardEvent \
        RenderingCapabilities \
        XClipboard \
@@ -2083,7 +2086,7 @@
        XFlushableClipboard \
        XSystemClipboard \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\
        DNDConstants \
        DragGestureEvent \
        DragSourceDragEvent \
@@ -2105,7 +2108,7 @@
        XDropTargetDropContext \
        XDropTargetListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\
        DependencyException \
        DeploymentException \
        ExtensionRemovedException \
@@ -2125,7 +2128,7 @@
        XPackageTypeInfo \
        XUpdateInformationProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
        AmbigousFilterRequest \
        BrokenPackageRequest \
        ChangedByOthersRequest \
@@ -2192,7 +2195,7 @@
        XXMLBasicExporter \
        XXMLOasisBasicImporter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
        Alignment \
        Arrangement \
        BezierPoint \
@@ -2311,7 +2314,7 @@
        XSlideSorterBase \
        XUniversalShapeDescriptor \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\
        AnchorBindingMode \
        BorderType \
        ConfigurationChangeEvent \
@@ -2337,7 +2340,7 @@
        XToolBar \
        XView \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\
        Actions \
        Aspects \
        ElementModes \
@@ -2405,7 +2408,7 @@
        XVisualObject \
        XWindowSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\
        DataSelectionType \
        DatabaseDeleteEvent \
        DatabaseParameterEvent \
@@ -2456,7 +2459,7 @@
        XUpdateBroadcaster \
        XUpdateListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\
        IncompatibleTypesException \
        InvalidBindingStateException \
        ListEntryEvent \
@@ -2466,7 +2469,7 @@
        XListEntrySource \
        XValueBinding \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\
        FeatureState \
        FilterEvent \
        FormFeature \
@@ -2477,22 +2480,22 @@
        XFormControllerContext \
        XFormOperations \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\
        XSubmission \
        XSubmissionSupplier \
        XSubmissionVetoListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\
        XFormComponentValidityListener \
        XValidatable \
        XValidatableFormComponent \
        XValidator \
        XValidityConstraintListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\
        SymbolDescriptor \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
        BorderWidths \
        CommandGroup \
        ControlCommand \
@@ -2588,7 +2591,7 @@
        XUrlList \
        XWindowArranger \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\
        ClipboardFormats \
        FontHeight \
        ItemState \
@@ -2600,13 +2603,13 @@
        Verb \
        Visibility \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\
        GalleryItemType \
        XGalleryItem \
        XGalleryTheme \
        XGalleryThemeProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\
        AffineMatrix2D \
        AffineMatrix3D \
        EllipticalArc \
@@ -2622,7 +2625,7 @@
        RealSize2D \
        XMapping2D \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\
        GraphicColorMode \
        GraphicType \
        PrimitiveFactory2D \
@@ -2639,7 +2642,7 @@
        XPrimitiveFactory2D \
        XSvgParser \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\
        AmPmValue \
        Boundary \
        BreakType \
@@ -2653,6 +2656,7 @@
        CalendarItem2 \
        CharType \
        CharacterIteratorMode \
+       Collator \
        CollatorOptions \
        Currency \
        Currency2 \
@@ -2717,7 +2721,7 @@
        XTransliteration \
        reservedWords \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\
        InteractiveSelectionResult \
        LineDescriptor \
        PropertyCategoryDescriptor \
@@ -2736,11 +2740,11 @@
        XStringListControl \
        XStringRepresentation \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\
        LdapConnectionException \
        LdapGenericException \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\
        ConversionDictionaryType \
        ConversionDirection \
        ConversionPropertyType \
@@ -2785,7 +2789,7 @@
        XSupportedLocales \
        XThesaurus \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\
        LogLevel \
        LogRecord \
        XConsoleHandler \
@@ -2796,7 +2800,7 @@
        XLoggerPool \
        XSimpleLogRing \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\
        MailAttachment \
        MailException \
        MailServiceType \
@@ -2810,14 +2814,14 @@
        XMailServiceProvider \
        XSmtpService \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/media,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/media,\
        XFrameGrabber \
        XManager \
        XPlayer \
        XPlayerWindow \
        ZoomLevel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\
        MenuMultipleChange \
        MenuSingleChange \
        MozillaProductType \
@@ -2836,30 +2840,30 @@
        XProxyRunner \
        XRemoteServiceManagerProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\
        XAnnotation \
        XAnnotationAccess \
        XAnnotationEnumeration \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\
        EncryptionNotAllowedException \
        NoEncryptionException \
        NoRawFormatException \
        WrongPasswordException \
        XDataSinkEncrSupport \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\
        XManifestReader \
        XManifestWriter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
        XZipFileAccess \
        ZipConstants \
        ZipEntry \
        ZipException \
        ZipIOException \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\
        PluginDescription \
        PluginException \
        PluginMode \
@@ -2868,7 +2872,7 @@
        XPluginContext \
        XPluginManager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
        AnimationEffect \
        AnimationSpeed \
        ClickAction \
@@ -2894,10 +2898,10 @@
        XTransition \
        XTransitionFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/qa,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/qa,\
        XDumper \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
        FileFormat \
        ParseException \
        QueryException \
@@ -2918,7 +2922,7 @@
        XResource \
        XURI \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\
        ARGBColor \
        AnimationAttributes \
        AnimationRepeat \
@@ -2996,7 +3000,7 @@
        XTextLayout \
        XVolatileBitmap \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\
        Calculation \
        ForceNewPage \
        GroupKeepTogether \
@@ -3022,13 +3026,13 @@
        XSection \
        XShape \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\
        XFormulaParser \
        XFunctionCategory \
        XFunctionDescription \
        XFunctionManager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\
        MissingResourceException \
        XLocale \
        XResourceBundle \
@@ -3040,14 +3044,14 @@
        XStringResourceWithLocation \
        XStringResourceWithStorage \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/scanner,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/scanner,\
        ScanError \
        ScannerContext \
        ScannerException \
        XScannerManager \
        XScannerManager2 \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\
        LibraryNotLoadedException \
        ModuleInfo \
        ModuleSizeExceededRequest \
@@ -3062,13 +3066,13 @@
        XPersistentLibraryContainer \
        XStorageBasedLibraryContainer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\
        BrowseNodeFactoryViewTypes \
        BrowseNodeTypes \
        XBrowseNode \
        XBrowseNodeFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\
        ScriptErrorRaisedException \
        ScriptExceptionRaisedException \
        ScriptFrameworkErrorException \
@@ -3080,7 +3084,7 @@
        XScriptProviderSupplier \
        XScriptURIHelper \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\
        VBAEventId \
        VBAScriptEvent \
        VBAScriptEventId \
@@ -3090,7 +3094,7 @@
        XVBAModuleInfo \
        XVBAScriptListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
        BooleanComparisonMode \
        CommandType \
        DatabaseRegistrationEvent \
@@ -3144,7 +3148,7 @@
        XSubDocument \
        XTextConnectionSettings \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\
        CopyTableContinuation \
        CopyTableOperation \
        CopyTableRowEvent \
@@ -3156,7 +3160,7 @@
        XDatabaseDocumentUI \
        XTableUIProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\
        CompositionType \
        XConnectionSupplier \
        XConnectionTools \
@@ -3169,7 +3173,7 @@
        XTableRename \
        XViewAccess \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
        BatchUpdateException \
        BestRowScope \
        BestRowType \
@@ -3231,7 +3235,7 @@
        XStruct \
        XWarningsSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\
        CheckOption \
        CompareBookmark \
        KeyType \
@@ -3258,7 +3262,7 @@
        XUsersSupplier \
        XViewsSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\
        CertAltNameEntry \
        CertificateCharacters \
        CertificateContainerStatus \
@@ -3280,7 +3284,7 @@
        XSanExtension \
        XSerialNumberAdapter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
        ActivationEvent \
        AddressConvention \
        Border \
@@ -3479,12 +3483,12 @@
        XVolatileResult \
        _NamedRange \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\
        SmartTagRecognizerMode \
        XSmartTagAction \
        XSmartTagRecognizer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\
        BreakType \
        CaseMap \
        DropCapFormat \
@@ -3511,11 +3515,11 @@
        XStyleLoader \
        XStyleSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\
        XSVGPrinter \
        XSVGWriter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
        SimpleMailClientFlags \
        SystemShellExecuteException \
        SystemShellExecuteFlags \
@@ -3524,7 +3528,7 @@
        XSimpleMailMessage \
        XSystemShellExecute \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
        BorderLine \
        BorderLine2 \
        BorderLineStyle \
@@ -3559,7 +3563,7 @@
        XTableColumns \
        XTableRows \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\
        ClassifiedInteractionRequest \
        DocumentMSPasswordRequest \
        DocumentMSPasswordRequest2 \
@@ -3599,7 +3603,7 @@
        XStatusIndicatorSupplier \
        XUrlContainer \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
        AuthorDisplayFormat \
        BibliographyDataField \
        BibliographyDataType \
@@ -3724,7 +3728,7 @@
        XTextViewCursorSupplier \
        XWordCursor \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
        AlreadyInitializedException \
        AuthenticationRequest \
        CheckinArgument \
@@ -3895,7 +3899,7 @@
        XUniversalContentBroker \
        XWebDAVCommandEnvironment \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
        ActionTriggerSeparatorType \
        ConfigurationEvent \
        ContextMenuExecuteEvent \
@@ -3927,7 +3931,7 @@
        XUIElementSettings \
        XUIFunctionListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\
        CommonFilePickerElementIds \
        ControlActions \
        DialogClosedEvent \
@@ -3960,7 +3964,7 @@
        XWizardController \
        XWizardPage \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
        AliasProgrammaticPair \
        AtomClassRequest \
        AtomDescription \
@@ -4054,7 +4058,7 @@
        XUniqueIDFactory \
        XUpdatable \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\
        DocumentZoomType \
        DuplexMode \
        PaperFormat \
@@ -4081,7 +4085,7 @@
        XViewCursor \
        XViewSettingsSupplier \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\
        InvalidDataOnSubmitException \
        XDataTypeRepository \
        XFormsEvent \
@@ -4091,14 +4095,14 @@
        XModel2 \
        XSubmission \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml,\
        Attribute \
        AttributeData \
        FastAttribute \
        XExportFilter \
        XImportFilter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\
        CipherID \
        DigestID \
        SecurityOperationStatus \
@@ -4119,7 +4123,7 @@
        XXMLSignature \
        XXMLSignatureTemplate \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\
        ConstOfSecurityId \
        ElementMarkPriority \
        ElementMarkType \
@@ -4145,11 +4149,11 @@
        XSignatureVerifyResultBroadcaster \
        XSignatureVerifyResultListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\
        XCompressedDocumentHandler \
        XMLAttribute \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
        DOMException \
        DOMExceptionType \
        NodeType \
@@ -4175,7 +4179,7 @@
        XSAXDocumentBuilder2 \
        XText \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
        AttrChangeType \
        EventException \
        EventType \
@@ -4188,17 +4192,17 @@
        XMutationEvent \
        XUIEvent \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\
        XAbstractView \
        XDocumentView \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\
        XAttributes \
        XElement \
        XNamespaceMapping \
        XRoot \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
        FastToken \
        InputSource \
        SAXException \
@@ -4222,11 +4226,11 @@
        XSAXSerializable \
        XWriter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\
        XXMLDocumentWrapper \
        XXMLElementWrapper \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\
        Libxml2ExtensionHandle \
        XPathException \
        XPathObjectType \
@@ -4235,22 +4239,22 @@
        XXPathObject \
 ))
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xslt,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xslt,\
        XXSLTTransformer \
 ))
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
        DataTypeClass \
        WhiteSpaceTreatment \
        XDataType \
 ))
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\
     XSyncDbusSessionHelper \
     XModify \
     XQuery \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/PackageKit,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/PackageKit,\
     SyncDbusSessionHelper \
 ))
 
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 5bd1908..fcb0181 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -133,16 +133,16 @@
 
 File gid_File_Zip_OdkIdl_udkapi
     TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "udkapi.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+    Dir = FILELIST_DIR;
+    Name = "udkapi_idl";
+    Styles = (FILELIST,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);
+    Dir = FILELIST_DIR;
+    Name = "offapi_idl";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
 File gid_File_Zip_Odkheaders_sal_generated
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 43b7b77..a702ff2 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -33,23 +33,32 @@
 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))
 
 $$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call 
gb_UnoApi_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
+
+endef
+
+define gb_UnoApi__add_idlfile
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,files/sdk/idl/%,$(2)),$(2))
 
 endef
 
@@ -66,7 +75,13 @@
 
 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
@@ -106,11 +121,13 @@
 # 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
deleted file mode 100644
index 6145a5e..0000000
--- a/solenv/gbuild/ZipUnoApi.mk
+++ /dev/null
@@ -1,53 +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/.
-#
-
-# 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_final_target,$(1))
-$(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 3cc234e..3e349c0 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -333,7 +333,6 @@
        CliUnoApi \
        Zip \
        ZipPackage \
-       ZipUnoApi \
        AllLangZip \
        Configuration \
        HelpTarget \
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 004218a..a226b42 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,21 +26,22 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_ZipUnoApi_ZipUnoApi,udkapi))
+$(eval $(call gb_UnoApi_UnoApi,udkapi))
 
 $(eval $(call gb_UnoApi_set_include,udkapi,\
        $$(INCLUDE) \
        -I$(SRCDIR)/udkapi \
 ))
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
+
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
        udk-modules \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
        PropertyBag \
        PropertySet \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
        Bridge \
        IiopBridge \
        OleApplicationRegistration \
@@ -50,12 +51,12 @@
        OleObjectFactory \
        UrpBridge \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
        ApplicationRegistration \
        BridgeSupplier \
        Factory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
        DataInputStream \
        DataOutputStream \
        MarkableInputStream \
@@ -64,50 +65,50 @@
        ObjectOutputStream \
        Pump \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
        MultiServiceFactory \
        RegistryServiceManager \
        ServiceManager \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\
        Dynamic \
        Java \
        Java2 \
        SharedLibrary \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\
        CoreReflection \
        TypeDescriptionManager \
        TypeDescriptionProvider \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\
        DefaultRegistry \
        NestedRegistry \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
        Engine \
        InvocationAdapterFactory \
        JavaScript \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
        BootstrapMacroExpander \
 ))
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
        Introspection \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
        BridgeFactory \
        UnoUrlResolver \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\
        Acceptor \
        Connector \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\
        EnumerableMap \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
        Pipe \
        SequenceInputStream \
        SequenceOutputStream \
@@ -115,43 +116,43 @@
        TextInputStream \
        TextOutputStream \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\
        JavaVirtualMachine \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\
        theCoreReflection \
        ProxyFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\
        ImplementationRegistration \
        SimpleRegistry \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\
        AccessController \
        Policy \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
        AllListenerAdapter \
        Converter \
        Invocation \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
        NamingService \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
        ExternalUriReferenceTranslator \
        UriReferenceFactory \
        UriSchemeParser_vndDOTsunDOTstarDOTexpand \
        UriSchemeParser_vndDOTsunDOTstarDOTscript \
        VndSunStarPkgUrlReferenceFactory \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\
        MacroExpander \
        theMacroExpander \
 ))
 
 
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
        Ambiguous \
        Defaulted \
        GetDirectPropertyTolerantResult \
@@ -206,7 +207,7 @@
        XTolerantMultiPropertySet \
        XVetoableChangeListener \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
        BridgeExistsException \
        InvalidProtocolChangeException \
        ModelDependent \
@@ -220,7 +221,7 @@
        XProtocolProperties \
        XUnoUrlResolver \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
        Currency \
        Date \
        Decimal \
@@ -229,7 +230,7 @@
        SCode \
        XAutomationObject \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
        AlreadyAcceptingException \
        ConnectionSetupException \
        NoConnectException \
@@ -240,7 +241,7 @@
        XConnectionBroadcaster \
        XConnector \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
        ContainerEvent \
        ElementExistException \
        NoSuchElementException \
@@ -279,7 +280,7 @@
        XStringKeyMap \
        XUniqueIDAccess \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
        AlreadyConnectedException \
        BufferSizeExceededException \
        ConnectException \
@@ -325,7 +326,7 @@
        XTruncate \
        XXMLExtractor \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
        InvalidJavaSettingsException \
        JavaDisabledException \
        JavaInitializationException \
@@ -338,7 +339,7 @@
        XJavaThreadRegister_11 \
        XJavaVM \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
        ArrayIndexOutOfBoundsException \
        ClassNotFoundException \
        DisposedException \
@@ -375,11 +376,11 @@
        XTypeProvider \
        XUnoTunnel \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\
        CannotActivateFactoryException \
        XImplementationLoader \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
        FieldAccessMode \
        InvalidTypeNameException \
        InvocationTargetException \
@@ -425,7 +426,7 @@
        XTypeDescriptionEnumerationAccess \
        XUnionTypeDescription \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
        CannotRegisterImplementationException \
        InvalidRegistryException \
        InvalidValueException \
@@ -437,7 +438,7 @@
        XRegistryKey \
        XSimpleRegistry \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
        AllEventObject \
        ArrayWrapper \
        BasicErrorException \
@@ -481,7 +482,7 @@
        XStarBasicModuleInfo \
        XTypeConverter \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
        AccessControlException \
        AllPermission \
        RuntimePermission \
@@ -490,7 +491,7 @@
        XAction \
        XPolicy \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
        XInteractionAbort \
        XInteractionContinuation \
        XInteractionHandler \
@@ -498,7 +499,7 @@
        XInteractionRequest \
        XInteractionRetry \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
        DeploymentException \
        Exception \
        RuntimeException \
@@ -515,7 +516,7 @@
        XUnloadingPreference \
        XWeak \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
        RelativeUriExcessParentSegments \
        XExternalUriReferenceTranslator \
        XUriReference \
@@ -527,7 +528,7 @@
        XVndSunStarScriptUrl \
        XVndSunStarScriptUrlReference \
 ))
-$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
        XMacroExpander \
        XVeto \
 ))

-- 
To view, visit https://gerrit.libreoffice.org/3152
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.