diff options
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 446 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 6 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 12 | ||||
| -rw-r--r-- | solenv/gbuild/Package.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 25 | ||||
| -rw-r--r-- | solenv/gbuild/ZipUnoApi.mk | 53 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 3 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_class.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 | ||||
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 87 |
15 files changed, 329 insertions, 326 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 5cf9840226b4..8e831e76c224 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -179,7 +179,7 @@ LibreOffice_SDK 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,{filelistpath} } } @@ -224,7 +224,7 @@ LibreOffice_Dev_SDK 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,{filelistpath} } } diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 7151bc3e4e34..bf8a7307d91d 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -17,7 +17,9 @@ # 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_package_idlfiles,offapi)) $(eval $(call gb_UnoApi_use_api,offapi,\ udkapi \ @@ -30,18 +32,18 @@ $(eval $(call gb_UnoApi_set_include,offapi,\ )) -$(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 +54,55 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ 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 +115,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/documen 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 +131,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing 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 +142,17 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ 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 +170,18 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ 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 +195,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\ 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 +203,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguis 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 +212,39 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging 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 +260,32 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report, 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 \ @@ -297,23 +299,23 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ 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 \ @@ -322,16 +324,16 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ 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 \ @@ -340,11 +342,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ 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 \ @@ -358,7 +360,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ 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 \ @@ -368,14 +370,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ 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 \ @@ -385,41 +387,41 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ 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 \ @@ -514,21 +516,21 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt, 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 \ @@ -565,7 +567,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/char 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 \ @@ -595,7 +597,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/char 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 \ @@ -605,7 +607,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/char 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 \ @@ -626,7 +628,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/conf 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 \ @@ -661,25 +663,25 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/conf 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 \ @@ -698,7 +700,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/docu 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 \ @@ -767,14 +769,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/draw 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 \ @@ -785,7 +787,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form 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 \ @@ -801,7 +803,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form 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 \ @@ -841,7 +843,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form 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 \ @@ -862,7 +864,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form 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 \ @@ -872,16 +874,16 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form 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 \ @@ -907,29 +909,29 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/fram 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 \ @@ -938,20 +940,20 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ling 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 \ @@ -980,26 +982,26 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/pres 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 \ @@ -1008,11 +1010,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/scri 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 +1059,10 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb, 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 +1077,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc 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 +1105,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc 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 +1217,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/shee 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 +1236,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/styl 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 +1258,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/tabl 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 +1367,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text 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 +1417,10 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text 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 +1435,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text 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,\ CachedContentResultSet \ CachedContentResultSetStub \ CachedDynamicResultSet \ @@ -1483,7 +1485,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb, 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 +1500,10 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ 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 +1515,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util 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 +1524,10 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view 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 +1538,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml, 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,\ SecurityEnvironment \ XMLEncryption \ XMLEncryptionTemplate \ @@ -1544,21 +1546,21 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/ 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_noheader,offapi,offapi/com/sun/star/xsd, )) -$(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 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility 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 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\ 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 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\ 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 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ 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 \ @@ -1870,7 +1872,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ 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 +1880,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ 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 +1893,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ 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 +1942,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\ 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 +1995,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ 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 +2013,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\ 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 +2025,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration 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 +2059,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration 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 +2072,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer, 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 +2085,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/ 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 +2107,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/ 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 +2127,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\ 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 +2194,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\ 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 +2313,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ 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 +2339,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/frame 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 +2407,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\ 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 +2458,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\ 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 +2468,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding, 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 +2479,22 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime, 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 +2590,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ 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 +2602,13 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status, 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 +2624,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ 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 +2641,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ 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 \ @@ -2717,7 +2719,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ 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 +2738,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\ 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 +2787,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ 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 +2798,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\ 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 +2812,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\ 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 +2838,30 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ 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 +2870,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ 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 +2896,10 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation, 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 +2920,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ 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 +2998,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\ 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 +3024,13 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\ 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 +3042,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\ 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 +3064,13 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\ 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 +3082,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provid 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 +3092,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\ 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 \ @@ -3145,7 +3147,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ 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 \ @@ -3157,7 +3159,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/applicati 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 \ @@ -3170,7 +3172,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\ 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 \ @@ -3232,7 +3234,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ 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 \ @@ -3259,7 +3261,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ 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 \ @@ -3281,7 +3283,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\ 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 \ @@ -3480,12 +3482,12 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ 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 \ @@ -3512,11 +3514,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\ 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 \ @@ -3525,7 +3527,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ 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 \ @@ -3560,7 +3562,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\ 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 \ @@ -3600,7 +3602,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\ 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 \ @@ -3725,7 +3727,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ 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 \ @@ -3896,7 +3898,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ 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 \ @@ -3928,7 +3930,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\ 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 \ @@ -3961,7 +3963,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\ 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 \ @@ -4055,7 +4057,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\ 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 \ @@ -4082,7 +4084,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\ 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 \ @@ -4092,14 +4094,14 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ 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 \ @@ -4120,7 +4122,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\ 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 \ @@ -4146,11 +4148,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sa 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 \ @@ -4176,7 +4178,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ 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 \ @@ -4189,17 +4191,17 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/event 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 \ @@ -4223,11 +4225,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ 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 \ @@ -4236,22 +4238,22 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ 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/inc/macros.inc b/scp2/inc/macros.inc index dd4432c3966c..6236c7cc08a6 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -427,8 +427,14 @@ End #if defined MACOSX #define FILELIST_DIR gid_Dir_Bundle_Contents +#define FILELIST_SDK_DIR PREDEFINED_PROGDIR #else #define FILELIST_DIR gid_Dir_Brand_Root +#if defined WNT +#define FILELIST_SDK_DIR gid_Dir_Sdkoo_Root +#else +#define FILELIST_SDK_DIR PREDEFINED_PROGDIR +#endif #endif #include <langmacros.inc> diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 5bd19087fc56..70ea8fe0c85f 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -133,16 +133,16 @@ End File gid_File_Zip_OdkIdl_udkapi TXT_FILE_BODY; - Dir = gid_Dir_Basis_Sdk; - Name = "udkapi.zip"; - Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); + Dir = FILELIST_SDK_DIR; + Name = "udkapi_idl.filelist"; + 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_SDK_DIR; + Name = "offapi_idl.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); End File gid_File_Zip_Odkheaders_sal_generated diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index ed68d8f9e489..8b511862e807 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -56,6 +56,9 @@ endef # Package class +# defined by platform +# gb_Package_SDKDIRNAME + $(dir $(call gb_Package_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 43b7b77b0af8..a7a6a1563f6d 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -33,6 +33,8 @@ $(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_set_outdir,$(1)_idl,$(INSTDIR)) $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_UnoApiTarget_set_root,$(1),UCR) @@ -44,6 +46,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_targe $(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)_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)) @@ -53,6 +56,20 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef +# Create a package of IDL files for putting into SDK. +# +# gb_UnoApi_package_idlfiles api +define gb_UnoApi_package_idlfiles +$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl) + +endef + +define gb_UnoApi__add_idlfile +$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/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)) @@ -66,7 +83,13 @@ $(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 @@ -106,11 +129,13 @@ 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 deleted file mode 100644 index 6145a5ed9d47..000000000000 --- 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 621442d7834d..cb374dad3851 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -331,7 +331,6 @@ include $(foreach class, \ CliUnoApi \ Zip \ ZipPackage \ - ZipUnoApi \ AllLangZip \ Configuration \ HelpTarget \ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 1a3737ebc385..e0d8b0697952 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -283,6 +283,9 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# Package class +gb_Package_SDKDIRNAME := sdk + # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 5686e06cce0b..ecb829e923ac 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -415,6 +415,9 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# Package class +gb_Package_SDKDIRNAME := sdk + # Python gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 274c7ccbc68b..55aff01da19c 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -591,6 +591,9 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# Package class +gb_Package_SDKDIRNAME := sdk + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 31ad5c0d41b1..4eabc920e021 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -358,6 +358,9 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# Package class +gb_Package_SDKDIRNAME := LibreOffice$(PRODUCTVERSION)_SDK + # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 7f6c71b28b4c..037a1a12d20f 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -409,6 +409,9 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# Package class +gb_Package_SDKDIRNAME := sdk + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 630d0c4ec932..14f58823b540 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -407,6 +407,9 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# Package class +gb_Package_SDKDIRNAME := sdk + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index 004218a70823..c907baa29dcd 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -26,21 +26,24 @@ # #************************************************************************* -$(eval $(call gb_ZipUnoApi_ZipUnoApi,udkapi)) +$(eval $(call gb_UnoApi_UnoApi,udkapi)) + +$(eval $(call gb_UnoApi_package_idlfiles,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 +53,12 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/brid 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 +67,50 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ 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 +118,43 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ 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 +209,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ 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 +223,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ 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 +232,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleaut 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 +243,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ 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 +282,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ 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 +328,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ 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 +341,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ 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 +378,11 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ 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 +428,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ 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 +440,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ 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 +484,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ 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 +493,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ 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 +501,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ 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 +518,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ 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 +530,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ 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 \ )) |