diff options
Diffstat (limited to 'connectivity/source/drivers/evoab2/NStatement.cxx')
| -rw-r--r-- | connectivity/source/drivers/evoab2/NStatement.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 43bbaf2fcf..30cec213e0 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -208,8 +208,8 @@ OCommonStatement::createTest( const ::rtl::OUString &aColumnName, ::rtl::OString sMatch = rtl::OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 ); ::rtl::OString sColumnName = rtl::OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 ); - return e_book_query_field_test( e_contact_field_id( sColumnName ), - eTest, sMatch ); + return e_book_query_field_test( e_contact_field_id( sColumnName.getStr() ), + eTest, sMatch.getStr() ); } // ------------------------------------------------------------------------- @@ -413,7 +413,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) { // String containing only a '%' and nothing else matches everything pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, - rtl::OUString::createFromAscii( "" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); } else if( aMatchString.indexOf( WILDCARD ) == -1 ) { // Simple string , eg. "to match" "contains in evo" @@ -428,7 +428,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) m_pConnection->throwGenericSQLException(STR_QUERY_NOT_LIKE_TOO_COMPLEX,*this); } else if( (aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) ) ) - { // One occurance of '%' matches... + { // One occurrence of '%' matches... if ( aMatchString.indexOf ( WILDCARD ) == 0 ) pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 1 ) ); else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 ) @@ -477,10 +477,10 @@ rtl::OUString OCommonStatement::getTableName() OSQLParseNode::getTableComponents( pNodeForTableName, aCatalog, aSchema, aTableName,NULL); } else - OSL_ENSURE( false, "odd table layout" ); + OSL_FAIL( "odd table layout" ); } else - OSL_ENSURE( false, "unusual table layout" ); + OSL_FAIL( "unusual table layout" ); } return aTableName; } |