[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/office-cfg-linux-common-template-dir.diff |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 4cd77f9fb53ce78483c0a434ec77170d9eafdf12
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 13 17:38:23 2011 +0200

    fix office-cfg-linux-common-template-dir.diff to apply

diff --git a/patches/dev300/office-cfg-linux-common-template-dir.diff b/patches/dev300/office-cfg-linux-common-template-dir.diff
index 34cf86b..bdedff3 100644
--- a/patches/dev300/office-cfg-linux-common-template-dir.diff
+++ b/patches/dev300/office-cfg-linux-common-template-dir.diff
@@ -16,26 +16,23 @@ index bb3c779..642d227 100644
  </oor:component-data>
 diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
 index 74c65d3..4e43df8 100644
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -1689,7 +1689,7 @@
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2011-04-01 13:21:19.000000000 +0200
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2011-04-13 17:23:13.000000000 +0200
+@@ -1711,7 +1711,7 @@
  						<author>MBA</author>
  						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
  					</info>
 -					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value>
-+                    <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
++					<value oor:separator=";">file:///usr/share/templates/libreoffice/common;file:///usr/share/templates/libreoffice/$(vlang);file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);$(insturl)/share/template/$(vlang);$(insturl)/share/template;$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
-@@ -1837,8 +1837,7 @@
+@@ -1859,7 +1859,7 @@
  					<info>
  						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
  					</info>
 -					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value>
-+                    <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
++					<value oor:separator=";">file:///usr/share/templates/libreoffice/common;file:///usr/share/templates/libreoffice/$(vlang);file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);$(insturl)/share/template/$(vlang);$(insturl)/share/template;$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
--- 
-1.7.0.1
-