summaryrefslogtreecommitdiff
path: root/uui/source/iahndl.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sb@openoffice.org>2001-08-29 12:41:21 +0000
committerStephan Bergmann <sb@openoffice.org>2001-08-29 12:41:21 +0000
commit674a4762e70579b8cc62954cabb7b8f68bb24c2c (patch)
tree392bed2c6b93f37443a7080c8a028e87dbe958e7 /uui/source/iahndl.cxx
parent2725cf1697808605de54a027f64312fcca47291d (diff)
#91676# Handle the common case of InteractiveAugmentedIOException CANT_CREATE with Folder but not Uri or ResourceName.
Diffstat (limited to 'uui/source/iahndl.cxx')
-rw-r--r--uui/source/iahndl.cxx39
1 files changed, 22 insertions, 17 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index fb3f478782..0ebccede03 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: iahndl.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: sb $ $Date: 2001-08-27 08:42:23 $
+ * last change: $Author: sb $ $Date: 2001-08-29 13:41:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -687,21 +687,26 @@ UUIInteractionHandler::handle(
switch (aIoException.Code)
{
case star::ucb::IOErrorCode_CANT_CREATE:
- if ((bArgUri
- || getResourceNameRequestArgument(aRequestArguments,
- &aArgUri))
- && (bArgFolder
- || getStringRequestArgument(
- aRequestArguments,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Folder")),
- &aArgFolder)))
- {
- nErrorCode = aErrorCode[aIoException.Code][1];
- aArguments.reserve(2);
- aArguments.push_back(aArgUri);
- aArguments.push_back(aArgFolder);
- }
+ if (bArgFolder
+ || getStringRequestArgument(
+ aRequestArguments,
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Folder")),
+ &aArgFolder))
+ if (bArgUri
+ || getResourceNameRequestArgument(aRequestArguments,
+ &aArgUri))
+ {
+ nErrorCode = ERRCODE_UUI_IO_CANTCREATE;
+ aArguments.reserve(2);
+ aArguments.push_back(aArgUri);
+ aArguments.push_back(aArgFolder);
+ }
+ else
+ {
+ nErrorCode = ERRCODE_UUI_IO_CANTCREATE_NONAME;
+ aArguments.push_back(aArgFolder);
+ }
else
nErrorCode = aErrorCode[aIoException.Code][0];
break;