[Libreoffice-commits] core.git: officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk

[Stephan Bergmann]

 officecfg/Configuration_officecfg.mk                         |    4 +--
 officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |   14 ++++++-----
 postprocess/CustomTarget_registry.mk                         |    4 +--
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 38fd9cf3b4edbec6a324d975a4a2b29f2b276802
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 27 12:42:53 2015 +0200

    Improve names of WebDAV-related install:modules
    
    Change-Id: I2c2f36a9c1b7348ba9f399b05a9f0319e1c40a0e

diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index af992b9..8ad23f9 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -120,8 +120,8 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/TypeDetection/UISort-impress.xcu \
 	org/openoffice/TypeDetection/UISort-math.xcu \
 	org/openoffice/ucb/Configuration-gio.xcu \
-	org/openoffice/ucb/Configuration-neon.xcu \
-	org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \
+	org/openoffice/ucb/Configuration-webdav.xcu \
+	org/openoffice/ucb/Configuration-webdav_neon_gnomevfs.xcu \
 	org/openoffice/ucb/Configuration-win.xcu \
 ))
 
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index 27d45d5..30673ef 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -45,7 +45,7 @@
                 <value/>
               </prop>
             </node>
-            <node oor:name="Provider3" oor:op="replace" install:module="neon">
+            <node oor:name="Provider3" oor:op="replace" install:module="webdav">
               <prop oor:name="ServiceName">
                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
               </prop>
@@ -56,7 +56,7 @@
                 <value/>
               </prop>
             </node>
-            <node oor:name="Provider4" oor:op="replace" install:module="neon">
+            <node oor:name="Provider4" oor:op="replace" install:module="webdav">
               <prop oor:name="ServiceName">
                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
               </prop>
@@ -90,7 +90,7 @@
               </prop>
             </node>
             <node oor:name="Provider7" oor:op="replace"
-                install:module="neon_gnomevfs">
+                install:module="webdav_neon_gnomevfs">
               <prop oor:name="ServiceName">
                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
               </prop>
@@ -145,7 +145,8 @@
                 <value/>
               </prop>
             </node>
-            <node oor:name="Provider12" oor:op="replace" install:module="neon">
+            <node oor:name="Provider12" oor:op="replace"
+                install:module="webdav">
               <prop oor:name="ServiceName">
                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
               </prop>
@@ -156,7 +157,8 @@
                 <value/>
               </prop>
             </node>
-            <node oor:name="Provider12a" oor:op="replace" install:module="neon">
+            <node oor:name="Provider12a" oor:op="replace"
+                install:module="webdav">
               <prop oor:name="ServiceName">
                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
               </prop>
@@ -168,7 +170,7 @@
               </prop>
             </node>
             <node oor:name="Provider13" oor:op="replace"
-                install:module="neon_gnomevfs">
+                install:module="webdav_neon_gnomevfs">
               <prop oor:name="ServiceName">
                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
               </prop>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index eb2e517..6d3b895 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -328,10 +328,10 @@ postprocess_FILES_main += \
 postprocess_DRIVERS += ado
 endif
 ifneq ($(WITH_WEBDAV),)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
 ifeq ($(WITH_WEBDAV),neon)
 ifeq ($(ENABLE_GNOMEVFS),TRUE)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu
+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav_neon_gnomevfs.xcu
 endif
 endif
 endif