core.git: desktop/source

[Mike Kaganski (via logerrit)]

 desktop/source/app/updater.cxx |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 46425b14c2904e7e1f1b6c1e14a962e8c666d315
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue May 27 13:46:17 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat May 31 20:29:48 2025 +0200

    These `fromUtf8` calls may be avoided
    
    Change-Id: Ifff398ede8d9171d173c3d76107e21f3b0792689
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186081
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 4147b1a2f7e7..8746aa1ded8d 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -76,11 +76,11 @@ public:
 };
 
 #ifdef UNX
-const char* const pUpdaterName = "updater";
-const char* const pSofficeExeName = "soffice";
+constexpr OUString aUpdaterName = u"updater"_ustr;
+constexpr std::u16string_view aSofficeExeName = u"soffice";
 #elif defined(_WIN32)
-const char* pUpdaterName = "updater.exe";
-const char* pSofficeExeName = "soffice.exe";
+constexpr OUString aUpdaterName = u"updater.exe"_ustr;
+constexpr std::u16string_view aSofficeExeName = u"soffice.exe";
 #else
 #error "Need implementation"
 #endif
@@ -143,7 +143,6 @@ OUString getPathFromURL(const OUString& rURL)
 
 void CopyUpdaterToTempDir(const OUString& rInstallDirURL, const OUString& 
rTempDirURL)
 {
-    OUString aUpdaterName = OUString::fromUtf8(pUpdaterName);
     CopyFileToDir(rTempDirURL, aUpdaterName, rInstallDirURL);
     CopyFileToDir(rTempDirURL, u"updater.ini"_ustr, rInstallDirURL);
 }
@@ -223,7 +222,7 @@ CharT** createCommandLine(OUString const & argv0)
     {
         // the executable to start after the successful update
         OUString aExeDir = Updater::getExecutableDirURL();
-        OUString aSofficePathURL = aExeDir + 
OUString::fromUtf8(pSofficeExeName);
+        OUString aSofficePathURL = aExeDir + aSofficeExeName;
         OUString aSofficePath = getPathFromURL(aSofficePathURL);
         createStr(aSofficePath, pArgs, 6);
     }
@@ -301,7 +300,7 @@ bool update()
     OUString aTempDirURL = aTempDir.GetURL();
     CopyUpdaterToTempDir(Updater::getExecutableDirURL(), aTempDirURL);
 
-    OUString aUpdaterPath = getPathFromURL(aTempDirURL + "/" + 
OUString::fromUtf8(pUpdaterName));
+    OUString aUpdaterPath = getPathFromURL(aTempDirURL + "/" + aUpdaterName);
 
     Updater::log("Calling the updater with parameters: ");
     CharT** pArgs = createCommandLine(aUpdaterPath);