ucb/source/ucp/webdav-neon/webdavcontent.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 9228f41209b1a043e4ec29af8c2f71bb5ad7f798
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Aug 27 11:03:52 2015 +0200
Missing davs URL scheme handling
...looks like it was just forgotten in
e557f06cb172dfa5ca04d215226b30e8ca4af4aa
"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2"?
Change-Id: I1bae95273f43e58425181bbc4667f87a6389e3a9
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index f3b7484..b815bc1 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2510,7 +2510,7 @@ void Content::transfer(
// Check source's and target's URL scheme
- const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase();
+ OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase();
if ( aScheme == WEBDAV_URL_SCHEME )
{
sourceURI.SetScheme(
@@ -2540,12 +2540,16 @@ void Content::transfer(
}
}
- if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME )
+ aScheme = targetURI.GetScheme().toAsciiLowerCase();
+ if ( aScheme == WEBDAV_URL_SCHEME )
targetURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
- else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME )
+ else if ( aScheme == DAV_URL_SCHEME )
targetURI.SetScheme(
OUString( HTTP_URL_SCHEME ) );
+ else if ( aScheme == DAVS_URL_SCHEME )
+ targetURI.SetScheme(
+ OUString( HTTPS_URL_SCHEME ) );
// @@@ This implementation of 'transfer' only works
// if the source and target are located at same host.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
