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
This commit is contained in:
Vladimir Glazounov 2008-06-04 08:44:45 +00:00
parent c664a1cb1e
commit e557f06cb1

View file

@ -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.