From ccbea814840ae8bc7cd5ad7e5d61a90638403236 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 1 Nov 2013 08:43:24 +0200 Subject: fix mozab driver after OUString change for Windows build after my change in commit e2451bd729d0f1d795a5b689deba65bc4e9d92c6 "Convert indexOf->startsWith and lastIndexOf->endsWith" Change-Id: I9397f1310742cdd773a7d2d3c5f0dbe728041d2d --- connectivity/source/drivers/mozab/MResultSet.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'connectivity/source') diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 15d99ceee51a..845ba0e81a4c 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -743,6 +743,10 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchStr #endif } +#define WILDCARD "%" +#define ALT_WILDCARD "*" +static const sal_Unicode MATCHCHAR = '_'; + void OResultSet::analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression) { @@ -894,10 +898,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_INVALID_LIKE_STRING, *this ); } - const sal_Unicode WILDCARD = '%'; - const sal_Unicode ALT_WILDCARD = '*'; - const sal_Unicode MATCHCHAR = '_'; - OUString sTableRange; if(SQL_ISRULE(pColumn,column_ref)) m_pSQLIterator->getColumnRange(pColumn,columnName,sTableRange); @@ -917,7 +917,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // Determine where '%' character is... - if ( matchString.equals( OUString( WILDCARD ) ) ) + if ( matchString.equals( WILDCARD ) ) { // String containing only a '%' and nothing else op = MQueryOp::Exists; -- cgit