diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-07 09:12:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-07 09:12:48 +0000 |
| commit | c21b8a1620808865d03239256221a6a86e6316f0 (patch) | |
| tree | a939e7d1f16fc8a8ce0ae43f6b9f06815cc5183c /unotools | |
| parent | 23ac3c2339fbf5b52c048984018e5b5405011680 (diff) | |
INTEGRATION: CWS tkr05_SRC680 (1.55.16); FILE MERGED
2007/10/24 15:05:41 tkr 1.55.16.1: #31053# HTTPS WebDAV support
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 96e9e747a775..844a156c9073 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ucblockbytes.cxx,v $ * - * $Revision: 1.55 $ + * $Revision: 1.56 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 18:32:55 $ + * last change: $Author: rt $ $Date: 2007-11-07 10:12:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1024,13 +1024,14 @@ static sal_Bool UCBOpenContentSync( // now determine wether we use a timeout or not; if( ! aScheme.equalsIgnoreAsciiCaseAscii("http") && + ! aScheme.equalsIgnoreAsciiCaseAscii("https") && ! aScheme.equalsIgnoreAsciiCaseAscii("vnd.sun.star.webdav") && ! aScheme.equalsIgnoreAsciiCaseAscii("ftp")) return _UCBOpenContentSync( xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); - if (aScheme.compareToAscii( - "http") != COMPARE_EQUAL ) + if ( (aScheme.compareToAscii( "http" ) != COMPARE_EQUAL) || + (aScheme.compareToAscii( "https" ) != COMPARE_EQUAL) ) xLockBytes->SetStreamValid_Impl(); Reference< XPropertiesChangeListener > xListener; |