diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-12-02 11:48:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-12-02 15:33:40 +0100 |
| commit | 9a730cd0793919e3b60fe5b32aaba0fe5eb2a115 (patch) | |
| tree | 09fbb4011f19a58dfbc515c190d9bb4fc5bc7cb1 /sw/source | |
| parent | 44f6a3e9583357ac882f1660285214231961204a (diff) | |
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/+/177681
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 228fcd65ce97..d2484c941825 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2434,7 +2434,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 @@ -2446,8 +2447,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('}'); } @@ -2458,8 +2459,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("}"); |