summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-06-14 13:05:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-06-14 13:05:46 +0200
commitaa892d2b432319f949d0b45a0529036984f1aad7 (patch)
tree76915ebb9903a33aeff428de620b01d63960ff87 /officecfg
parentdc2d434687f701884f7c11e130669f63fb606074 (diff)
Fix support for "dummy" content providers
...and use it so that private: URLs are not needlessly passed to the gio or gnome-vfs "catch-all" UCPs. Change-Id: I85d100567d1641130449fe21ccd072bcc0ec0979
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/ucb/Configuration.xcu11
-rw-r--r--officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs2
2 files changed, 12 insertions, 1 deletions
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index a3163905a87d..e9704d3ac0d6 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -188,6 +188,17 @@
<value/>
</prop>
</node>
+ <node oor:name="Provider900" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value/>
+ </prop>
+ <prop oor:name="URLTemplate">
+ <value>private</value>
+ </prop>
+ <prop oor:name="Arguments">
+ <value/>
+ </prop>
+ </node>
<!-- We want the Provider to be the final fallback provider -->
<node oor:name="Provider999" oor:op="replace" install:module="gio">
<prop oor:name="ServiceName">
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
index 9fb25e8b0c93..872177de0afd 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
@@ -28,7 +28,7 @@
</info>
<prop oor:name="ServiceName" oor:type="xs:string">
<info>
- <desc>Specifies the name of the UNO service to be used to instantiate the UCP.</desc>
+ <desc>Specifies the name of the UNO service to be used to instantiate the UCP. If it is the empty string, a null provider will be used (see the documentation of the Provider argument to com.sun.star.ucb.XContentProviderManager.registerContentProvider).</desc>
</info>
</prop>
<prop oor:name="URLTemplate" oor:type="xs:string">