From 7cb3fef6e7f25b7391963f316ffd72535c3f923f Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Fri, 8 Mar 2013 13:50:43 +0100
Subject: Migrate also Java and Online Update setting (fdo#57061)

The format of the javasetting*.xml file is the same, so why not migrate
it. Note that it does help for 4.0 because we modified javavendors.xml.
This would cause release of the java setting even when they are not
migrated. Well, the migration might be useful in the future, for 5.0 ;-)

I was slightly scared to migrate the /org.openoffice.Office.Job
but registrymodifications.xcu should include only stuff that can
be modified. Minor updates handled this well. AFAIK, we did not
change anything in this area for 4.0, so it should be fine.

Change-Id: I7775c238a7c298bf877241429c197e76f2093f5d
---
 officecfg/registry/data/org/openoffice/Setup.xcu | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 6bca38103a94..4017fc705805 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -826,6 +826,7 @@
                 <it>.*/autocorr/.*</it>
                 <it>.*/basic/.*</it>
                 <it>.*/config/.*\.so[bcdegh]</it>
+                <it>.*/config/javasettings.*\.xml</it>
                 <it>.*/config/soffice.cfg/modules/.*/menubar/.*\.xml</it>
                 <it>.*/config/soffice.cfg/modules/.*/statusbar/.*\.xml</it>
                 <it>.*/config/soffice.cfg/modules/.*/toolbar/.*\.xml</it>
@@ -843,6 +844,7 @@
                 <it>/org.openoffice.Office.Events</it>
                 <it>/org.openoffice.Office.ExtendedColorScheme</it>
                 <it>/org.openoffice.Office.Histories</it>
+                <it>/org.openoffice.Office.Jobs</it>
                 <it>/org.openoffice.Office.Paths</it>
                 <it>/org.openoffice.Office.Recovery</it>
                 <it>/org.openoffice.Office.Common/Accessibility</it>
-- 
cgit