diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:19:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:36:55 +0100 |
commit | 768ea2924680fc4beb75a782cb0faf26695fee53 (patch) | |
tree | 3460fc37b43d4db3a1bcd6e70bf69bd9bc06be98 /officecfg/Configuration_officecfg.mk | |
parent | minor comment change (diff) | |
download | core-768ea2924680fc4beb75a782cb0faf26695fee53.tar.gz core-768ea2924680fc4beb75a782cb0faf26695fee53.zip |
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/Configuration_officecfg.mk')
-rw-r--r-- | officecfg/Configuration_officecfg.mk | 1 |
1 files changed, 1 insertions, 0 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 \ |