vcl/unx/gtk3/gtkframe.cxx | 4 ++-- xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 42cd2550cfb91f0aaeabf8ffe270bcbeee76e147 Author: Noel Grandin <[email protected]> AuthorDate: Mon Apr 10 12:14:17 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Apr 10 13:31:41 2023 +0200 fix calls to OStringToOUString after commit d7910847fba1694c83dc57a1f27b8eaabb2a7d85. Thanks to mike kaganski for spotting this. Change-Id: Ie7272b6f97e3b292439aedb3a163bf00ca26f852 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150181 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 1b1a1c0595b0..519d520a52f6 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -2713,7 +2713,7 @@ OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode ) KeyCodeToGdkKey(nKeyCode, &nGtkKeyCode, &nGtkModifiers ); gchar* pName = gtk_accelerator_get_label(nGtkKeyCode, nGtkModifiers); - OUString aRet = OStringToOUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8); + OUString aRet = OStringToOUString(pName, RTL_TEXTENCODING_UTF8); g_free(pName); return aRet; } @@ -4859,7 +4859,7 @@ public: OUString aStr; gchar *pText = reinterpret_cast<gchar*>(gtk_selection_data_get_text(m_pData)); if (pText) - aStr = OStringToOUString(pText, strlen(pText), RTL_TEXTENCODING_UTF8); + aStr = OStringToOUString(pText, RTL_TEXTENCODING_UTF8); g_free(pText); aRet <<= aStr.replaceAll("\r\n", "\n"); } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index 850cb8591900..3c6d02430b3b 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -91,7 +91,7 @@ namespace chelp { //running into a later problem with strings >= 255 const char* pTitle = m_ptr + 3 + m_ptr[0] + static_cast<sal_Int32>(m_ptr[ 1+ static_cast<sal_Int32>(m_ptr[0]) ]); - return OStringToOUString(pTitle, strlen(pTitle), RTL_TEXTENCODING_UTF8); + return OStringToOUString(pTitle, RTL_TEXTENCODING_UTF8); }
