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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit b7c857fab92ec26ed0a32e30243ff688f83a40be
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Oct 24 08:42:15 2023 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Oct 24 10:41:44 2023 +0200

    loplugin:ostr (macOS)
    
    Change-Id: Id40ce74db71f685cc1c459ea2a5b174f3f8862f1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158369
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/connectivity/source/drivers/firebird/Driver.cxx 
b/connectivity/source/drivers/firebird/Driver.cxx
index 39a72f3b5649..b674d56c22e7 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -49,7 +49,7 @@ constexpr OUString our_sFirebirdTmpVar = u"FIREBIRD_TMP"_ustr;
 constexpr OUString our_sFirebirdLockVar = u"FIREBIRD_LOCK"_ustr;
 constexpr OUString our_sFirebirdMsgVar = u"FIREBIRD_MSG"_ustr;
 #ifdef MACOSX
-constexpr OUStringLiteral our_sFirebirdLibVar = u"LIBREOFFICE_FIREBIRD_LIB";
+constexpr OUString our_sFirebirdLibVar = u"LIBREOFFICE_FIREBIRD_LIB"_ustr;
 #endif
 };
 
@@ -86,7 +86,7 @@ FirebirdDriver::FirebirdDriver(const css::uno::Reference< 
css::uno::XComponentCo
     ::rtl::Bootstrap::expandMacros(sLibURL);
     OUString sLibPath;
     ::osl::FileBase::getSystemPathFromFileURL(sLibURL, sLibPath);
-    osl_setEnvironment(OUString(our_sFirebirdLibVar).pData, sLibPath.pData);
+    osl_setEnvironment(our_sFirebirdLibVar.pData, sLibPath.pData);
 #endif /*MACOSX*/
 #endif /*!SYSTEM_FIREBIRD*/
 }
@@ -111,7 +111,7 @@ void FirebirdDriver::disposing()
 #ifndef SYSTEM_FIREBIRD
     osl_clearEnvironment(our_sFirebirdMsgVar.pData);
 #ifdef MACOSX
-    osl_clearEnvironment(OUString(our_sFirebirdLibVar).pData);
+    osl_clearEnvironment(our_sFirebirdLibVar.pData);
 #endif /*MACOSX*/
 #endif /*!SYSTEM_FIREBIRD*/
 
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx 
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index b54b844c9b20..b0b04fc08f21 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -923,7 +923,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 constexpr OUStringLiteral aTable = u"TABLE";
+    static constexpr OUString aTable = u"TABLE"_ustr;
     bool bTableFound = false;
     const OUString* p = types.getConstArray(),
                          * pEnd = p + types.getLength();
@@ -958,7 +958,7 @@ Reference< XResultSet > SAL_CALL 
MacabDatabaseMetaData::getTables(
         aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[2] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[3] = new ORowSetValueDecorator(xRecords->getName());
-        aRow[4] = new ORowSetValueDecorator(OUString(aTable));
+        aRow[4] = new ORowSetValueDecorator(aTable);
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
         tmp.push_back(aRow);