User: rt Date: 2007-07-06 08:19:36+0000 Modified: dba/dbaccess/source/ui/dlg/sqlmessage.cxx
Log: INTEGRATION: CWS oj14 (1.20.4); FILE MERGED 2007/06/06 19:16:48 fs 1.20.4.7: slightly adjusted the conditions when we show two texts in the main dialog 2007/06/04 18:30:31 oj 1.20.4.6: RESYNC: (1.24-1.26); FILE MERGED 2006/11/07 09:25:07 oj 1.20.4.5: RESYNC: (1.21-1.24); FILE MERGED 2006/07/04 08:01:03 oj 1.20.4.4: RESYNC: (1.20-1.21); FILE MERGED 2006/04/25 13:03:02 oj 1.20.4.3: new include 2006/03/20 07:48:34 oj 1.20.4.2: use of module client helper 2006/01/03 07:49:11 oj 1.20.4.1: changed module client 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.26&r2=1.27 Delta lines: +13 -4 -------------------- --- sqlmessage.cxx 2007-05-10 10:26:15+0000 1.26 +++ sqlmessage.cxx 2007-07-06 08:19:33+0000 1.27 @@ -39,9 +39,6 @@ #ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" #endif @@ -81,6 +78,9 @@ #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif +#ifndef _DBAUI_MODULE_DBU_HXX_ +#include "moduledbu.hxx" +#endif #define BUTTONID_MORE BUTTONID_RETRY + 1 @@ -512,8 +512,17 @@ sPrimary = rFirstInfo.sMessage; if ( pSecondInfo ) { + // we show two elements in the main dialog if and only if one of + // - the first element in the chain is an SQLContext, and the second + // element denotes its sub entry + // - the first and the second element are both independent (i.e. the second + // is no sub entry), and none of them is a context. bool bFirstElementIsContext = ( rFirstInfo.eType == SQLExceptionInfo::SQL_CONTEXT ); - if ( !bFirstElementIsContext || ( pSecondInfo->bSubEntry ) ) + bool bSecondElementIsContext = ( pSecondInfo->eType == SQLExceptionInfo::SQL_CONTEXT ); + + if ( bFirstElementIsContext && pSecondInfo->bSubEntry ) + sSecondary = pSecondInfo->sMessage; + if ( !bFirstElementIsContext && !bSecondElementIsContext ) sSecondary = pSecondInfo->sMessage; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
