diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-10 09:43:01 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-10 09:47:31 +0200 |
| commit | 2c64af529567324f4433984ed7673304d26062c8 (patch) | |
| tree | bface4e4c77d11e4d85c02e6e9381abe546035df | |
| parent | 4f4856a861275fe40f9b8fcb5164e2c4a97faef7 (diff) | |
fdo#64656 RTF import: handle levelnumbers without leveltext
Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf | 10 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1 |
2 files changed, 11 insertions, 0 deletions
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 000000000000..1c815c4e7517 --- /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 345912df76b6..b2179c40ce48 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3843,6 +3843,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); |