diff options
| author | Stephan Bergmann <sb@openoffice.org> | 2001-08-16 12:41:57 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sb@openoffice.org> | 2001-08-16 12:41:57 +0000 |
| commit | 98fee2ca314a35b82c31fc67cedc192dd3c78389 (patch) | |
| tree | 04638b6ff8b988dea3f9133e4ba85ced0fd4dc99 /uui/source/iahndl.cxx | |
| parent | 611b6839ffde35b8ba03dc75c73e8ed4e8956489 (diff) | |
#88408# Added support for WrongJavaVersion and BadPartnership exceptions.
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 87d7b25dff00..b988f5fa2f7c 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: sb $ $Date: 2001-08-09 06:39:14 $ + * last change: $Author: sb $ $Date: 2001-08-16 13:41:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,9 +79,15 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include "com/sun/star/beans/PropertyValue.hpp" #endif +#ifndef _COM_SUN_STAR_JAVA_WRONGJAVAVERSIONEXCEPTION_HPP_ +#include "com/sun/star/java/WrongJavaVersionException.hpp" +#endif #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #endif +#ifndef _COM_SUN_STAR_SYNC2_BADPARTNERSHIPEXCEPTION_HPP_ +#include "com/sun/star/sync2/BadPartnershipException.hpp" +#endif #ifndef _COM_SUN_STAR_TASK_CLASSIFIEDINTERACTIONREQUEST_HPP_ #include "com/sun/star/task/ClassifiedInteractionRequest.hpp" #endif @@ -984,6 +990,8 @@ UUIInteractionHandler::handle( star::ucb::InteractiveCHAOSException aCHAOSException; star::ucb::InteractiveBadTransferURLException aTransferException; star::ucb::InteractiveWrongMediumException aWrongMediumException; + star::java::WrongJavaVersionException aWrongJavaVersionException; + star::sync2::BadPartnershipException aBadPartnershipException; try { if (aTheRequest >>= aIOException) @@ -1301,6 +1309,40 @@ UUIInteractionHandler::handle( nButton = aErrorBox.Execute(); eExecute = EXECUTE_NO; } + else if (aTheRequest >>= aWrongJavaVersionException) + nErrorID + = aWrongJavaVersionException.DetectedVersion.getLength() + == 0 ? + aWrongJavaVersionException.LowestSupportedVersion. + getLength() + == 0 ? + ERRCODE_UUI_WRONGJAVA : + static_cast< ULONG >( + *new StringErrorInfo( + ERRCODE_UUI_WRONGJAVA_MIN, + aWrongJavaVersionException. + LowestSupportedVersion)) : + aWrongJavaVersionException.LowestSupportedVersion. + getLength() + == 0 ? + static_cast< ULONG >( + *new StringErrorInfo( + ERRCODE_UUI_WRONGJAVA_VERSION, + aWrongJavaVersionException. + DetectedVersion)) : + static_cast< ULONG >( + *new TwoStringErrorInfo( + ERRCODE_UUI_WRONGJAVA_VERSION_MIN, + aWrongJavaVersionException. + DetectedVersion, + aWrongJavaVersionException. + LowestSupportedVersion)); + else if (aTheRequest >>= aBadPartnershipException) + nErrorID = aBadPartnershipException.Partnership.getLength() == 0 ? + ERRCODE_UUI_BADPARTNERSHIP : + *new StringErrorInfo( + ERRCODE_UUI_BADPARTNERSHIP_NAME, + aBadPartnershipException.Partnership); } catch (std::bad_alloc const &) { |