diff options
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 1 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Paths.xcu | 8 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 |
3 files changed, 9 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"> diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 388793ec651a..ebd2afeb9bab 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -331,6 +331,10 @@ postprocess_FILES_main += \ # Inet-wnt.xcu must come after Inet.xcu postprocess_DRIVERS += ado endif +ifneq (unx,$(GUIBASE)) +postprocess_FILES_main += \ + $(postprocess_MOD)/org/openoffice/Office/Paths-notunixdesktop.xcu +endif ifeq ($(DISABLE_NEON),$(false)) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu endif |