From 2f80ae36504683c78c127b1d82a653ae357613dc Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 25 Mar 2008 15:18:16 +0000
Subject: INTEGRATION: CWS tl41_DEV300 (1.8.54); FILE MERGED 2008/02/05
 14:23:54 tl 1.8.54.2: #i80286# pathes for 'Linguistic' and 'Dictionary'
 changed 2007/08/06 11:24:32 tl 1.8.54.1: #i80286# use multi-pathes for
 'Dictionary' and 'Linguistic'

---
 .../registry/data/org/openoffice/Office/Paths.xcu  | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 3e142779b920..da31db8d403e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: Paths.xcu,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kz $ $Date: 2007-06-19 15:49:05 $
+ *  last change: $Author: obo $ $Date: 2008-03-25 16:18:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -94,12 +94,6 @@
             </node>
         </node>
 
-        <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
-            <node oor:name="InternalPaths">
-                     <node oor:name="$(insturl)/share/wordbook/$(vlang)" oor:op="fuse" />
-            </node>
-        </node>
-
         <node oor:name="Favorite" oor:op="fuse" oor:mandatory="true">
             <prop oor:name="WritePath">
                      <value>$(userurl)/config/folders</value>
@@ -140,8 +134,21 @@
 
         <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
             <node oor:name="InternalPaths">
-                     <node oor:name="$(insturl)/share/dict" oor:op="fuse" />
+                <node oor:name="$(insturl)/share/dict" oor:op="fuse"/>
+                <node oor:name="$(insturl)/share/dict/ooo" oor:op="fuse"/>
             </node>
+            <prop oor:name="UserPaths">
+                <value>$(userurl)/wordbook</value>
+            </prop>
+        </node>
+
+        <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
+            <node oor:name="InternalPaths">
+                <node oor:name="$(insturl)/share/wordbook/$(vlang)" oor:op="fuse"/>
+            </node>
+            <prop oor:name="WritePath">
+                <value>$(userurl)/wordbook</value>
+            </prop>
         </node>
 
         <node oor:name="Module" oor:op="fuse" oor:mandatory="true">
@@ -212,12 +219,6 @@
             </prop>
         </node>
 
-        <node oor:name="UserDictionary" oor:op="fuse" oor:mandatory="true">
-            <prop oor:name="WritePath">
-                     <value>$(userurl)/wordbook</value>
-            </prop>
-        </node>
-
         <node oor:name="Work" oor:op="fuse" oor:mandatory="true">
             <prop oor:name="IsSinglePath" oor:finalized="true">
                 <value>true</value>
-- 
cgit