diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-16 17:14:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-17 16:12:02 +0000 |
| commit | 83d2c5180d255532b7cdf5d2922fee1cf056eef3 (patch) | |
| tree | 7a58db4a6723008afe96e17185a69aa17a864e1f /connectivity | |
| parent | 87707670c993794ab12b0fad0f048f11429269c2 (diff) | |
Adapt to no-longer explicit OUStringLiteral ctor
...from previous commit
Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f
Reviewed-on: https://gerrit.libreoffice.org/32098
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 3 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 14 | ||||
| -rw-r--r-- | connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index c77cf8e0fcef..11fa505f6ee5 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -998,8 +998,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw // there exists no possibility to get table types so we have to check static const OUStringLiteral sTableTypes[] = { - OUStringLiteral("TABLE"), - // Currently we only support a 'TABLE' nothing more complex + "TABLE" // Currently we only support a 'TABLE' nothing more complex }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index e76c2370474d..741e4db463a2 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -432,13 +432,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( // here we know that the count of column doesn't match ::std::map<sal_Int32,sal_Int32> aColumnMatching; static const OUStringLiteral sPrivs[] = { - OUStringLiteral("TABLE_CAT"), - OUStringLiteral("TABLE_SCHEM"), - OUStringLiteral("TABLE_NAME"), - OUStringLiteral("GRANTOR"), - OUStringLiteral("GRANTEE"), - OUStringLiteral("PRIVILEGE"), - OUStringLiteral("IS_GRANTABLE") + "TABLE_CAT", + "TABLE_SCHEM", + "TABLE_NAME", + "GRANTOR", + "GRANTEE", + "PRIVILEGE", + "IS_GRANTABLE" }; OUString sColumnName; diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 44a4c0cf934b..debc9272a8b0 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -839,8 +839,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE // there exists no possibility to get table types so we have to check static const OUStringLiteral sTableTypes[] = { - OUStringLiteral("TABLE"), - OUStringLiteral("VIEW") + "TABLE", + "VIEW" // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // OUString("SYSTEM TABLE"), |