diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-01-14 20:27:23 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-02-11 14:54:44 +0100 |
| commit | b22e65d4b44f9a778c372929a7461ba5b17f7314 (patch) | |
| tree | fd2f9dbd57db66973caec3e7e84ffc96f90a6658 /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | ad32ff8f41e452156a2d16119b60542de11b42c8 (diff) | |
tdf#122455 RTF export: fix font style from list def leaking into first para
This was a problem since RtfAttributeOutput::NumberingLevel() started to
use OutputItemSet() or when m_aStyles and m_aStylesEnd was separated,
but both were already like this in commit
5bbc027d5dae3472223538b13933ff821e027737 (cws-vmiklos01.diff: Better RTF
export filter, 2010-09-17).
If m_aStylesEnd is not consumed by NumberingLevel(), then the first run
will include its contents, which is incorrect.
Change-Id: Ifc93ae5f0057102fab636febae5ee2462361878e
Reviewed-on: https://gerrit.libreoffice.org/66332
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 57d3c927eff495702cd12f2a15ef0763f51977a7)
Reviewed-on: https://gerrit.libreoffice.org/66398
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0d06d47368aa..aad9b6a9e21d 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1525,6 +1525,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, } m_rExport.OutputItemSet(*pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF); + m_aStyles.append(m_aStylesEnd.makeStringAndClear()); m_rExport.Strm().WriteCharPtr(m_aStyles.makeStringAndClear().getStr()); } |