[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/firebird/Driver.cxx              |    2 +-
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx  |    4 ++--
 connectivity/source/drivers/macab/MacabResultSetMetaData.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fcdd83cc6596dcf97c07b181fb65a97067acac71
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Dec 22 13:58:54 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Dec 26 22:06:14 2020 +0100

    loplugin:stringliteralvar (macOS)
    
    Change-Id: I54bc8d175bbe883b6d390a3120ef38c33b7d36d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108357
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 04c65ba06860..6adeb7207ecf 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -49,7 +49,7 @@ const OUStringLiteral our_sFirebirdTmpVar = u"FIREBIRD_TMP";
 const OUStringLiteral our_sFirebirdLockVar = u"FIREBIRD_LOCK";
 const OUStringLiteral our_sFirebirdMsgVar = u"FIREBIRD_MSG";
 #ifdef MACOSX
-const char our_sFirebirdLibVar[] = "LIBREOFFICE_FIREBIRD_LIB";
+const OUStringLiteral our_sFirebirdLibVar = u"LIBREOFFICE_FIREBIRD_LIB";
 #endif
 };
 
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 809537c2316b..bc88b2360bd8 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -739,7 +739,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  )
 
     static ODatabaseMetaDataResultSet::ORows aRows = [&]
     {
-        static const char aTable[] = "TABLE";
+        static const OUStringLiteral aTable = u"TABLE";
         ODatabaseMetaDataResultSet::ORows tmp;
         ODatabaseMetaDataResultSet::ORow aRow(2);
         aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue();
@@ -925,7 +925,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     // check whether we have tables in the requested types
     // for the moment, we answer only the "TABLE" table type
     // when no types are given at all, we return all the tables
-    static const char aTable[] = "TABLE";
+    static const OUStringLiteral aTable = u"TABLE";
     bool bTableFound = false;
     const OUString* p = types.getConstArray(),
                          * pEnd = p + types.getLength();
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 38e7dca051d4..eed17c553a72 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -43,7 +43,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData()
 
 void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns)
 {
-    static const char aName[] = "Name";
+    static const OUStringLiteral aName = u"Name";
     MacabRecords *aRecords;
     MacabHeader *aHeader;