summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/source/loadenv/loadenv.cxx3
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs6
2 files changed, 8 insertions, 1 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3821654df008..cd83d9403748 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -251,7 +251,8 @@ void LoadEnv::startLoading(const OUString& sURL, const uno::Sequence<beans::Prop
m_bLoaded = false;
OUString aRealURL;
- if (!tools::IsMappedWebDAVPath(sURL, &aRealURL))
+ if (!officecfg::Office::Common::Load::DetectWebDAVRedirection::get()
+ || !tools::IsMappedWebDAVPath(sURL, &aRealURL))
aRealURL = sURL;
// try to find out, if it's really a content, which can be loaded or must be "handled"
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ba899658ad83..ca7a467c2cca 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2564,6 +2564,12 @@
</info>
<value>true</value>
</prop>
+ <prop oor:name="DetectWebDAVRedirection" oor:type="xs:boolean" oor:nillable="false">
+ <info>
+ <desc>Determines whether to use WebDAV when a file is loaded from a mapped WebDAV drive.</desc>
+ </info>
+ <value>true</value>
+ </prop>
</group>
<group oor:name="Security">
<info>