User: kz      
Date: 05/01/21 09:16:07

Modified:
 /dba/dbaccess/source/ui/dlg/
  sqlmessage.cxx

Log:
 INTEGRATION: CWS dba22 (1.16.4); FILE MERGED
 2005/01/10 09:06:21 oj 1.16.4.3: compile error
 2005/01/07 08:21:58 oj 1.16.4.2: #i40035# remove semi bold font
 2004/12/30 14:19:09 fs 1.16.4.1: corrected OnExceptionSelected - details of 
SQLContexts were not shown anymore

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&r2=1.17
Delta lines:  +25 -19
---------------------
--- sqlmessage.cxx      17 Nov 2004 14:50:04 -0000      1.16
+++ sqlmessage.cxx      21 Jan 2005 17:16:05 -0000      1.17
@@ -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]

Reply via email to