Tag: cws_src680_qiq User: fs Date: 2006/06/27 08:10:27 Modified: dba/connectivity/source/parse/sqliterator.cxx
Log: RESYNC: (1.46-1.47); FILE MERGED File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqliterator.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqliterator.cxx?r1=1.46.78.8&r2=1.46.78.9 Delta lines: +34 -10 --------------------- --- sqliterator.cxx 26 Jun 2006 21:11:50 -0000 1.46.78.8 +++ sqliterator.cxx 27 Jun 2006 15:10:24 -0000 1.46.78.9 @@ -82,6 +82,9 @@ #ifndef _COM_SUN_STAR_SDB_SQLFILTEROPERATOR_HPP_ #include <com/sun/star/sdb/SQLFilterOperator.hpp> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif using namespace ::comphelper; using namespace ::connectivity; @@ -1213,20 +1216,32 @@ // Sonst einzelne Suchkriterien wie =, !=, ..., LIKE, IS NULL usw. behandeln: else if (SQL_ISRULE(pSearchCondition,comparison_predicate) ) { - sal_Int32 ePredicateType; + sal_Int32 ePredicateType( SQLFilterOperator::EQUAL ); OSQLParseNode *pPrec = pSearchCondition->getChild(1); - if (pPrec->getNodeType() == SQL_NODE_EQUAL) + switch ( pPrec->getNodeType() ) + { + case SQL_NODE_EQUAL: ePredicateType = SQLFilterOperator::EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL) + break; + case SQL_NODE_NOTEQUAL: ePredicateType = SQLFilterOperator::NOT_EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_LESS) + break; + case SQL_NODE_LESS: ePredicateType = SQLFilterOperator::LESS; - else if (pPrec->getNodeType() == SQL_NODE_LESSEQ) + break; + case SQL_NODE_LESSEQ: ePredicateType = SQLFilterOperator::LESS_EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_GREATEQ) + break; + case SQL_NODE_GREATEQ: ePredicateType = SQLFilterOperator::GREATER_EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_GREAT) + break; + case SQL_NODE_GREAT: ePredicateType = SQLFilterOperator::GREATER; + break; + default: + OSL_ENSURE( false, "OSQLParseTreeIterator::traverseANDCriteria: unexpected comparison predicate type!" ); + break; + } ::rtl::OUString aValue; pSearchCondition->getChild(2)->parseNodeToStr( aValue, m_pImpl->m_xDatabaseMetaData, NULL, sal_False, sal_False ); @@ -1764,6 +1779,15 @@ << (bAscending ? "sal_True" : "sal_False") << "\n"; #endif + OSL_UNUSED( rColumnName ); + OSL_UNUSED( rTableRange ); + OSL_UNUSED( ePredicateType ); + OSL_UNUSED( rValue ); + OSL_UNUSED( rParameterName ); + OSL_UNUSED( rColumnName ); + OSL_UNUSED( rValue ); + OSL_UNUSED( bsetNull ); + OSL_UNUSED( rParameterName ); } //----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
