summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/sqlmessage.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-05-10 09:26:15 +0000
committerKurt Zenker <kz@openoffice.org>2007-05-10 09:26:15 +0000
commit504a55c06437bf58c7d697be1556260da89496f6 (patch)
tree59fef7c252a92a8fa89ee405332c2dabb1eb5361 /dbaccess/source/ui/dlg/sqlmessage.cxx
parent2e6a6856ac32de40d701d6eed9e10f5b666f20a1 (diff)
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
Diffstat (limited to 'dbaccess/source/ui/dlg/sqlmessage.cxx')
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx8
1 files changed, 5 insertions, 3 deletions
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 ) ) );