From dd98ac43138d3381c94cb91aff26e1ad3f03c317 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 27 Mar 2012 16:40:55 +0200 Subject: [PATCH] fdo#46808, Adapt UNO services to new style, Part 6, updating makefiles Update the makefiles to generate the necessary new include files. --- offapi/UnoApi_offapi.mk | 258 +++++++++++++++++++++++++---------------------- udkapi/UnoApi_udkapi.mk | 28 +++-- 2 files changed, 155 insertions(+), 131 deletions(-) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1220adc..2b8d84e 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -39,14 +39,25 @@ $(eval $(call gb_UnoApiTarget_set_include,offapi,\ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\ + AccessBridge \ + Accessible \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ TargetPropertiesCreator \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/auth,\ + SSOManagerFactory \ + SSOPasswordCache \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ AsyncCallback \ ContainerWindowProvider \ DialogProvider \ DialogProvider2 \ + MenuBar \ + PopupMenu \ + TabController \ UnoControlDialogModelProvider \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ @@ -61,6 +72,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/ MutableTreeNode \ TreeControl \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart,\ + ChartData \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ DatabaseDataProvider \ )) @@ -70,6 +84,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/conf Update \ theDefaultProvider \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration/backend,\ + HierarchyBrowser \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration/bootstrap,\ + BootstrapContext \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ ExtensionManager \ PackageInformationProvider \ @@ -88,11 +108,24 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/depl $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\ DocumentProperties \ DocumentRevisionListPersistence \ + Events \ + ExtendedTypeDetection \ + FilterAdapter \ + LinkTargets \ + OleEmbeddedServerRegistration \ OOXMLDocumentPropertiesImporter \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\ + BitmapTable \ + DashTable \ + GradientTable \ + HatchTable \ + MarkerTable \ + MasterPages \ + Shapes \ SlideRenderer \ SlideSorter \ + TransparencyGradientTable \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ BasicPaneFactory \ @@ -105,8 +138,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ DocumentCloser \ + FileSystemStorageFactory \ InstanceLocker \ OLESimpleStorage \ + StorageFactory \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ DefaultFormComponentInspectorModel \ @@ -114,8 +149,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ FormOperations \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ + Components \ + ContentHandler \ + DispatchHelper \ + DispatchRecorderSupplier \ + DocumentTemplates \ + FramesContainer \ + MediaTypeDetectionHelper \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ GraphicObject \ + GraphicProvider \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\ + TextConversion \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\ DefaultHelpProvider \ @@ -149,6 +197,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/pres SlideShow \ TransitionFactory \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\ + MenuProxy \ + MenuProxyListener \ + MozillaBootstrap \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages,\ + PackageFolderEnumeration \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\ + PluginManager \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\ BlankNode \ Literal \ @@ -184,6 +243,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/reso StringResourceWithLocation \ StringResourceWithStorage \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\ + ScannerManager \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ DocumentDialogLibraryContainer \ DocumentScriptLibraryContainer \ @@ -205,30 +267,98 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ ConnectionPool \ + Driver \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ CertificateContainer \ SerialNumberAdapter \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ + CellAnnotationsEnumeration \ + CellAreaLinksEnumeration \ + CellFormatRangesEnumeration \ + Cells \ + CellsEnumeration \ + ConsolidationDescriptor \ + DatabaseRangesEnumeration \ + DataPilotFieldGroupItem \ + DataPilotFieldsEnumeration \ + DataPilotSourceDimensions \ + DataPilotSourceHierarchies \ + DataPilotSourceLevels \ + DataPilotSourceMembers \ + DataPilotTablesEnumeration \ + DDELinksEnumeration \ ExternalDocLink \ ExternalDocLinks \ ExternalSheetCache \ FilterFormulaParser \ FormulaOpCodeMapper \ + FunctionDescriptionEnumeration \ + HeaderFooterContent \ + LabelRangesEnumeration \ + LabelRange \ + NamedRangesEnumeration \ + RecentFunctions \ + ScenariosEnumeration \ + SheetCellRangesEnumeration \ + SheetLinksEnumeration \ Solver \ + SpreadsheetsEnumeration \ + SpreadsheetViewPanesEnumeration \ + SubTotalFieldsEnumeration \ + SubTotalField \ + TableAutoFormatEnumeration \ + TableAutoFormatsEnumeration \ + TableConditionalEntryEnumeration \ + UniqueCellFormatRangesEnumeration \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\ SmartTagAction \ SmartTagRecognizer \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/table,\ + CellCursor \ + TableColumnsEnumeration \ + TableRowsEnumeration \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ InteractionRequestStringResolver \ + JobExecutor \ OfficeRestartManager \ PasswordContainerInteractionHandler \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\ + DefaultNumberingProvider \ + DocumentIndexLevelFormat \ + DocumentIndexParagraphStyles \ + Footnotes \ + ParagraphEnumeration \ + TableColumns \ + TableRows \ + TextFieldEnumeration \ + TextFieldMasters \ + TextPortionEnumeration \ + TextRanges \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ + AnyCompareFactory \ + CachedContentResultSetFactory \ + CachedContentResultSetStubFactory \ + CachedDynamicResultSetFactory \ + CachedDynamicResultSetStubFactory \ CommandEnvironment \ + ContentProviderProxyFactory \ + DynamicResultSet \ + FTPContentProvider \ + HelpContentProvider \ + HierarchyContentProvider \ + ODMAContentProvider \ + PropertiesManager \ + SimpleFileAccess \ + SortedDynamicResultSetFactory \ + Store \ + WebDAVContentProvider \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ GlobalAcceleratorConfiguration \ @@ -239,7 +369,16 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/d )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ JobManager \ + OfficeInstallationDirectories \ + PathSubstitution \ + TextSearch \ UriAbbreviation \ + URLTransformer \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml,\ + AttributeContainer \ + ImportFilter \ + NamespaceContainer \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\ FastShapeContextHandler \ @@ -251,14 +390,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ modules \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ - AccessBridge \ - Accessible \ AccessibleContext \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ SSOExceptions \ - SSOManagerFactory \ - SSOPasswordCache \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ AccessibleButton \ @@ -296,11 +431,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a AccessibleWindow \ AnimatedImagesControl \ AnimatedImagesControlModel \ - MenuBar \ - PopupMenu \ RoadmapItem \ SpinningProgressControlModel \ - TabController \ TabControllerModel \ Toolkit \ UnoControl \ @@ -385,7 +517,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c ChartAxisXSupplier \ ChartAxisYSupplier \ ChartAxisZSupplier \ - ChartData \ ChartDataArray \ ChartDataPointProperties \ ChartDataRowProperties \ @@ -478,7 +609,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c CopyImporter \ DefaultBackend \ DataImporter \ - HierarchyBrowser \ Importer \ InteractionHandler \ Layer \ @@ -512,9 +642,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c LayerWriter \ SchemaParser \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\ - BootstrapContext \ -)) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\ DataFormatTranslator \ MimeContentTypeFactory \ @@ -533,19 +660,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\ DocumentInfo \ EventDescriptor \ - Events \ ExportFilter \ - ExtendedTypeDetection \ ExtendedTypeDetectionFactory \ - FilterAdapter \ FilterFactory \ HeaderFooterSettings \ ImportFilter \ LinkTarget \ - LinkTargets \ MediaDescriptor \ OfficeDocument \ - OleEmbeddedServerRegistration \ PDFDialog \ Settings \ StandaloneDocumentInfo \ @@ -566,7 +688,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d AccessibleSlideViewObject \ AppletShape \ Background \ - BitmapTable \ CaptionShape \ ClosedBezierShape \ ConnectorProperties \ @@ -574,7 +695,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d ControlShape \ CustomShape \ CustomShapeEngine \ - DashTable \ Defaults \ DocumentSettings \ DrawPage \ @@ -591,18 +711,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d FillProperties \ GenericDrawPage \ GenericDrawingDocument \ - GradientTable \ GraphicExportFilter \ GraphicObjectShape \ GroupShape \ - HatchTable \ Layer \ LayerManager \ LineProperties \ LineShape \ - MarkerTable \ MasterPage \ - MasterPages \ MeasureProperties \ MeasureShape \ OLE2Shape \ @@ -619,20 +735,16 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d ShadowProperties \ Shape \ ShapeCollection \ - Shapes \ Text \ TextProperties \ TextShape \ - TransparencyGradientTable \ modules \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\ BaseStorage \ EmbeddedObjectDescriptor \ FileSystemStorage \ - FileSystemStorageFactory \ Storage \ - StorageFactory \ StorageStream \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ @@ -746,26 +858,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f FormulaProperties \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ - Components \ - ContentHandler \ ContentHandlerFactory \ Controller \ Desktop \ DesktopTask \ DesktopTasks \ - DispatchHelper \ DispatchProvider \ DispatchRecorder \ - DispatchRecorderSupplier \ - DocumentTemplates \ Frame \ FrameControl \ FrameLoader \ FrameLoaderFactory \ - FramesContainer \ GlobalEventBroadcaster \ LayoutManager \ - MediaTypeDetectionHelper \ ModuleManager \ PopupMenuController \ PopupMenuControllerFactory \ @@ -788,7 +893,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/g $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\ Graphic \ GraphicDescriptor \ - GraphicProvider \ GraphicRasterizer \ GraphicRendererVCL \ MediaProperties \ @@ -805,7 +909,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i NativeNumberSupplier \ NumberFormatMapper \ OrdinalSuffix \ - TextConversion \ Transliteration \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\ @@ -834,23 +937,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/l SpellChecker \ Thesaurus \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\ - MenuProxy \ - MenuProxyListener \ - MozillaBootstrap \ -)) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ Package \ PackageFolder \ - PackageFolderEnumeration \ PackageStream \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ ZipFileAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\ - PluginManager \ -)) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ ChartShape \ CustomPresentation \ @@ -899,9 +993,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s analysisadd \ dateadd \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\ - ScannerManager \ -)) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\ BrowseNode \ BrowseNodeFactory \ @@ -976,7 +1067,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s Connection \ ConnectionProperties \ DBASEConnectionProperties \ - Driver \ DriverManager \ FILEConnectionProperties \ FLATConnectionProperties \ @@ -1035,75 +1125,51 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s CellAnnotation \ CellAnnotationShape \ CellAnnotations \ - CellAnnotationsEnumeration \ CellAreaLink \ CellAreaLinks \ - CellAreaLinksEnumeration \ CellFormatRanges \ - CellFormatRangesEnumeration \ - Cells \ - CellsEnumeration \ - ConsolidationDescriptor \ DDELink \ DDELinks \ - DDELinksEnumeration \ DataPilotDescriptor \ DataPilotField \ DataPilotFieldGroup \ DataPilotFieldGroupEnumeration \ - DataPilotFieldGroupItem \ DataPilotFieldGroups \ DataPilotFieldGroupsEnumeration \ DataPilotFields \ - DataPilotFieldsEnumeration \ DataPilotItem \ DataPilotItems \ DataPilotItemsEnumeration \ DataPilotSource \ DataPilotSourceDimension \ - DataPilotSourceDimensions \ - DataPilotSourceHierarchies \ DataPilotSourceHierarchy \ DataPilotSourceLevel \ - DataPilotSourceLevels \ DataPilotSourceMember \ - DataPilotSourceMembers \ DataPilotTable \ DataPilotTables \ - DataPilotTablesEnumeration \ DatabaseImportDescriptor \ DatabaseRange \ DatabaseRanges \ - DatabaseRangesEnumeration \ DocumentSettings \ FormulaParser \ FunctionAccess \ FunctionDescription \ - FunctionDescriptionEnumeration \ FunctionDescriptions \ GlobalSheetSettings \ - HeaderFooterContent \ - LabelRange \ LabelRanges \ - LabelRangesEnumeration \ NamedRange \ NamedRanges \ - NamedRangesEnumeration \ RangeSelectionArguments \ - RecentFunctions \ Scenario \ Scenarios \ - ScenariosEnumeration \ Shape \ SheetCell \ SheetCellCursor \ SheetCellRange \ SheetCellRanges \ - SheetCellRangesEnumeration \ SheetFilterDescriptor \ SheetLink \ SheetLinks \ - SheetLinksEnumeration \ SheetRangesQuery \ SheetSortDescriptor \ SheetSortDescriptor2 \ @@ -1113,26 +1179,18 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s SpreadsheetDrawPage \ SpreadsheetView \ SpreadsheetViewPane \ - SpreadsheetViewPanesEnumeration \ SpreadsheetViewSettings \ Spreadsheets \ - SpreadsheetsEnumeration \ SubTotalDescriptor \ - SubTotalField \ - SubTotalFieldsEnumeration \ TableAutoFormat \ - TableAutoFormatEnumeration \ TableAutoFormatField \ TableAutoFormats \ - TableAutoFormatsEnumeration \ TableCellStyle \ TableConditionalEntry \ - TableConditionalEntryEnumeration \ TableConditionalFormat \ TablePageStyle \ TableValidation \ UniqueCellFormatRanges \ - UniqueCellFormatRangesEnumeration \ VolatileResult \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ @@ -1170,7 +1228,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t AccessibleCellView \ AccessibleTableView \ Cell \ - CellCursor \ CellProperties \ CellRange \ CellRangeListSource \ @@ -1181,10 +1238,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t TableChartsEnumeration \ TableColumn \ TableColumns \ - TableColumnsEnumeration \ TableRow \ TableRows \ - TableRowsEnumeration \ TableSortDescriptor \ TableSortDescriptor2 \ )) @@ -1192,7 +1247,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t AsyncJob \ InteractionHandler \ Job \ - JobExecutor \ PasswordContainer \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ @@ -1224,22 +1278,18 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t ChapterNumberingRule \ ContentIndex \ ContentIndexMark \ - DefaultNumberingProvider \ Defaults \ DependentTextField \ DocumentIndex \ DocumentIndexFormat \ - DocumentIndexLevelFormat \ DocumentIndexMark \ DocumentIndexMarkAsian \ - DocumentIndexParagraphStyles \ DocumentIndexes \ DocumentSettings \ Endnote \ EndnoteSettings \ Footnote \ FootnoteSettings \ - Footnotes \ GenericTextDocument \ GlobalDocument \ GlobalSettings \ @@ -1256,16 +1306,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t PageFootnoteInfo \ PagePrintSettings \ Paragraph \ - ParagraphEnumeration \ PrintPreviewSettings \ PrintSettings \ RedlinePortion \ ReferenceMark \ ReferenceMarks \ Shape \ - TableColumns \ TableIndex \ - TableRows \ Text \ TextColumns \ TextContent \ @@ -1276,9 +1323,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t TextEmbeddedObject \ TextEmbeddedObjects \ TextField \ - TextFieldEnumeration \ TextFieldMaster \ - TextFieldMasters \ TextFields \ TextFrame \ TextFrames \ @@ -1287,10 +1332,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t TextLayoutCursor \ TextPageStyle \ TextPortion \ - TextPortionEnumeration \ TextRange \ TextRangeContentProperties \ - TextRanges \ TextSection \ TextSections \ TextSortDescriptor \ @@ -1377,27 +1420,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t Title \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ - AnyCompareFactory \ CachedContentResultSet \ - CachedContentResultSetFactory \ CachedContentResultSetStub \ - CachedContentResultSetStubFactory \ CachedDynamicResultSet \ - CachedDynamicResultSetFactory \ CachedDynamicResultSetStub \ - CachedDynamicResultSetStubFactory \ CmisContentProvider \ Content \ ContentProvider \ ContentProviderProxy \ - ContentProviderProxyFactory \ ContentResultSet \ ContentTransmitter \ DefaultHierarchyDataSource \ - DynamicResultSet \ ExpandContentProvider \ FTPContent \ - FTPContentProvider \ FileContent \ FileContentProvider \ GIOContentProvider \ @@ -1405,8 +1440,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u GnomeVFSDocumentContent \ GnomeVFSFolderContent \ HelpContent \ - HelpContentProvider \ - HierarchyContentProvider \ HierarchyDataReadAccess \ HierarchyDataReadWriteAccess \ HierarchyDataSource \ @@ -1414,26 +1447,20 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u HierarchyLinkContent \ HierarchyRootFolderContent \ ODMAContent \ - ODMAContentProvider \ PackageContentProvider \ PackageFolderContent \ PackageStreamContent \ PersistentPropertySet \ - PropertiesManager \ PropertySetRegistry \ RemoteAccessContentProvider \ RemoteContentProviderAcceptor \ RemoteProxyContentProvider \ - SimpleFileAccess \ - SortedDynamicResultSetFactory \ - Store \ TransientDocumentsContentProvider \ TransientDocumentsDocumentContent \ TransientDocumentsFolderContent \ TransientDocumentsRootContent \ TransientDocumentsStreamContent \ UniversalContentBroker \ - WebDAVContentProvider \ WebDAVDocumentContent \ WebDAVFolderContent \ )) @@ -1468,16 +1495,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u NumberFormats \ NumberFormatsSupplier \ NumberFormatter \ - OfficeInstallationDirectories \ PathSettings \ - PathSubstitution \ ReplaceDescriptor \ SearchDescriptor \ SortDescriptor \ SortDescriptor2 \ Sortable \ - TextSearch \ - URLTransformer \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\ OfficeDocumentView \ @@ -1492,10 +1515,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x Binding \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ - AttributeContainer \ ExportFilter \ - ImportFilter \ - NamespaceContainer \ ParaUserDefinedAttributesSupplier \ TextUserDefinedAttributesSupplier \ UserDefinedAttributeSupplier \ diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index 6ba7803..09cc2f3 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -39,7 +39,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ udk-modules \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ - Introspection \ PropertyBag \ PropertySet \ )) @@ -105,27 +104,16 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/r )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ DefaultRegistry \ - ImplementationRegistration \ NestedRegistry \ - SimpleRegistry \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ - AllListenerAdapter \ Engine \ - Invocation \ InvocationAdapterFactory \ JavaScript \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/security,\ - AccessController \ - Policy \ -)) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\ TestFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/uno,\ - NamingService \ -)) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ BootstrapMacroExpander \ MacroExpander \ @@ -137,6 +125,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/u )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\ + Introspection \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ UnoUrlResolver \ )) @@ -152,8 +143,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ SequenceOutputStream \ TempFile \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\ + ImplementationRegistration \ + SimpleRegistry \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\ + AccessController \ + Policy \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\ + AllListenerAdapter \ Converter \ + Invocation \ +)) +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\ + NamingService \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ ExternalUriReferenceTranslator \ -- 1.7.5.4