summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--officecfg/registry/data/org/openoffice/ucb/Configuration.xcu11
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx8
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.cxx10
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.hxx3
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx8
-rw-r--r--ucb/source/ucp/webdav/webdavprovider.cxx11
-rw-r--r--ucb/source/ucp/webdav/webdavprovider.hxx3
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx1
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.cxx2
9 files changed, 53 insertions, 4 deletions
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index 9cb2a1a85844..27d45d528f29 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -156,6 +156,17 @@
<value/>
</prop>
</node>
+ <node oor:name="Provider12a" oor:op="replace" install:module="neon">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
+ </prop>
+ <prop oor:name="URLTemplate">
+ <value>vnd.sun.star.webdavs</value>
+ </prop>
+ <prop oor:name="Arguments">
+ <value/>
+ </prop>
+ </node>
<node oor:name="Provider13" oor:op="replace"
install:module="neon_gnomevfs">
<prop oor:name="ServiceName">
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index b815bc1685ac..efe31e8f9ad4 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2516,6 +2516,11 @@ void Content::transfer(
sourceURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
}
+ else if ( aScheme == WEBDAVS_URL_SCHEME )
+ {
+ sourceURI.SetScheme(
+ OUString( HTTPS_URL_SCHEME ) );
+ }
else if ( aScheme == DAV_URL_SCHEME )
{
sourceURI.SetScheme(
@@ -2544,6 +2549,9 @@ void Content::transfer(
if ( aScheme == WEBDAV_URL_SCHEME )
targetURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
+ else if ( aScheme == WEBDAVS_URL_SCHEME )
+ targetURI.SetScheme(
+ OUString( HTTPS_URL_SCHEME ) );
else if ( aScheme == DAV_URL_SCHEME )
targetURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 1a8b91be4f17..1f671145aabf 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -137,7 +137,8 @@ ContentProvider::queryContent(
const OUString aScheme
= Identifier->getContentProviderScheme().toAsciiLowerCase();
- if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME
+ if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME
+ && aScheme != WEBDAV_URL_SCHEME && aScheme != WEBDAVS_URL_SCHEME
&& aScheme != DAV_URL_SCHEME && aScheme != DAVS_URL_SCHEME && aScheme != FTP_URL_SCHEME )
throw ucb::IllegalIdentifierException();
@@ -161,6 +162,13 @@ ContentProvider::queryContent(
OUString( HTTP_URL_SCHEME ) );
bNewId = true;
}
+ else if ( aScheme == WEBDAVS_URL_SCHEME )
+ {
+ aURL = aURL.replaceAt( 0,
+ WEBDAVS_URL_SCHEME_LENGTH,
+ OUString( HTTPS_URL_SCHEME ) );
+ bNewId = true;
+ }
else if ( aScheme == DAV_URL_SCHEME )
{
aURL = aURL.replaceAt( 0,
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index da789cf73dd6..dbec74e415fe 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -50,6 +50,9 @@ namespace webdav_ucp {
#define WEBDAV_URL_SCHEME "vnd.sun.star.webdav"
#define WEBDAV_URL_SCHEME_LENGTH 19
+#define WEBDAVS_URL_SCHEME "vnd.sun.star.webdavs"
+#define WEBDAVS_URL_SCHEME_LENGTH 20
+
#define HTTP_URL_SCHEME "http"
#define HTTPS_URL_SCHEME "https"
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index cf370b7f73c0..b69e81e304a4 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2667,6 +2667,11 @@ void Content::transfer(
sourceURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
}
+ else if ( aScheme == WEBDAVS_URL_SCHEME )
+ {
+ sourceURI.SetScheme(
+ OUString( HTTPS_URL_SCHEME ) );
+ }
else if ( aScheme == DAV_URL_SCHEME )
{
sourceURI.SetScheme(
@@ -2695,6 +2700,9 @@ void Content::transfer(
if ( aScheme == WEBDAV_URL_SCHEME )
targetURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
+ else if ( aScheme == WEBDAVS_URL_SCHEME )
+ targetURI.SetScheme(
+ OUString( HTTPS_URL_SCHEME ) );
else if ( aScheme == DAV_URL_SCHEME )
targetURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index e485d0e40cca..9d1a71ba6321 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -123,8 +123,8 @@ ContentProvider::queryContent(
const OUString aScheme
= Identifier->getContentProviderScheme().toAsciiLowerCase();
if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME &&
- aScheme != WEBDAV_URL_SCHEME && aScheme != DAV_URL_SCHEME &&
- aScheme != DAVS_URL_SCHEME )
+ aScheme != WEBDAV_URL_SCHEME && aScheme != WEBDAVS_URL_SCHEME &&
+ aScheme != DAV_URL_SCHEME && aScheme != DAVS_URL_SCHEME )
throw ucb::IllegalIdentifierException();
// Normalize URL and create new Id, if nessacary.
@@ -147,6 +147,13 @@ ContentProvider::queryContent(
OUString( HTTP_URL_SCHEME ) );
bNewId = true;
}
+ else if ( aScheme == WEBDAVS_URL_SCHEME )
+ {
+ aURL = aURL.replaceAt( 0,
+ WEBDAVS_URL_SCHEME_LENGTH,
+ OUString( HTTPS_URL_SCHEME ) );
+ bNewId = true;
+ }
else if ( aScheme == DAV_URL_SCHEME )
{
aURL = aURL.replaceAt( 0,
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 68ea8532453a..776473bd5600 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -42,6 +42,9 @@ namespace http_dav_ucp {
#define WEBDAV_URL_SCHEME "vnd.sun.star.webdav"
#define WEBDAV_URL_SCHEME_LENGTH 19
+#define WEBDAVS_URL_SCHEME "vnd.sun.star.webdavs"
+#define WEBDAVS_URL_SCHEME_LENGTH 20
+
#define HTTP_URL_SCHEME "http"
#define HTTPS_URL_SCHEME "https"
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 09043b4fbf47..4b64723e02b2 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -744,6 +744,7 @@ static bool UCBOpenContentSync(
if( ! aScheme.equalsIgnoreAsciiCase("http") &&
! aScheme.equalsIgnoreAsciiCase("https") &&
! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdav") &&
+ ! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdavs") &&
! aScheme.equalsIgnoreAsciiCase("ftp"))
return _UCBOpenContentSync(
xLockBytes,xContent,rArg,xSink,xInteract);
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index a5c809263825..e2baaae6a5cd 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -95,7 +95,7 @@ bool isSupportedProtocol( const QString &rProtocol )
{
// TODO Get this information directly from OOo
const char * pOOoProtocols[] = { "", "smb", "ftp", "http", "file", "mailto",
- "vnd.sun.star.webdav", "news", "private", "vnd.sun.star.help",
+ "vnd.sun.star.webdav", "vnd.sun.star.webdavs", "news", "private", "vnd.sun.star.help",
"https", "slot", "macro", "javascript", "imap", "pop3", "data",
"cid", "out", "vnd.sun.star.hier", "vim",
".uno", ".component", "vnd.sun.star.pkg", "ldap", "db",
generated by cgit (git 2.34.1) at 2024-07-26 16:26:37 +0000