summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-06-04 08:44:45 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-06-04 08:44:45 +0000
commite557f06cb172dfa5ca04d215226b30e8ca4af4aa (patch)
tree6407736e114993f916af6f13ff3e8060d147a41d /ucb/source
parentc664a1cb1ebdf57be58240df49a5c117d176e8c2 (diff)
INTEGRATION: CWS tkr10 (1.59.4); FILE MERGED
2008/05/19 09:27:00 tkr 1.59.4.3: RESYNC: (1.60-1.62); FILE MERGED 2008/03/28 13:56:27 tkr 1.59.4.2: RESYNC: (1.59-1.60); FILE MERGED 2008/02/12 14:04:48 tkr 1.59.4.1: i84676 neon and gnome-vfs2
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx18
1 files changed, 17 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 23ffd436dc67..f07e46962468 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: webdavcontent.cxx,v $
- * $Revision: 1.62 $
+ * $Revision: 1.63 $
*
* This file is part of OpenOffice.org.
*
@@ -2590,6 +2590,18 @@ void Content::transfer(
sourceURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
}
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ {
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ }
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+ {
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
+ }
else
{
if ( !aScheme.equalsAsciiL(
@@ -2612,6 +2624,10 @@ void Content::transfer(
RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
targetURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ targetURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
// @@@ This implementation of 'transfer' only works
// if the source and target are located at same host.