diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-12-14 06:00:18 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-19 14:01:31 +0000 |
commit | 2b77788dab88ac0960537b76c42e4f30e68c5a6e (patch) | |
tree | abe1657ff44f15d6a28c8860d19d4eef6f101c41 /connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | |
parent | 69e264131334134bef9a7069df959ba1ce1406e7 (diff) |
odbc DBMetaData: NULL pattern equivalent to "%", not "%foo"
Change-Id: Ief475a1bf6e65b4786e8ee9c025b204f143a30e0
Reviewed-on: https://gerrit.libreoffice.org/7079
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx')
-rw-r--r-- | connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index 2e772fc17f00..7ba49355b222 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -854,7 +854,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; @@ -951,7 +951,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons { const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; @@ -986,7 +986,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1054,7 +1054,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1088,7 +1088,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1132,7 +1132,7 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; @@ -1219,7 +1219,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr { const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; @@ -1248,7 +1248,7 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1278,7 +1278,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUStri { const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; |