diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-10-05 15:54:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-10-06 14:59:21 +0200 |
| commit | 5f597e3eea220cc9f7dd519e0767079ca9c7815d (patch) | |
| tree | 0e68271b0e8dde362df556f5a0da175174460d62 /writerfilter | |
| parent | cc70f137cd853bc22281edb94f15ebe48da871e7 (diff) | |
crashtesting: crash on import of abi3007-4.rtf
which started happending at...
commit 56a695fddb915bcba13b088b5b2b4e0841d4acbc
Date: Tue Sep 26 09:13:05 2017 +0200
tdf#112211 RTF import: fix unwanted direct formatting for left indents
Change-Id: Id3e8c4452238b48495b1014eff14cdaddcb047ab
Reviewed-on: https://gerrit.libreoffice.org/43172
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ca95e886b42157d1d6394ed0b4c910978f5c2fda)
Reviewed-on: https://gerrit.libreoffice.org/43178
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 970992f99151..d608fac48c68 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -763,16 +763,19 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) } break; case NS_ooxml::LN_CT_Ind_left: - pCurrentLvl->Insert( - PROP_INDENT_AT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + if ( pCurrentLvl.get( ) ) + pCurrentLvl->Insert( + PROP_INDENT_AT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_hanging: - pCurrentLvl->Insert( - PROP_FIRST_LINE_INDENT, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) )); + if ( pCurrentLvl.get( ) ) + pCurrentLvl->Insert( + PROP_FIRST_LINE_INDENT, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_firstLine: - pCurrentLvl->Insert( - PROP_FIRST_LINE_INDENT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + if ( pCurrentLvl.get( ) ) + pCurrentLvl->Insert( + PROP_FIRST_LINE_INDENT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Lvl_ilvl: //overrides previous level - unsupported case NS_ooxml::LN_CT_Lvl_tplc: //template code - unsupported |