User: obo Date: 2006/10/12 06:32:16 Modified: dba/dbaccess/source/core/api/RowSetCache.cxx
Log: INTEGRATION: CWS sb59 (1.88.2); FILE MERGED 2006/08/29 11:44:23 sb 1.88.2.1: #i67487# Made code warning-free (wntmsci10). File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.90&r2=1.91 Delta lines: +5 -3 ------------------- --- RowSetCache.cxx 17 Sep 2006 06:32:31 -0000 1.90 +++ RowSetCache.cxx 12 Oct 2006 13:32:14 -0000 1.91 @@ -1427,8 +1427,9 @@ pNode->count() == 3) { // nur AND Verknüpfung zulassen - if ( SQL_ISTOKEN(pNode->getChild(1),AND) && (bOk = checkInnerJoin(pNode->getChild(0),_xConnection,_sUpdateTableName)) ) - bOk = checkInnerJoin(pNode->getChild(2),_xConnection,_sUpdateTableName); + if ( SQL_ISTOKEN(pNode->getChild(1),AND) ) + bOk = checkInnerJoin(pNode->getChild(0),_xConnection,_sUpdateTableName) + && checkInnerJoin(pNode->getChild(2),_xConnection,_sUpdateTableName); } else if (SQL_ISRULE(pNode,comparison_predicate)) { @@ -1442,7 +1443,8 @@ } ::rtl::OUString sColumnName,sTableRange; OSQLParseTreeIterator::getColumnRange(pNode->getChild(0),_xConnection->getMetaData(),sColumnName,sTableRange); - if ( !(bOk = sTableRange == _sUpdateTableName) ) + bOk = sTableRange == _sUpdateTableName; + if ( !bOk ) { OSQLParseTreeIterator::getColumnRange(pNode->getChild(2),_xConnection->getMetaData(),sColumnName,sTableRange); bOk = sTableRange == _sUpdateTableName; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
