summaryrefslogtreecommitdiffstats
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-01 08:43:24 +0200
committerNoel Grandin <noel@peralex.com>2013-11-01 08:43:24 +0200
commitccbea814840ae8bc7cd5ad7e5d61a90638403236 (patch)
tree5cbf38c46715da4a356a9bd90fdaf074d8e2bd6c /connectivity
parentGPU Calc: re-enable regression test testSharedFormulaXLS (diff)
downloadcore-ccbea814840ae8bc7cd5ad7e5d61a90638403236.tar.gz
core-ccbea814840ae8bc7cd5ad7e5d61a90638403236.zip
fix mozab driver after OUString change
for Windows build after my change in commit e2451bd729d0f1d795a5b689deba65bc4e9d92c6 "Convert indexOf->startsWith and lastIndexOf->endsWith" Change-Id: I9397f1310742cdd773a7d2d3c5f0dbe728041d2d
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.cxx10
1 files changed, 5 insertions, 5 deletions
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;