diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:44:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:44:45 +0000 |
| commit | 7af5d36aad1ff610397d8897a64563346e660da7 (patch) | |
| tree | 0f997d127eca93f29daa6fb7a3b077f3506bac94 /ucb | |
| parent | c6dff3765c21d6ecec83ca59a2b0380244d68dcd (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')
| -rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 3256aa84b6..dca5544d66 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. |