diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-07 17:54:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-07 17:55:09 +0200 |
| commit | 459e482c7a9ba9aff5b5a505cc54247493202b46 (patch) | |
| tree | d5baed88d92e4564e018fa00c2c8d1051c72a291 /officecfg | |
| parent | d4924b747eb6abd439a6313e338384ae50cbdc8e (diff) | |
Make webdav and odma ucp configuration properly conditional
Change-Id: I9a8eb6a1e9af051d458a5462c01357540c3d9277
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 2 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 0b0a8b011f9c..37372c933faf 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 def1b2c5a6a3..847f786d9d87 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> |