diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 16:06:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 16:06:15 +0000 |
| commit | 3bcb1ca3a75a59aad6b28f0b9b61a4c05c4669ee (patch) | |
| tree | cc920447d43cc87adde013e8728bc217dd7de72f /uui | |
| parent | 48d1f024d4d8f4ced45c02d50b1a39b4b8af96aa (diff) | |
INTEGRATION: CWS fwk01 (1.35.2.4.14); FILE MERGED
2003/03/11 13:41:29 as 1.35.2.4.14.1: #108100# handle ErrCode right as ULONG
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 13c225e204d1..b9b124c4d5e2 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: hr $ $Date: 2003-03-27 17:44:56 $ + * last change: $Author: hr $ $Date: 2003-04-04 17:06:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2141,7 +2141,10 @@ UUIInteractionHandler::handleGenericErrorRequest( xApprove = star::uno::Reference< star::task::XInteractionApprove >( rContinuations[nStep], star::uno::UNO_QUERY ); } - sal_Bool bWarning = (rRequest.ErrCode & ERRCODE_WARNING_MASK == ERRCODE_WARNING_MASK); + // Note: It's important to convert the transported long to the required unsigned long value. + // Otherwhise using as flag field can fail ... + ErrCode nError = (ErrCode)rRequest.ErrCode; + sal_Bool bWarning = !ERRCODE_TOERROR(nError); ErrorHandler::HandleError(rRequest.ErrCode); if (xApprove.is() && bWarning) |