summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-03 18:19:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-03 18:36:55 +0100
commit768ea2924680fc4beb75a782cb0faf26695fee53 (patch)
tree3460fc37b43d4db3a1bcd6e70bf69bd9bc06be98 /officecfg
parent04c7f741f831d87c31b38de5f4074456ad91fb3d (diff)
install:module <value>s must be mutually exclusive
...so that only a single one ends up in the .xcd data. (In the given case, introduced with 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2 "Resolves: rhbz#1065807 use xdg ~/Templates for default Template location," the duplication for the unixdesktop case happened to be harmless, as the non-unixdesktop <value> appeared in a block in main.xcd before the unixdesktop-specific <value>, so the former was effectively ignored when reading main.xcd.) Change-Id: I5199556ee3e6decaa07beb14a0503e1b5661f5df
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/Configuration_officecfg.mk1
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Paths.xcu8
2 files changed, 5 insertions, 4 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index d0a72398f30b..497fc27e12ab 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Paths-macosx.xcu \
org/openoffice/Office/Paths-unxwnt.xcu \
org/openoffice/Office/Paths-unixdesktop.xcu \
+ org/openoffice/Office/Paths-notunixdesktop.xcu \
org/openoffice/Office/Paths-internallibexttextcatdata.xcu \
org/openoffice/Office/Paths-externallibexttextcatdata.xcu \
org/openoffice/Office/Writer-cjk.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 2a9eb5cf6b54..e8c44d1d332b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -162,7 +162,7 @@
<node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
</node>
<!--
- On unix check of we have a ~/Templates and use that as the write path.
+ On unix check if we have a ~/Templates and use that as the write path.
On other platforms, or if ~/Templates doesn't exist, use the traditional
$(userurl)/template path.
@@ -171,11 +171,11 @@
in that dir.
-->
<prop oor:name="WritePath">
- <value>$(userurl)/template</value>
+ <value install:module="notunixdesktop">$(userurl)/template</value>
<value install:module="unixdesktop" oor:external="com.sun.star.configuration.backend.DesktopBackend TemplatePathVariable"/>
</prop>
- <prop oor:name="UserPaths">
- <value install:module="unixdesktop">$(userurl)/template</value>
+ <prop oor:name="UserPaths" install:module="unixdesktop">
+ <value>$(userurl)/template</value>
</prop>
</node>
<node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">