summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx6
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx4
3 files changed, 11 insertions, 3 deletions
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 65cb6a4fe8a5..97cdd9775c7f 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -26,6 +26,8 @@
#include <cstddef>
#include <string.h>
+#include <string_view>
+
#include "EApi.h"
using namespace connectivity::evoab;
@@ -978,7 +980,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( )
/* Don't need to change as evoab driver supports only table */
// there exists no possibility to get table types so we have to check
- static const OUStringLiteral sTableTypes[] =
+ static const std::u16string_view sTableTypes[] =
{
u"TABLE" // Currently we only support a 'TABLE' nothing more complex
};
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 24275f3cd7ed..b14c1372c9a3 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <sal/macros.h>
#include <java/sql/DatabaseMetaData.hxx>
#include <java/sql/Connection.hxx>
@@ -430,7 +434,7 @@ 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[] = {
+ static const std::u16string_view sPrivs[] = {
u"TABLE_CAT",
u"TABLE_SCHEM",
u"TABLE_NAME",
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 012fa929fce1..959494095b9f 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -13,6 +13,8 @@
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <sal/log.hxx>
+
+#include <string_view>
#include <vector>
#include "MDatabaseMetaDataHelper.hxx"
@@ -795,7 +797,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( )
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( )
{
// there exists no possibility to get table types so we have to check
- static const OUStringLiteral sTableTypes[] =
+ static const std::u16string_view sTableTypes[] =
{
u"TABLE",
u"VIEW"