diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-24 22:45:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-27 17:32:14 +0200 |
| commit | d216e9c5a3d5097a21e10540532e8b81fed65039 (patch) | |
| tree | 7cc38307d4f8bf741f156df951247a441247f7ea /writerfilter | |
| parent | 1272e9aba878192f138247d732b6deca13f36176 (diff) | |
tdf#108951 RTF import: fix missing custom bullet types
Regression from commit f528f9499bd91b700c549575e88fa102cfffede9
(tdf#106953 RTF import: fix missing paragraph left margin, 2017-05-16)
where I fixed the parent of the ooxml::CT_NumPr_numId token at one
place, but forgot to adapt RTFDocumentImpl::popState() accordingly.
(cherry picked from commit 1e87e93132f808ab95eab932b36bfe40d3cc607a)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ibddd2486a50f284e11c2cd96339e7140b427aae1
Reviewed-on: https://gerrit.libreoffice.org/40385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c49ae29af150..1668d70f5c30 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2890,7 +2890,7 @@ RTFError RTFDocumentImpl::popState() // Use it putNestedSprm(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_numPr, NS_ooxml::LN_CT_NumPr_ilvl, pIlvlValue); - putNestedSprm(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_tabs, NS_ooxml::LN_CT_NumPr_numId, pIdValue); + putNestedSprm(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_numPr, NS_ooxml::LN_CT_NumPr_numId, pIdValue); } } break; |