filter/source/msfilter/rtfutil.cxx | 17 ----------------- 1 file changed, 17 deletions(-)
New commits: commit 409b8d060c88b2ff9821e8772f9a3287d5095970 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 31 20:13:58 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Nov 15 17:25:50 2025 +0100 upr if requested should be used Change-Id: I12ef68c77560de5d2959178047b6585855800256 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193281 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194050 Tested-by: Jenkins diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx index 093be55f6ff6..bae28204b279 100644 --- a/filter/source/msfilter/rtfutil.cxx +++ b/filter/source/msfilter/rtfutil.cxx @@ -227,25 +227,8 @@ OString OutString(std::u16string_view rStr, rtl_TextEncoding eDestEnc, bool bUni return aBuf.makeStringAndClear(); } -/// Checks if lossless conversion of the string to eDestEnc is possible or not. -static bool TryOutString(std::u16string_view rStr, rtl_TextEncoding eDestEnc) -{ - int nUCMode = 1; - for (size_t n = 0; n < rStr.size(); ++n) - { - bool bRet; - OutChar(rStr[n], &nUCMode, eDestEnc, &bRet); - if (!bRet) - return false; - } - return true; -} - OString OutStringUpr(std::string_view pToken, std::u16string_view rStr, rtl_TextEncoding eDestEnc) { - if (TryOutString(rStr, eDestEnc)) - return OString::Concat("{") + pToken + " " + OutString(rStr, eDestEnc) + "}"; - return OString::Concat("{" OOO_STRING_SVTOOLS_RTF_UPR "{") + pToken + " " + OutString(rStr, eDestEnc, /*bUnicode =*/false) + "}{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_UD "{" + pToken + " "
