summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-08-07 13:42:51 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-08-07 13:42:51 +0000
commit9cb128fb7616fe84c86eb3709536f597d42924b8 (patch)
treef06e4386405c1318c112fa1268167934819d8b59 /ucb
parent8a68b25ff23c5a5c0c219a7ec904ed9b67055049 (diff)
INTEGRATION: CWS sb5 (1.19.24); FILE MERGED
2003/08/07 13:32:39 hr 1.19.24.2: RESYNC: (1.19-1.20); FILE MERGED 2003/06/20 07:49:00 sb 1.19.24.1: #91676# cancelCommandExecution expects PropertyValues, not strings, as arguments.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx20
1 files changed, 16 insertions, 4 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 14074b279833..d2a2a2c4cbff 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.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: vg $ $Date: 2003-07-25 11:38:13 $
+ * last change: $Author: hr $ $Date: 2003-08-07 14:42:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -415,7 +415,13 @@ Any SAL_CALL FTPContent::execute(
Reference<XCommandEnvironment>(0));
} else if(action == THROWACCESSDENIED) {
Sequence<Any> seq(1);
- seq[0] <<= m_aFTPURL.ident(false,false);
+ PropertyValue value;
+ value.Name =
+ rtl::OUString::createFromAscii("Uri");
+ value.Handle = -1;
+ value.Value <<= m_aFTPURL.ident(false,false);
+ value.State = PropertyState_DIRECT_VALUE;
+ seq[0] <<= value;
ucbhelper::cancelCommandExecution(
IOErrorCode_ACCESS_DENIED,
seq,
@@ -549,7 +555,13 @@ Any SAL_CALL FTPContent::execute(
}
if(n) {
Sequence<Any> seq(1);
- seq[0] <<= m_aFTPURL.ident(false,false);
+ PropertyValue value;
+ value.Name =
+ rtl::OUString::createFromAscii("Uri");
+ value.Handle = -1;
+ value.Value <<= m_aFTPURL.ident(false,false);
+ value.State = PropertyState_DIRECT_VALUE;
+ seq[0] <<= value;
ucbhelper::cancelCommandExecution(
IOErrorCode_UNKNOWN,
seq,