summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-03-08 13:50:43 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-08 17:42:12 +0100
commit7cb3fef6e7f25b7391963f316ffd72535c3f923f (patch)
tree9472238ebf83e8530a361648e9dbdd14aa70a56f /officecfg
parent6bacf391710c8ebaa42b083dc14fb13cff48cd16 (diff)
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
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Setup.xcu2
1 files changed, 2 insertions, 0 deletions
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>