summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-12-14 06:00:18 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-12-16 08:45:16 +0000
commitc8a237e87e909bb9fc8105fcad01317901f08c45 (patch)
treefbfe4487bbdedaeba17a1036df48e842dc160a8d
parentbedc707bffdfe906a15036a40da1b9179d91b4fc (diff)
odbc DBMetaData: NULL pattern equivalent to "%", not "%foo"
Change-Id: Ief475a1bf6e65b4786e8ee9c025b204f143a30e0 Reviewed-on: https://gerrit.libreoffice.org/7080 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index fbb1b597a0b0..7b524cc9a02a 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -849,7 +849,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString&
OString aPKQ,aPKO,aPKN,aCOL;
const OUString *pSchemaPat = NULL;
- if(schemaPattern.toChar() != '%')
+ if(schemaPattern != "%")
pSchemaPat = &schemaPattern;
else
pSchemaPat = NULL;
@@ -946,7 +946,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons
{
const OUString *pSchemaPat = NULL;
- if(schema.toChar() != '%')
+ if(schema != "%")
pSchemaPat = &schema;
else
pSchemaPat = NULL;
@@ -981,7 +981,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog,
{
const OUString *pSchemaPat = NULL;
- if(schemaPattern.toChar() != '%')
+ if(schemaPattern != "%")
pSchemaPat = &schemaPattern;
else
pSchemaPat = NULL;
@@ -1049,7 +1049,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog,
{
const OUString *pSchemaPat = NULL;
- if(schemaPattern.toChar() != '%')
+ if(schemaPattern != "%")
pSchemaPat = &schemaPattern;
else
pSchemaPat = NULL;
@@ -1083,7 +1083,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri
{
const OUString *pSchemaPat = NULL;
- if(schemaPattern.toChar() != '%')
+ if(schemaPattern != "%")
pSchemaPat = &schemaPattern;
else
pSchemaPat = NULL;
@@ -1127,7 +1127,7 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any&
const OUString *pSchemaPat = NULL;
- if(schema.toChar() != '%')
+ if(schema != "%")
pSchemaPat = &schema;
else
pSchemaPat = NULL;
@@ -1214,7 +1214,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr
{
const OUString *pSchemaPat = NULL;
- if(schema.toChar() != '%')
+ if(schema != "%")
pSchemaPat = &schema;
else
pSchemaPat = NULL;
@@ -1243,7 +1243,7 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O
{
const OUString *pSchemaPat = NULL;
- if(schemaPattern.toChar() != '%')
+ if(schemaPattern != "%")
pSchemaPat = &schemaPattern;
else
pSchemaPat = NULL;
@@ -1273,7 +1273,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUStri
{
const OUString *pSchemaPat = NULL;
- if(schema.toChar() != '%')
+ if(schema != "%")
pSchemaPat = &schema;
else
pSchemaPat = NULL;