Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:30:34+0000 Log: RESYNC: (1.24-1.26); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: sqlmessage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/sqlmessage.cxx?r1=1.20.4.5&r2=1.20.4.6 Delta lines: +11 -9 -------------------- --- sqlmessage.cxx 2006-11-07 09:25:07+0000 1.20.4.5 +++ sqlmessage.cxx 2007-06-04 18:30:31+0000 1.20.4.6 @@ -348,18 +348,18 @@ //------------------------------------------------------------------------------ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ) :ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN)) - ,m_aFrame (this, ResId(FL_DETAILS)) - ,m_aListLabel (this, ResId(FT_ERRORLIST)) - ,m_aExceptionList (this, ResId(CTL_ERRORLIST)) - ,m_aDescLabel (this, ResId(FT_DESCRIPTION)) - ,m_aExceptionText (this, ResId(ME_DESCRIPTION)) - ,m_aOK (this, ResId(PB_OK)) + ,m_aFrame (this, ModuleRes(FL_DETAILS)) + ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) + ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) + ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) + ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) + ,m_aOK (this, ModuleRes(PB_OK)) ,m_aExceptions( _rExceptions ) { DBG_CTOR(OExceptionChainDialog,NULL); - m_sStatusLabel = String( ResId( STR_EXCEPTION_STATUS ) ); - m_sErrorCodeLabel = String( ResId( STR_EXCEPTION_ERRORCODE ) ); + m_sStatusLabel = String( ModuleRes( STR_EXCEPTION_STATUS ) ); + m_sErrorCodeLabel = String( ModuleRes( STR_EXCEPTION_ERRORCODE ) ); FreeResource(); @@ -699,7 +699,7 @@ } //------------------------------------------------------------------------------ -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 @@ SQLContext aError; aError.Message = _rTitle; aError.Details = _rMessage; + if ( _pAdditionalErrorInfo ) + aError.NextException = _pAdditionalErrorInfo->get(); m_pImpl.reset( new SQLMessageBox_Impl( SQLExceptionInfo( aError ) ) ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
