diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:04:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:04:22 +0000 |
| commit | 3091435c7a66eaf3d74cb596b7bf713a3972231a (patch) | |
| tree | f24ed7dc98471ad0c5ab6612600be0aca9493005 | |
| parent | 67c899bcc7ff43938ebaad52a6d4219c1e739159 (diff) | |
INTEGRATION: CWS ucbfixes01 (1.26.38); FILE MERGED
2007/04/25 12:02:13 kso 1.26.38.1: #i71386# - code cleanup.
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index e9d263198e78..802fe40c32d4 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ftpcontent.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:49:38 $ + * last change: $Author: kz $ $Date: 2007-05-10 13:04:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -499,7 +499,8 @@ Any SAL_CALL FTPContent::execute( xOutputStream(aOpenCommand.Sink,UNO_QUERY); if(xActiveDataSink.is()) { -#ifndef ABI_IS_ON_VACATION_AETSCH +#if 1 + // fill inpustream async; return immediately FTPDownloadThread* p = new FTPDownloadThread( m_xIdentifier->getContentIdentifier(), @@ -510,6 +511,7 @@ Any SAL_CALL FTPContent::execute( throw e; } #else + // fill inputsream sync; return if all data present xActiveDataSink->setInputStream( new FTPInputStream(m_aFTPURL.open())); #endif |