Tag: cws_src680_dba23 User: oj Date: 05/02/03 00:15:37 Modified: /dba/dbaccess/source/ui/dlg/ sqlmessage.cxx
Log: RESYNC: (1.16-1.17); 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.16.22.1&r2=1.16.22.2 Delta lines: +28 -22 --------------------- --- sqlmessage.cxx 19 Jan 2005 09:08:23 -0000 1.16.22.1 +++ sqlmessage.cxx 3 Feb 2005 08:15:34 -0000 1.16.22.2 @@ -195,7 +195,7 @@ bHave22018 = pCurrentException->SQLState.equalsAscii( "22018" ); SvLBoxEntry* pListEntry = NULL; - void* pUserData = new SQLExceptionInfo(aCurrent); + SQLExceptionInfo* pUserData = new SQLExceptionInfo(aCurrent); switch (aCurrent.getType()) { @@ -274,6 +274,14 @@ const SQLException* pException = (const SQLException*)aInfo; String sText; + if ( ( aInfo.getType() == SQLExceptionInfo::SQL_CONTEXT ) + && ( m_aExceptionList.GetParent( pSelected ) != NULL ) + ) + { + sText = static_cast< const SQLContext* >( pException )->Details; + } + else + { if ( pException->SQLState.getLength() ) { sText += m_sStatusLabel; @@ -291,6 +299,7 @@ if ( sText.Len() ) sText.AppendAscii( "\n" ); sText += String( pException->Message ); + } m_aExceptionText.SetText(sText); } @@ -321,9 +330,6 @@ m_aTitle.SetPosSizePixel(LogicToPixel(Point(45, 6),MAP_APPFONT), LogicToPixel(Size(169, 20),MAP_APPFONT)); - Font aFont = m_aTitle.GetFont(); - aFont.SetWeight(WEIGHT_SEMIBOLD); - m_aTitle.SetFont(aFont); m_aTitle.Show(); m_aMessage.SetStyle( m_aMessage.GetStyle() | WB_NOLABEL ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
