diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 16:25:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:38:36 +0000 |
| commit | fe3849c8ebb3f316b8eb9091a11416af2f206c0d (patch) | |
| tree | e3dc649cf1a329eda21509a3c558e33981a68e5f /connectivity | |
| parent | 81ac5cc9198f77652e2abc8f96562a9ba189f438 (diff) | |
resolve ambiguities
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/file/FDatabaseMetaData.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 391e7ec0a623..cd738291e1a5 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -291,7 +291,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( { aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,::rtl::OUString()); sal_Unicode nChar = aName.toChar(); - if ( match(tableNamePattern,aName.getStr(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) + if ( match(tableNamePattern,aName,'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { aRow.push_back(new ORowSetValueDecorator(aName)); bNewRow = sal_True; @@ -306,7 +306,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( if (!aURL.getExtension().getLength()) { sal_Unicode nChar = aURL.getBase().getStr()[0]; - if(match(tableNamePattern,aURL.getBase().getStr(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) + if(match(tableNamePattern,aURL.getBase(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(aURL.getBase()))); bNewRow = sal_True; @@ -426,7 +426,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); for(;pBegin != pEnd;++pBegin) { - if(match(tableNamePattern,pBegin->getStr(),'\0')) + if(match(tableNamePattern,*pBegin,'\0')) { static ODatabaseMetaDataResultSet::ORow aRow(8); |