Tag: cws_src680_oj14 User: fs Date: 2007-06-06 19:16:51+0000 Log: slightly adjusted the conditions when we show two texts in the main dialog
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.6&r2=1.20.4.7 Delta lines: +13 -4 -------------------- --- sqlmessage.cxx 2007-06-04 18:30:31+0000 1.20.4.6 +++ sqlmessage.cxx 2007-06-06 19:16:48+0000 1.20.4.7 @@ -4,9 +4,9 @@ * * $RCSfile: sqlmessage.cxx,v $ * - * $Revision: 1.20.4.6 $ + * $Revision: 1.20.4.7 $ * - * last change: $Author: oj $ $Date: 2007/06/04 18:30:31 $ + * last change: $Author: fs $ $Date: 2007/06/06 19:16:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.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]
