commit 16bf838ef479b8db371dbe97335e035e2e22f6ce
author Stephan Bergmann <sbergman@redhat.com> Thu Jan 09 10:40:02 2020 +0100
committer Stephan Bergmann <sbergman@redhat.com> Thu Jan 09 11:44:08 2020 +0100
tree d065ea65faf29393a7f44abce5f70a083b6b1b25
parent 6319519b384fa5d4fe7d8a3b38bcdd98be6ce5af

-Werror,-Wwritable-strings (clang-cl)

Change-Id: I67287498db35c60f224b095b00e6c058f53c10cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86471
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx

diff --git a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
index 250a81b..74a524e 100644
--- a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
+++ b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
@@ -128,7 +128,7 @@ std::wstring MsiGetPropertyW(MSIHANDLE hInst, LPCWSTR szName)
{
    std::wstring sResult;
    DWORD nSz = 0;
    UINT nRet = ::MsiGetPropertyW(hInst, szName, L"", &nSz);
    UINT nRet = ::MsiGetPropertyW(hInst, szName, const_cast<wchar_t*>(L""), &nSz);
    if (nRet == ERROR_MORE_DATA)
    {
        ++nSz;
@@ -284,7 +284,8 @@ extern "C" __declspec(dllexport) UINT __stdcall PrepRegUnregDLLs(MSIHANDLE hInst
                throw std::exception("MsiCreateRecord failed!");
            MsiRecordSetStringW(hRec, 0, sVal.c_str());
            DWORD nSz = 0;
            if (MsiFormatRecordW(hInstall, hRec, L"", &nSz) == ERROR_MORE_DATA)
            if (MsiFormatRecordW(hInstall, hRec, const_cast<wchar_t*>(L""), &nSz)
                == ERROR_MORE_DATA)
            {
                ++nSz;
                auto buf = std::make_unique<wchar_t[]>(nSz);