summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorTobias Krause <tkr@openoffice.org>2010-01-25 14:58:30 +0100
committerTobias Krause <tkr@openoffice.org>2010-01-25 14:58:30 +0100
commitef897a6dec963a1a421db3628cead20ce3c96c90 (patch)
tree7265e3b33c2696b6e0b5d9c4524251aca2c007f5 /ucb
parentf8037b9dc3b5d00ac8c99b7a1512b9691b05935d (diff)
tkr32: #i105917# accout that macos uses curl 7.19.1
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 8ef8ea87f8b0..77f20673cb2c 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -581,9 +581,19 @@ Any SAL_CALL FTPContent::execute(
e.code() == CURLE_FTP_WEIRD_PASS_REPLY ||
e.code() == CURLE_LOGIN_DENIED)
action = THROWAUTHENTICATIONREQUEST;
- else if(e.code() == CURLE_REMOTE_ACCESS_DENIED)
+ else if(e.code() == CURLE_FTP_ACCESS_DENIED
+// MacOS SDK 10.4 (curl 7.19.1) doesn't define CURLE_REMOTE_ACCESS_DENIED
+#ifdef CURLE_REMOTE_ACCESS_DENIED
+ || e.code() == CURLE_REMOTE_ACCESS_DENIED
+#endif
+ )
action = THROWACCESSDENIED;
- else if(e.code() == CURLE_QUOTE_ERROR)
+ else if(e.code() == CURLE_FTP_QUOTE_ERROR
+// MacOS SDK 10.4 (curl 7.19.1) doesn't define CURLE_QUOTE_ERROR
+#ifdef CURLE_QUOTE_ERROR
+ || e.code() == CURLE_QUOTE_ERROR
+#endif
+ )
action = THROWQUOTE;
else if(e.code() == CURLE_FTP_COULDNT_RETR_FILE)
action = THROWNOFILE;