From 90a326c7028d5af132c62edfaef77c53627e4c0e Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 13 Mar 2013 22:45:02 +0100 Subject: fdo#61950 move report builder from bundled extensions to plain code For test sample report from fdo#61726 can be used. Change-Id: Iacf8ddc4cf8ad0a408d72e18ecb7237476afeffe Reviewed-on: https://gerrit.libreoffice.org/2718 Reviewed-by: David Ostrovsky Tested-by: David Ostrovsky --- officecfg/Configuration_officecfg.mk | 11 + .../data/org/openoffice/Office/Accelerators.xcu | 127 +++++++ .../data/org/openoffice/Office/DataAccess.xcu | 15 + .../data/org/openoffice/Office/Embedding.xcu | 40 +++ .../org/openoffice/Office/ExtendedColorScheme.xcu | 186 ++++++++++ .../data/org/openoffice/Office/ReportDesign.xcu | 25 ++ .../data/org/openoffice/Office/UI/Controller.xcu | 135 +++++++ .../openoffice/Office/UI/DbReportWindowState.xcu | 145 ++++++++ .../org/openoffice/Office/UI/ReportCommands.xcu | 394 +++++++++++++++++++++ officecfg/registry/data/org/openoffice/Setup.xcu | 20 ++ .../data/org/openoffice/TypeDetection/Filter.xcu | 67 ++++ .../data/org/openoffice/TypeDetection/Types.xcu | 72 ++++ officecfg/registry/files.mk | 3 + .../schema/org/openoffice/Office/ReportDesign.xcs | 62 ++++ .../openoffice/Office/UI/DbReportWindowState.xcs | 39 ++ .../org/openoffice/Office/UI/ReportCommands.xcs | 44 +++ 16 files changed, 1385 insertions(+) create mode 100644 officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu create mode 100644 officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu create mode 100644 officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu create mode 100644 officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu create mode 100644 officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu create mode 100644 officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu create mode 100644 officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs create mode 100644 officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs create mode 100644 officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs (limited to 'officecfg') diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index eba42f0f886d..3a0bae3495df 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/Calc.xcu \ org/openoffice/Office/Canvas.xcu \ org/openoffice/Office/Compatibility.xcu \ + org/openoffice/Office/ExtendedColorScheme.xcu \ org/openoffice/Office/ExtensionDependencies.xcu \ org/openoffice/Office/ExtensionManager.xcu \ org/openoffice/Office/Impress.xcu \ @@ -48,8 +49,12 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/Views.xcu \ org/openoffice/Office/Paths.xcu \ org/openoffice/Office/Histories.xcu \ + org/openoffice/Office/ReportDesign.xcu \ org/openoffice/Office/UI/Controller.xcu \ org/openoffice/Office/UI/Factories.xcu \ + org/openoffice/Office/UI/ReportCommands.xcu \ + org/openoffice/TypeDetection/Filter.xcu \ + org/openoffice/TypeDetection/Types.xcu \ org/openoffice/TypeDetection/UISort.xcu \ org/openoffice/ucb/Configuration.xcu \ )) @@ -65,11 +70,13 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Setup-base.xcu \ org/openoffice/Setup-math.xcu \ org/openoffice/Setup-report.xcu \ + org/openoffice/Setup-reportbuilder.xcu \ org/openoffice/Setup-start.xcu \ org/openoffice/UserProfile-unixdesktop.xcu \ org/openoffice/VCL-gconflockdown.xcu \ org/openoffice/VCL-unixdesktop.xcu \ org/openoffice/Office/Accelerators-macosx.xcu \ + org/openoffice/Office/Accelerators-reportbuilder.xcu \ org/openoffice/Office/Accelerators-unxwnt.xcu \ org/openoffice/Office/Addons-librelogo.xcu \ org/openoffice/Office/Common-writer.xcu \ @@ -93,6 +100,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Common-ctlseqcheck.xcu \ org/openoffice/Office/Common-korea.xcu \ org/openoffice/Office/DataAccess-evoab2.xcu \ + org/openoffice/Office/DataAccess-reportbuilder.xcu \ org/openoffice/Office/Paths-macosx.xcu \ org/openoffice/Office/Paths-unxwnt.xcu \ org/openoffice/Office/Paths-unixdesktop.xcu \ @@ -106,9 +114,11 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Embedding-impress.xcu \ org/openoffice/Office/Embedding-math.xcu \ org/openoffice/Office/Embedding-base.xcu \ + org/openoffice/Office/Embedding-reportbuilder.xcu \ org/openoffice/Office/Embedding-writer.xcu \ org/openoffice/Office/Recovery-gconflockdown.xcu \ org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ + org/openoffice/Office/UI/Controller-reportbuilder.xcu \ org/openoffice/TypeDetection/UISort-writer.xcu \ org/openoffice/TypeDetection/UISort-calc.xcu \ org/openoffice/TypeDetection/UISort-draw.xcu \ @@ -150,6 +160,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DbQueryWindowState.xcu \ org/openoffice/Office/UI/DbTableWindowState.xcu \ org/openoffice/Office/UI/DbRelationWindowState.xcu \ + org/openoffice/Office/UI/DbReportWindowState.xcu \ org/openoffice/Office/UI/DbBrowserWindowState.xcu \ org/openoffice/Office/UI/DbTableDataWindowState.xcu \ org/openoffice/Office/UI/DrawImpressCommands.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 50f76cf9c1dc..fd649ba7294d 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -178,7 +178,9 @@ + + I10N SHORTCUTS - NO TRANSLATE @@ -6185,6 +6187,131 @@ + + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:SelectReport + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:ControlProperties + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:ControlProperties + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:ReportNavigator + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:AddField + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:Escape + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:DbSortingAndGrouping + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:ExecuteReport + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:SelectAllInSection + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:SelectAllLabels + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:SelectAllEdits + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:Redo + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:Undo + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:NextMark + + + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:PrevMark + + + + + + .uno:CollapseSection + I10N SHORTCUTS - NO TRANSLATE + + + + + + .uno:ExpandSection + I10N SHORTCUTS - NO TRANSLATE + + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu index 1958a771da8d..4f15a46e6f3c 100644 --- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu +++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu @@ -18,6 +18,21 @@ --> + + + Pentaho Reporting Flow Engine + + + + + Pentaho Reporting Flow Engine + + + org.libreoffice.report.pentaho.SOReportJobFactory + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu index 70982483183f..543940dcd9ce 100644 --- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu @@ -259,6 +259,37 @@ PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS + + + com.sun.star.embed.OOoEmbeddedObjectFactory + + + com.sun.star.report.ReportDefinition + + + 1 + + + PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE + + + + + com.sun.star.embed.OOoEmbeddedObjectFactory + + + com.sun.star.chart2.ChartDocument + + + StarOffice XML (Base) Report Chart + + + 1 + + + PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE + + @@ -316,5 +347,14 @@ + + + + 80243D39-6741-46C5-926E-069164FF87BB + + + D7896D52-B7AF-4820-9DFE-D404D015960F + + diff --git a/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu new file mode 100644 index 000000000000..890127e87a20 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu @@ -0,0 +1,186 @@ + + + + + + default + + + + + + + + 8364108 + + + 8364108 + + + + + 8364108 + + + 8364108 + + + + + 15778136 + + + 15778136 + + + + + 15778136 + + + 15778136 + + + + + 11190738 + + + 11190738 + + + + + 11190738 + + + 11190738 + + + + + 11190738 + + + 11190738 + + + + + 11190738 + + + 11190738 + + + + + 15844514 + + + 15844514 + + + + + 16724838 + + + 16724838 + + + + + 8421504 + + + 8421504 + + + + + + + + + + + Oracle Report Builder + + + + + Report Header + + + + + Report Footer + + + + + Page Header + + + + + Page Footer + + + + + Group Header + + + + + Group Footer + + + + + Column Header + + + + + Column Footer + + + + + Detail + + + + + Overlapped Control + + + + + Text Box Bound Content + + + + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu b/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu new file mode 100644 index 000000000000..53b8ba592588 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu @@ -0,0 +1,25 @@ + + + + + + true + + + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 2f40b2ab7a2d..8b01361f57ba 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -429,6 +429,117 @@ com.sun.star.svx.UpSearchToolboxController + + + + .uno:FontColor + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:BackgroundColor + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:Color + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:BasicShapes + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:SymbolShapes + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:ArrowShapes + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:FlowChartShapes + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:CalloutShapes + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:StarShapes + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + + + + .uno:CharFontName + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.ReportToolboxController + + @@ -508,6 +619,30 @@ com.sun.star.comp.framework.LangSelectionStatusbarController + + + + .uno:ZoomSlider + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.comp.StatusbarController + + + + + .uno:Zoom + + + com.sun.star.report.ReportDefinition + + + com.sun.star.report.comp.StatusbarController + + + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu new file mode 100644 index 000000000000..91bce6748689 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu @@ -0,0 +1,145 @@ + + + + + + + + 0,1 + + + true + + + 0 + + + 0 + + + Standard + + + true + + + + + 0,1 + + + true + + + 0 + + + Formatting + + + true + + + + + Report Controls + + + 0,2 + + + true + + + true + + + + + Drawing objects + + + 297,2 + + + true + + + false + + + + + Align + + + 489,2 + + + true + + + true + + + + + Align at Section + + + 0,2 + + + true + + + true + + + + + Shrink at Section + + + 0,2 + + + true + + + true + + + + + Object Resizing + + + 670,2 + + + true + + + true + + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu new file mode 100644 index 000000000000..df7277d48eff --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu @@ -0,0 +1,394 @@ + + + + + + + + Report Header/Footer + + + + + Page Header/Footer + + + + + ~Ruler + + + + + ~Sorting and Grouping + + + 1 + + + + + ~Add Field + + + 1 + + + + + ~Conditional Formatting... + + + + + Page Settings + + + ~Page... + + + + + ~Clear Direct Formatting + + + + + ~Page Numbers... + + + + + ~Date and Time... + + + + + ~Select Report + + + + + ~Subreport in New Window... + + + + + Font Color + + + 1 + + + + + Gr~id + + + + + ~Column Header/Footer + + + + + Paste ~Special... + + + + + Execute Report... + + + 1 + + + + + Graphic... + + + + + Text Document + + + + + Spreadsheet Document + + + + + Report Navigator + + + 1 + + + + + Fit to smallest width + + + 1 + + + + + Fit to smallest height + + + 1 + + + + + Fit to greatest width + + + 1 + + + + + Fit to greatest height + + + 1 + + + + + Properties + + + 1 + + + + + Distribution... + + + + + ~Select Objects in Section + + + + + Left Align on Section + + + 1 + + + + + Right Align on Section + + + 1 + + + + + Top Align on Section + + + 1 + + + + + Bottom Align on Section + + + 1 + + + + + Centered on Section + + + + + Middle on Section + + + 1 + + + + + Select all Labels + + + + + Select all Formatted Fields + + + + + + + + + Shape Arrange + + + + + + Control + + + + + + + + Alignment + + + + + + Resize + + + + + + Section alignment + + + + + + Report Controls + + + + + + Shapes + + + + + + Basic Shapes + + + + + + Symbol Shapes + + + + + + Arrow Shapes + + + + + + FlowChart Shapes + + + + + + Callout Shapes + + + + + + Star Shapes + + + + + + Section + + + + + Shrink + + + 1 + + + + + Shrink from top + + + 1 + + + + + Shrink from bottom + + + 1 + + + + + + + + Report Output Format + + + + + ~Snap Lines + + + + + Object Resizing + + + + + A~rrange + + + + + diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 4017fc705805..ea9b1865555e 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -757,6 +757,26 @@ Base + + + ReportCommands + + + dbreport + + + DbReportWindowState + + + 12 + + + GenericCategories + + + Base: Oracle Report Builder + + diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu new file mode 100644 index 000000000000..1b24d4041461 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu @@ -0,0 +1,67 @@ + + + + + + + IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER NOTINFILEDIALOG NOTINCHOOSER + + + + + + 6800 + + + StarBaseReport + + + + com.sun.star.report.ReportDefinition + + + ODF Database Report + + + + + + IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER + + + + com.sun.star.comp.chart2.report.XMLFilter + + + + 6800 + + + StarBaseReportChart + + + + com.sun.star.chart2.ChartDocument + + + %productname% %formatversion% Report Chart + + + + diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu new file mode 100644 index 000000000000..9faf9eac9fed --- /dev/null +++ b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu @@ -0,0 +1,72 @@ + + + + + + + com.sun.star.comp.report.ORptTypeDetection + + + private:factory/sreport* + + + orp + + + application/vnd.sun.xml.report + + + false + + + StarOffice XML (Base) Report + + + OpenDocument Database Report + + + StarBaseReport 9.0 + + + + + + + + + odc + + + application/vnd.sun.xml.report.chart + + + false + + + StarOffice XML (Base) Report Chart + + + StarOffice XML (Base) Report Chart 9 + + + StarOffice XML (Base) Report Chart 9 + + + + diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 1f6fbfa4d1ac..7a2deb85dea9 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -43,6 +43,7 @@ officecfg_XCSFILES := \ Office/PresenterScreen \ Office/ProtocolHandler \ Office/Recovery \ + Office/ReportDesign \ Office/SFX \ Office/Scripting \ Office/Security \ @@ -66,6 +67,7 @@ officecfg_XCSFILES := \ Office/UI/DbBrowserWindowState \ Office/UI/DbQueryWindowState \ Office/UI/DbRelationWindowState \ + Office/UI/DbReportWindowState \ Office/UI/DbTableDataWindowState \ Office/UI/DbTableWindowState \ Office/UI/DbuCommands \ @@ -79,6 +81,7 @@ officecfg_XCSFILES := \ Office/UI/ImpressWindowState \ Office/UI/MathCommands \ Office/UI/MathWindowState \ + Office/UI/ReportCommands \ Office/UI/StartModuleCommands \ Office/UI/StartModuleWindowState \ Office/UI/WindowContentFactories \ diff --git a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs new file mode 100644 index 000000000000..89336c06b5e3 --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs @@ -0,0 +1,62 @@ + + + + + OJ + Contains informatation of report design. + + + + + specifies settings for the property browser used for reports and report controls. + + + + OJ + Enables or disables a help section at the bottom of the property browser, which shows the help of the currently active property. + + false + + + + + specifies extension settings for the report designer. + + + + LLA + Direct download URL to the Oracle(tm) Report Builder extension. + + http://extensions.go-oo.org + + + + LLA + Name of the extension. + + Oracle(tm) Report Builder + + + + + Denotes an additional field for arbitrary data. + + + + diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs new file mode 100644 index 000000000000..3358e5422a6e --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs @@ -0,0 +1,39 @@ + + + + + OJ + Contains state information of all dockable user interface elements based on a Window class which belongs to the database report module. + + + + + + + + Contains user interface element state data specific for the database report module." + + + + Contains states of all known dockable user interface elements of the report module." + + + + + diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs new file mode 100644 index 000000000000..cd0771e58cab --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs @@ -0,0 +1,44 @@ + + + + + OJ + Contains general information and about actions based on office commands. + + + + + + + + Contains user interface data for Office commands and identifiers that are used by the user interface." + + + + Contains label text for Office commands and identifiers that are used by the user interface." + + + + + Contains label text for popup menus identifiers that are used by the user interface." + + + + + -- cgit v1.2.1