core.git: Branch 'libreoffice-24-8-4' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/rtfattributeoutput.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit deaa23f8498d7b282235bbf175673494f8b52516
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 2 11:48:55 2024 +0000
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Dec 10 15:24:00 2024 +0100

    crashtesting: failure to import rtf output of forum-en-44797.odt
    
    field text ended in \ so next } was escaped
    
    Change-Id: I2129f410a1d1c3d507a223c3576f02b78f7aac63
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177682
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit cd766522eac08392044b1b0c155001899f52c57b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177688
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index c8751574b04f..8bb113cfb7a4 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2433,7 +2433,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const 
ww8::Frame& rFrame, const Poi
                             m_aRun->append('}');
                             m_aRun->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT 
" ");
                             xPropSet->getPropertyValue(u"Text"_ustr) >>= aTmp;
-                            m_aRun->append(OUStringToOString(aTmp, 
m_rExport.GetCurrentEncoding()));
+                            m_aRun->append(
+                                msfilter::rtfutil::OutString(aTmp, 
m_rExport.GetCurrentEncoding()));
                             m_aRun->append('}');
                             m_aRun->append(
                                 "{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_FORMFIELD
@@ -2445,8 +2446,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const 
ww8::Frame& rFrame, const Poi
                                 
m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFOWNHELP);
                                 m_aRun->append("{" 
OOO_STRING_SVTOOLS_RTF_IGNORE
                                                    
OOO_STRING_SVTOOLS_RTF_FFHELPTEXT " ");
-                                m_aRun->append(
-                                    OUStringToOString(aTmp, 
m_rExport.GetCurrentEncoding()));
+                                m_aRun->append(msfilter::rtfutil::OutString(
+                                    aTmp, m_rExport.GetCurrentEncoding()));
                                 m_aRun->append('}');
                             }
 
@@ -2457,8 +2458,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const 
ww8::Frame& rFrame, const Poi
                                 
m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFOWNSTAT);
                                 m_aRun->append("{" 
OOO_STRING_SVTOOLS_RTF_IGNORE
                                                    
OOO_STRING_SVTOOLS_RTF_FFSTATTEXT " ");
-                                m_aRun->append(
-                                    OUStringToOString(aTmp, 
m_rExport.GetCurrentEncoding()));
+                                m_aRun->append(msfilter::rtfutil::OutString(
+                                    aTmp, m_rExport.GetCurrentEncoding()));
                                 m_aRun->append('}');
                             }
                             m_aRun->append("}");