User: hr Date: 06/06/19 19:08:54 Modified: /dba/connectivity/source/parse/ sqliterator.cxx
Log: INTEGRATION: CWS warnings01 (1.45.30); FILE MERGED 2006/01/25 21:00:54 sb 1.45.30.3: RESYNC: (1.45-1.46); FILE MERGED 2005/11/16 12:59:30 fs 1.45.30.2: #i57457# warning free code 2005/11/07 14:44:13 fs 1.45.30.1: #i57457# warning-free code 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&r2=1.47 Delta lines: +101 -86 ---------------------- --- sqliterator.cxx 21 Dec 2005 13:18:40 -0000 1.46 +++ sqliterator.cxx 20 Jun 2006 02:08:52 -0000 1.47 @@ -73,6 +73,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; @@ -109,25 +112,16 @@ const Reference< XDatabaseMetaData>& _xDatabaseMetaData, const OSQLParseNode* pRoot, const OSQLParser* _pParser) - : m_xDatabaseMetaData(_xDatabaseMetaData) - , m_aTables(_xDatabaseMetaData.is() && _xDatabaseMetaData->storesMixedCaseQuotedIdentifiers()) + :m_pParser(_pParser) + ,m_aTables(_xDatabaseMetaData.is() && _xDatabaseMetaData->storesMixedCaseQuotedIdentifiers()) + ,m_aCaseEqual(_xDatabaseMetaData.is() && _xDatabaseMetaData->storesMixedCaseQuotedIdentifiers()) ,m_pImpl(new OSQLParseTreeIteratorImpl(_xTables ,_xDatabaseMetaData)) - , m_aCaseEqual(_xDatabaseMetaData.is() && _xDatabaseMetaData->storesMixedCaseQuotedIdentifiers()) - ,m_pParser(_pParser) + ,m_xDatabaseMetaData(_xDatabaseMetaData) { // m_aSelectColumns = new OSQLColumns();// must be done because we need an empty column at zero // m_aParameters = new OSQLColumns(); setParseTree(pRoot); } -//----------------------------------------------------------------------------- -OSQLParseTreeIterator::OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) - :m_pImpl(NULL) - ,m_pParseTree(NULL) - ,m_xDatabaseMetaData(NULL) - ,m_pParser(NULL) -{ - OSL_ASSERT("OSQLParseTreeIterator: Copy-Konstruktor nicht implementiert!"); -} //----------------------------------------------------------------------------- OSQLParseTreeIterator::~OSQLParseTreeIterator() @@ -1059,20 +1053,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_xDatabaseMetaData,NULL,sal_False,sal_False); @@ -1697,6 +1703,11 @@ << (const char *) rParameterName << "\n"; #endif + OSL_UNUSED( rColumnName ); + OSL_UNUSED( rTableRange ); + OSL_UNUSED( ePredicateType ); + OSL_UNUSED( rValue ); + OSL_UNUSED( rParameterName ); } @@ -1716,6 +1727,10 @@ << (const char *) rParameterName << "\n"; #endif + 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]
