diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-25 10:38:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-25 10:38:13 +0000 |
| commit | afed7c67482d323e2ec3079658bd086d5ab023ab (patch) | |
| tree | b98c9f40892bf8c9cf20f1ff053c9f7b1120b294 /ucb | |
| parent | 9c27dddcacfc85c90a8def7d6f1d46e99142a72c (diff) | |
INTEGRATION: CWS abi3 (1.19.28); FILE MERGED
2003/07/23 06:53:03 abi 1.19.28.2: #110335# introduced macro ABI_IS_ON_VACATION_AETSCH
2003/07/20 21:04:49 abi 1.19.28.1: #110335# backgrounding download now
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 9d30882ec4ba..14074b279833 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ftpcontent.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2003-03-27 17:26:46 $ + * last change: $Author: vg $ $Date: 2003-07-25 11:38:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ #include "ftpcfunc.hxx" #include "ftpstrcont.hxx" #include "ftpintreq.hxx" +#include "ftpdownloadthread.hxx" #include <memory> #include <vector> @@ -514,8 +515,20 @@ Any SAL_CALL FTPContent::execute( xOutputStream(aOpenCommand.Sink,UNO_QUERY); if(xActiveDataSink.is()) { +#ifndef ABI_IS_ON_VACATION_AETSCH + FTPDownloadThread* p = + new FTPDownloadThread( + m_xIdentifier->getContentIdentifier(), + m_pFCP); + if(!p->Get(xActiveDataSink)) { + curl_exception e = p->GetException(); + delete p; + throw e; + } +#else xActiveDataSink->setInputStream( new FTPInputStream(m_aFTPURL.open())); +#endif } else if(xOutputStream.is()) { Reference<XInputStream> xStream( |