diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-07 11:55:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-07 13:42:34 +0200 |
| commit | 0cd10346f94430128beee0b4084b27837ccda6fa (patch) | |
| tree | 3e68b8ad27a732f6ab795df76760b8c5733dc081 /scp2 | |
| parent | de320f38621a879c7826b9280e3ff00121fbf80f (diff) | |
fdo#65168: Fix regressions introduced with de-extension-ing report builder
...in 90a326c7028d5af132c62edfaef77c53627e4c0e "fdo#61950 move report builder
from bundled extensions to plain code":
* For one, ReportWizard.startReportWizard
(wizards/com/sun/star/wizards/report/ReportWizard.java) would still try to load
reportbuilderwizard.jar from the unpacked extension (and, failing that, fell
back to the old default engine, so this didn't cause any failure per se).
Instead, reference reportbuilderwizard.jar (which was also missing from scp2)
from report.jar's manifest Class-Path (which will always be OK, even if
reportbuilderwizard.jar is not installed) and check for the relevant class via
Class::forName directly.
* For another, the en-US/wizard/report/default.otr template had gone missing.
The way to find it inside the unpacked extension in the past was to include a
Paths.xcu update that extends the Template path. Instead, install that
template directly into share/template now, and drop the (unused already)
Paths.xcu update.
Change-Id: I09eca2b69aa55d5b15fb5ecfec6881f8a6f6e5e5
(cherry picked from commit e57eeb6d5f547a4a49df796641141c733f6c5204)
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/module_reportbuilder.scp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp index 67ffebf0cbae..1c5b0f3e187a 100644 --- a/scp2/source/ooo/module_reportbuilder.scp +++ b/scp2/source/ooo/module_reportbuilder.scp @@ -38,7 +38,9 @@ Module gid_Module_Reportbuilder gid_File_Lib_Rptui, gid_File_Lib_Rptxml, gid_File_Jar_Reportbuilder, - gid_File_Xcd_Reportbuilder); + gid_File_Jar_Reportbuilderwizard, + gid_File_Xcd_Reportbuilder, + gid_Filelist_ReportbuilderTemplates); End Directory gid_Dir_Share_Reportbuilder @@ -47,6 +49,7 @@ Directory gid_Dir_Share_Reportbuilder End STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder ) +STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard ) #if !defined SYSTEM_APACHE_COMMONS STD_JAR_FILE(gid_File_Jar_CommonsLogging, commons-logging-1.1.1) @@ -74,4 +77,11 @@ File gid_File_Xcd_Reportbuilder Styles = (PACKED); End +File gid_Filelist_ReportbuilderTemplates + TXT_FILE_BODY; + Dir = FILELIST_DIR; + Name = "reportbuilder-templates.filelist"; + Styles = (FILELIST); +End + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |