User: hr Date: 06/06/19 18:27:31 Modified: /dba/connectivity/source/drivers/file/ fcomp.cxx
Log: INTEGRATION: CWS warnings01 (1.23.28); FILE MERGED 2005/11/21 15:51:38 fs 1.23.28.2: #i57457# OSL_VERIFY_EQUALS 2005/11/07 14:43:35 fs 1.23.28.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: fcomp.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcomp.cxx?r1=1.23&r2=1.24 Delta lines: +15 -21 --------------------- --- fcomp.cxx 8 Sep 2005 05:58:36 -0000 1.23 +++ fcomp.cxx 20 Jun 2006 01:27:29 -0000 1.24 @@ -87,13 +87,13 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -DBG_NAME(OPredicateCompiler); +DBG_NAME(OPredicateCompiler) //------------------------------------------------------------------ OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs) // : m_rCursor(rCurs) : m_pAnalyzer(pAnalyzer) - , m_bORCondition(FALSE) , m_nParamCounter(0) + , m_bORCondition(FALSE) { DBG_CTOR(OPredicateCompiler,NULL); } @@ -288,7 +288,7 @@ return NULL; } - sal_Int32 ePredicateType; + sal_Int32 ePredicateType( SQLFilterOperator::EQUAL ); OSQLParseNode *pPrec = pPredicateNode->getChild(1); if (pPrec->getNodeType() == SQL_NODE_EQUAL) @@ -303,14 +303,12 @@ ePredicateType = SQLFilterOperator::GREATER_EQUAL; else if (pPrec->getNodeType() == SQL_NODE_GREAT) ePredicateType = SQLFilterOperator::GREATER; + else + OSL_ENSURE( false, "OPredicateCompiler::execute_COMPARE: unexpected node type!" ); - OOperand* pOb = execute(pPredicateNode->getChild(0)); - OOperand* pOperand = execute(pPredicateNode->getChild(2)); - - OBoolOperator* pOperator = new OOp_COMPARE(ePredicateType); - //pOb->PreProcess(pOperator, pOperand); - - m_aCodeList.push_back(pOperator); + execute(pPredicateNode->getChild(0)); + execute(pPredicateNode->getChild(2)); + m_aCodeList.push_back( new OOp_COMPARE(ePredicateType) ); // wenn es sich um eine Vergleichsoperation auf datum/Zeit handelt, dann // erfolgt jetzt bereits eine Umwandlung fuer die Konstante @@ -399,12 +397,14 @@ cEscape = pEscNode->getTokenValue().toChar(); } - OOperand* pOb = execute(pPredicateNode->getChild(0)); - OOperand* pOperand = execute(pAtom); + execute(pPredicateNode->getChild(0)); + execute(pAtom); + OBoolOperator* pOperator = (ePredicateType == SQLFilterOperator::LIKE) ? new OOp_LIKE(cEscape) : new OOp_NOTLIKE(cEscape); m_aCodeList.push_back(pOperator); + return NULL; } //------------------------------------------------------------------ @@ -511,14 +511,11 @@ else ePredicateType = SQLFilterOperator::SQLNULL; - OOperand* pOb = execute(pPredicateNode->getChild(0)); + execute(pPredicateNode->getChild(0)); OBoolOperator* pOperator = (ePredicateType == SQLFilterOperator::SQLNULL) ? new OOp_ISNULL() : new OOp_ISNOTNULL(); - - //pOb->PreProcess(pOperator); - - m_aCodeList.push_back(pOperator); + return NULL; } //------------------------------------------------------------------ @@ -709,15 +706,12 @@ sal_Bool bUpper = SQL_ISTOKEN(pPredicateNode->getChild(0),UPPER); - OOperand* pOb = execute(pPredicateNode->getChild(2)); + execute(pPredicateNode->getChild(2)); OOperator* pOperator = NULL; if ( bUpper ) pOperator = new OOp_Upper(); else pOperator = new OOp_Lower(); - - //pOb->PreProcess(pOperator); - m_aCodeList.push_back(pOperator); return NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
