User: kz Date: 2006/12/13 08:15:53 Modified: dba/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
Log: INTEGRATION: CWS dba22ui (1.16.20); FILE MERGED 2006/12/06 08:58:11 oj 1.16.20.1: #i72111# fix getTables, use tableNamePattern File Changes: Directory: /dba/connectivity/source/drivers/calc/ ================================================= File [changed]: CDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/calc/CDatabaseMetaData.cxx?r1=1.16&r2=1.17 Delta lines: +7 -7 ------------------- --- CDatabaseMetaData.cxx 17 Sep 2006 02:18:49 -0000 1.16 +++ CDatabaseMetaData.cxx 13 Dec 2006 16:15:51 -0000 1.17 @@ -550,7 +550,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& /*tableNamePattern*/, const Sequence< ::rtl::OUString >& types ) + const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -570,11 +570,11 @@ { bTableFound = sal_False; - const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; - for(;pBegin != pEnd;++pBegin) + const ::rtl::OUString* pIter = types.getConstArray(); + const ::rtl::OUString* pEnd = pIter + nLength; + for(;pIter != pEnd;++pIter) { - if(*pBegin == aTable) + if(*pIter == aTable) { bTableFound = sal_True; break; @@ -599,7 +599,7 @@ for (sal_Int32 nSheet=0; nSheet<nSheetCount; nSheet++) { ::rtl::OUString aName = aSheetNames[nSheet]; - if ( !lcl_IsEmptyOrHidden( xSheets, aName ) ) + if ( !lcl_IsEmptyOrHidden( xSheets, aName ) && match(tableNamePattern,aName,'\0') ) { ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); @@ -624,7 +624,7 @@ for (sal_Int32 nRange=0; nRange<nDBCount; nRange++) { ::rtl::OUString aName = aDBNames[nRange]; - if ( !lcl_IsUnnamed( xRanges, aName ) ) + if ( !lcl_IsUnnamed( xRanges, aName ) && match(tableNamePattern,aName,'\0') ) { ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
