summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorKai Sommerfeld <kso@openoffice.org>2002-01-23 13:41:17 +0000
committerKai Sommerfeld <kso@openoffice.org>2002-01-23 13:41:17 +0000
commit9539ab5f92ed3d894c8822af7870a4b05c9fadbf (patch)
treefef4f77c8414a8b44a256c5dff7c81293e8de72f /ucb
parent5ef9a3fcbe07e3aeb55721d955c54305a770526d (diff)
#96847# - Removed obsolete define for neon-ftp-patch.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx10
-rw-r--r--ucb/source/ucp/webdav/webdavprovider.cxx10
2 files changed, 4 insertions, 16 deletions
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index dfa46fdc9d82..27c7701387e6 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: NeonSession.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: kso $ $Date: 2001-11-26 09:45:37 $
+ * last change: $Author: kso $ $Date: 2002-01-23 14:41:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -107,10 +107,6 @@
#include "UCBDeadPropertyValue.hxx"
#endif
-#ifndef HTTP_REQUEST_H // for HTTP_SESSION_FTP
-#include "http_request.h"
-#endif
-
using namespace com::sun::star;
using namespace webdav_ucp;
@@ -960,13 +956,11 @@ HttpSession * NeonSession::CreateSession( const rtl::OUString & inHostName,
// Add hooks (i.e. for adding additional headers to the request)
http_add_hooks( theHttpSession, &mRequestHooks, this, NULL );
-#if defined HTTP_SESSION_FTP
if (inFtp)
http_session_ftp(theHttpSession,
rtl::OUStringToOString(inUserInfo,
RTL_TEXTENCODING_UTF8).
getStr());
-#endif // HTTP_SESSION_FTP
if ( inProxyName.getLength() )
{
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 6993cd96d332..8103cf652afe 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: webdavprovider.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: kso $ $Date: 2001-11-26 09:45:37 $
+ * last change: $Author: kso $ $Date: 2002-01-23 14:41:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,10 +76,6 @@
#include "webdavcontent.hxx"
#endif
-#ifndef HTTP_REQUEST_H // for HTTP_SESSION_FTP
-#include "http_request.h"
-#endif
-
using namespace com::sun::star;
using namespace webdav_ucp;
@@ -172,11 +168,9 @@ ContentProvider::queryContent(
RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) )
-#if defined HTTP_SESSION_FTP
&&
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
-#endif // HTTP_SESSION_FTP
)
throw com::sun::star::ucb::IllegalIdentifierException();