diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-07 11:55:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-07 12:07:17 +0200 |
commit | e57eeb6d5f547a4a49df796641141c733f6c5204 (patch) | |
tree | e870edf4b2924295ed2912ab3fdba2117a25fefa /reportbuilder/Module_reportbuilder.mk | |
parent | e98c03ed6525b026ca3cd7941b3634c0f5561397 (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
Diffstat (limited to 'reportbuilder/Module_reportbuilder.mk')
-rw-r--r-- | reportbuilder/Module_reportbuilder.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk index 08c3b0115788..aaa3e596e845 100644 --- a/reportbuilder/Module_reportbuilder.mk +++ b/reportbuilder/Module_reportbuilder.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,reportbuilder)) ifeq ($(ENABLE_REPORTBUILDER),TRUE) $(eval $(call gb_Module_add_targets,reportbuilder,\ Jar_reportbuilder \ + Package_reportbuilder-templates \ )) endif |