From f106bedcf7d00195d59ca38fbad3a5e7452fc520 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 10 Jul 2006 13:46:34 +0000 Subject: INTEGRATION: CWS qiq (1.72.54); FILE MERGED 2006/06/27 10:55:34 fs 1.72.54.2: RESYNC: (1.72-1.73); FILE MERGED 2006/05/11 10:38:21 fs 1.72.54.1: during #i51143#: don't use prependContextInfo if we have only one error string --- forms/source/component/DatabaseForm.cxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'forms/source/component') diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 37f1d7750ea5..42e625242aa7 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DatabaseForm.cxx,v $ * - * $Revision: 1.73 $ + * $Revision: 1.74 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:46:56 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:46:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1148,21 +1148,19 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O //============================================================================== // internals //------------------------------------------------------------------------------ -void ODatabaseForm::onError(const SQLErrorEvent& _rEvent) +void ODatabaseForm::onError( const SQLErrorEvent& _rEvent ) { m_aErrorListeners.notifyEach( &XSQLErrorListener::errorOccured, _rEvent ); } //------------------------------------------------------------------------------ -void ODatabaseForm::onError(SQLException& _rException, const ::rtl::OUString& _rContextDescription) +void ODatabaseForm::onError( const SQLException& _rException, const ::rtl::OUString& _rContextDescription ) { - if (!m_aErrorListeners.getLength()) + if ( !m_aErrorListeners.getLength() ) return; - SQLContext aError = prependContextInfo(_rException, static_cast(this), _rContextDescription); - SQLErrorEvent aEvent(static_cast(this), makeAny(aError)); - - onError(aEvent); + SQLErrorEvent aEvent( *this, makeAny( prependErrorInfo( _rException, *this, _rContextDescription ) ) ); + onError( aEvent ); } //------------------------------------------------------------------------------ -- cgit