From 768ea2924680fc4beb75a782cb0faf26695fee53 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 3 Mar 2014 18:19:01 +0100 Subject: install:module 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 appeared in a block in main.xcd before the unixdesktop-specific , so the former was effectively ignored when reading main.xcd.) Change-Id: I5199556ee3e6decaa07beb14a0503e1b5661f5df --- officecfg/Configuration_officecfg.mk | 1 + officecfg/registry/data/org/openoffice/Office/Paths.xcu | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'officecfg') 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 @@ - $(userurl)/template + $(userurl)/template - - $(userurl)/template + + $(userurl)/template -- cgit