summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-02 16:25:40 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-02 16:25:40 +0000
commite659d2a7df90866cbd3ad7cf10a9cc6d83050e55 (patch)
tree6258a307eef3415233e4f0fbad707b91190107a7 /officecfg
parent59930922d74d5f15de26fea95cefb43088351566 (diff)
CWS-TOOLING: integrate CWS jl119_DEV300
2009-03-13 08:14:58 +0100 jl r269453 : CWS-TOOLING: rebase CWS jl119 to branches/OOO310@269350 (milestone: OOO310:m5) 2009-03-10 16:01:33 +0100 jl r269280 : #i98990# apply patch by jbu: fixing the python script provider 2009-03-10 13:25:02 +0100 jl r269268 : #i93939# 2009-03-10 11:44:07 +0100 jl r269261 : #i93939# 2009-03-09 17:14:58 +0100 jl r269205 : #i93939# choose a different JRE when the selected one was uninstalled 2009-03-09 16:34:34 +0100 jl r269201 : #i93939# choose a different JRE when the selected one was uninstalled 2009-03-05 16:40:16 +0100 jl r268924 : #99618# Do not migrate java settings 2009-02-25 14:29:53 +0100 jl r268439 : #i99618# do not invalidate existing javasettings by using a new date in the update element
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Setup.xcu10
1 files changed, 0 insertions, 10 deletions
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 0df270bde06d..75d67f0a017a 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -788,11 +788,6 @@
</value>
</prop>
</node>
- <node oor:name="Java" oor:op="replace">
- <prop oor:name="IncludedFiles">
- <value>.*/config/javasettings_.*\.xml</value>
- </prop>
- </node>
<node oor:name="Basic" oor:op="replace">
<prop oor:name="MigrationService">
<value>com.sun.star.migration.Basic</value>
@@ -808,11 +803,6 @@
<value>
.*/autotext/.*
.*/autocorr/.*
- <node oor:name="Java" oor:op="replace">
- <prop oor:name="IncludedFiles">
- <value>.*/config/javasettings_.*\.xml</value>
- </prop>
- </node>
.*/config/.*\.so[bcdegh]
.*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml
.*/config/soffice.cfg/modules/.*/images/.*