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/registry | |
| 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/registry')
| -rw-r--r-- | reportbuilder/registry/data/org/openoffice/Office/Paths.xcu | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu deleted file mode 100644 index b8e8be859212..000000000000 --- a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<oor:component-data oor:package="org.openoffice.Office" oor:name="Paths" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > <node oor:name="Paths"> - - <node oor:name="Template" oor:op="fuse"> - <node oor:name="InternalPaths"> - <node oor:name="%origin%/../../../../../template" oor:op="fuse"/> - </node> - </node> - - </node> -</oor:component-data> - |