writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf | 10 ++++++++++ writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1 + 2 files changed, 11 insertions(+)
New commits: commit f6c8a7f90154ea7251bf7aa8eb6f2db14252060a Author: Miklos Vajna <vmik...@suse.cz> Date: Mon Jun 10 09:43:01 2013 +0200 fdo#64656 RTF import: handle levelnumbers without leveltext (cherry picked from commit 2c64af529567324f4433984ed7673304d26062c8) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c Reviewed-on: https://gerrit.libreoffice.org/4219 Reviewed-by: Noel Power <noel.po...@suse.com> Tested-by: Noel Power <noel.po...@suse.com> diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf new file mode 100644 index 0000000..1c815c4 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf @@ -0,0 +1,10 @@ +{\rtf +{\*\listtable +{\list \listtemplateid3794224 \listhybrid +{\listlevel \levelnfc0 \levelnfcn0 \leveljc0 \leveljcn0 \levelstartat1 \levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0 +{\levelnumbers ;} +} +{\listname ;} +\listid258183 } +} +} diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e06bace..f9bcdc1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3727,6 +3727,7 @@ int RTFDocumentImpl::popState() } break; case DESTINATION_LEVELNUMBERS: + if (aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText)) { RTFSprms& rAttributes = aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText)->getAttributes(); RTFValue::Pointer_t pValue = rAttributes.find(NS_ooxml::LN_CT_LevelText_val); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits