[PATCH libreoffice-4-0] fdo#64656 RTF import: handle levelnumbers without leveltext

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4219

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/4219/1

fdo#64656 RTF import: handle levelnumbers without leveltext

(cherry picked from commit 2c64af529567324f4433984ed7673304d26062c8)

Conflicts:
	writerfilter/source/rtftok/rtfdocumentimpl.cxx

Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
---
A writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
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 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 @@
     }
     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);

-- 
To view, visit https://gerrit.libreoffice.org/4219
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna <vmiklos at suse.cz>