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

New commits:
commit 4630845f221ffea77616ef1103a5111757d0aa55
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue May 27 18:33:13 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat May 31 20:42:28 2025 +0200

    replace a define with std::copy_n
    
    Change-Id: Ifb69965cfb499ed008da413a0804338eb32d6901
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186084
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 0702d812c387..2dd39ad1f1c7 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -149,11 +149,9 @@ void CopyUpdaterToTempDir(const OUString& rInstallDirURL, 
const OUString& rTempD
 
 #ifdef UNX
 typedef char CharT;
-#define tstrncpy std::strncpy
 char const * toStream(char const * s) { return s; }
 #elif defined(_WIN32)
 typedef wchar_t CharT;
-#define tstrncpy std::wcsncpy
 OUString toStream(wchar_t const * s) { return OUString(o3tl::toU(s)); }
 #else
 #error "Need an implementation"
@@ -164,12 +162,12 @@ void createStr(const OUString& rStr, CharT** pArgs, 
size_t i)
 #ifdef UNX
     OString aStr = OUStringToOString(rStr, RTL_TEXTENCODING_UTF8);
 #elif defined(_WIN32)
-    OUString aStr = rStr;
+    const OUString& aStr = rStr;
 #else
 #error "Need an implementation"
 #endif
     CharT* pStr = new CharT[aStr.getLength() + 1];
-    tstrncpy(pStr, (CharT*)aStr.getStr(), aStr.getLength());
+    std::copy_n(aStr.getStr(), aStr.getLength(), pStr);
     pStr[aStr.getLength()] = '
     pArgs[i] = pStr;
 }

Reply via email to