From 504a55c06437bf58c7d697be1556260da89496f6 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 10 May 2007 09:26:15 +0000 Subject: INTEGRATION: CWS dba23a (1.24.60); FILE MERGED 2007/03/14 12:16:21 fs 1.24.60.1: #i75261# additional exception info a ctor without SQL exceptions --- dbaccess/source/ui/dlg/sqlmessage.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dbaccess/source/ui/dlg/sqlmessage.cxx') diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 6fa8caccb7e7..5aae59260634 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sqlmessage.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:01:23 $ + * last change: $Author: kz $ $Date: 2007-05-10 10:26:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -699,7 +699,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rExcep } //------------------------------------------------------------------------------ -OSQLMessageBox::OSQLMessageBox( Window* _pParent, const UniString& _rTitle, const UniString& _rMessage, WinBits _nStyle, MessageType _eImage ) +OSQLMessageBox::OSQLMessageBox( Window* _pParent, const UniString& _rTitle, const UniString& _rMessage, WinBits _nStyle, MessageType _eImage, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) @@ -708,6 +708,8 @@ OSQLMessageBox::OSQLMessageBox( Window* _pParent, const UniString& _rTitle, cons SQLContext aError; aError.Message = _rTitle; aError.Details = _rMessage; + if ( _pAdditionalErrorInfo ) + aError.NextException = _pAdditionalErrorInfo->get(); m_pImpl.reset( new SQLMessageBox_Impl( SQLExceptionInfo( aError ) ) ); -- cgit v1.2.3