diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 14:24:05 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 14:24:05 +0000 |
| commit | 9e05b24c23966428febc376fca4b0de627a0bebe (patch) | |
| tree | ea359773e173d296058d117961f13b23c2727a0e | |
| parent | 15e24865985f6850e53c9c6eb6e26ab60f7c68f5 (diff) | |
INTEGRATION: CWS dba24c (1.38.110); FILE MERGED
2007/09/18 13:26:57 fs 1.38.110.1: #i81095# displayException: don't display RowSetVetoExceptions which are caused by a approval listener vetoing the changes
| -rw-r--r-- | svx/source/form/fmtools.cxx | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 2e7a5e00f72e..b54ac5687367 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fmtools.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: hr $ $Date: 2007-06-27 18:16:03 $ + * last change: $Author: ihi $ $Date: 2007-11-21 15:24:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -98,6 +98,9 @@ #ifndef _COM_SUN_STAR_SDB_XRESULTSETACCESS_HPP_ #include <com/sun/star/sdb/XResultSetAccess.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_ERRORCONDITION_HPP_ +#include <com/sun/star/sdb/ErrorCondition.hpp> +#endif #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include <com/sun/star/sdbc/DataType.hpp> #endif @@ -272,8 +275,35 @@ using namespace ::svxform; using namespace ::connectivity::simple; // ------------------------------------------------------------------------------ +namespace +{ + static bool lcl_shouldDisplayError( const Any& _rError ) + { + SQLException aError; + if ( !( _rError >>= aError ) ) + return true; + + if ( aError.Message.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "[OOoBase]" ) ) != 0 ) + // it is an exception *not* thrown by an OOo Base core component + return true; + + // the only exception we do not display ATM is a RowSetVetoException, which + // has been raised because an XRowSetApprovalListener vetoed a change + if ( aError.ErrorCode + ErrorCondition::ROW_SET_OPERATION_VETOED == 0 ) + return false; + + // everything else is to be displayed + return true; + } +} + +// ------------------------------------------------------------------------------ void displayException(const Any& _rExcept, Window* _pParent) { + // check whether we need to display it + if ( !lcl_shouldDisplayError( _rExcept ) ) + return; + try { // the parent window |