officecfg/Configuration_officecfg.mk | 2 +
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 14 +++++------
postprocess/packregistry/makefile.mk | 6 +++-
3 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 459e482c7a9ba9aff5b5a505cc54247493202b46
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jun 7 17:54:43 2012 +0200
Make webdav and odma ucp configuration properly conditional
Change-Id: I9a8eb6a1e9af051d458a5462c01357540c3d9277
diff --git a/officecfg/Configuration_officecfg.mk
b/officecfg/Configuration_officecfg.mk
index 0b0a8b0..37372c9 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -206,6 +206,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-win.xcu \
))
# perhaps this file should be moved 2 levels up?
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index def1b2c..847f786 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -26,7 +26,7 @@
*
************************************************************************ -->
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data oor:name="Configuration" oor:package="org.openoffice.ucb"
xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<oor:component-data oor:name="Configuration" oor:package="org.openoffice.ucb"
xmlns:install="http://openoffice.org/2004/installation";
xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<node oor:name="ContentProviders">
<node oor:name="Local" oor:op="replace">
<node oor:name="SecondaryKeys">
@@ -54,7 +54,7 @@
<value/>
</prop>
</node>
- <node oor:name="Provider3" oor:op="replace">
+ <node oor:name="Provider3" oor:op="replace" install:module="neon">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>
@@ -65,7 +65,7 @@
<value/>
</prop>
</node>
- <node oor:name="Provider4" oor:op="replace">
+ <node oor:name="Provider4" oor:op="replace" install:module="neon">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>
@@ -98,7 +98,7 @@
<value/>
</prop>
</node>
- <node oor:name="Provider7" oor:op="replace">
+ <node oor:name="Provider7" oor:op="replace" install:module="neon">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>
@@ -153,7 +153,7 @@
<value/>
</prop>
</node>
- <node oor:name="Provider12" oor:op="replace">
+ <node oor:name="Provider12" oor:op="replace" install:module="neon">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>
@@ -164,7 +164,7 @@
<value/>
</prop>
</node>
- <node oor:name="Provider13" oor:op="replace">
+ <node oor:name="Provider13" oor:op="replace" install:module="neon">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>
@@ -186,7 +186,7 @@
<value/>
</prop>
</node>
- <node oor:name="Provider42" oor:op="replace">
+ <node oor:name="Provider42" oor:op="replace" install:module="win">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.ODMAContentProvider</value>
</prop>
diff --git a/postprocess/packregistry/makefile.mk
b/postprocess/packregistry/makefile.mk
index 2d1d396..1749b5f 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -316,7 +316,8 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Inet-wnt.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
$(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
- $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
+ $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \
+ $(MY_MOD)/org/openoffice/ucb/Configuration-win.xcu
# Inet-wnt.xcu must come after Inet.xcu
MY_DRIVERS += ado
.ELIF "$(GUIBASE)" == "cocoatouch"
@@ -328,6 +329,9 @@ MY_DRIVERS += ado
.ELSE
ERROR : unknown-GUIBASE
.END
+.IF "$(DISABLE_NEON)" != "TRUE"
+MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
