User: rt Date: 2008-06-16 12:30:37+0000 Modified: dba/dbaccess/source/core/api/RowSetCache.cxx
Log: INTEGRATION: CWS rptchart02 (1.97.6); FILE MERGED 2008/06/11 12:39:52 oj 1.97.6.3: RESYNC: (1.97-1.98); FILE MERGED 2008/05/23 08:36:37 oj 1.97.6.2: #i84290# change sql rule table_ref 2008/05/20 08:18:06 oj 1.97.6.1: #i84290# range_variable changed 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.98&r2=1.99 Delta lines: +2 -4 ------------------- --- RowSetCache.cxx 2008-06-06 13:59:08+0000 1.98 +++ RowSetCache.cxx 2008-06-16 12:30:34+0000 1.99 @@ -1485,16 +1485,14 @@ if(bCheck) { // here we know that we have to check on which side our table resides - OSQLParseNode* pTableRef = pJoin->getByRule(::connectivity::OSQLParseNode::qualified_join); + const OSQLParseNode* pTableRef = pJoin->getByRule(::connectivity::OSQLParseNode::qualified_join); if(bLeftSide) pTableRef = pJoin->getChild(0); else pTableRef = pJoin->getChild(3); OSL_ENSURE(SQL_ISRULE(pTableRef,table_ref),"Must be a tableref here!"); - ::rtl::OUString sTableRange; - if(pTableRef->count() == 4) - sTableRange = pTableRef->getChild(2)->getTokenValue(); // Tabellenrange an Pos 2 + ::rtl::OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); if(!sTableRange.getLength()) pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, sal_False, sal_False ); bOk = sTableRange == _sUpdateTableName; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
