diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-12-11 00:54:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-12-11 01:13:59 +0100 |
| commit | dc78a1c44c478dc7abb25ff5cbbb7477348f0dd1 (patch) | |
| tree | db7f6dce1d5442f30b9c2ca1eaafe54568e88de6 /writerfilter | |
| parent | Remove unused header (diff) | |
| download | core-dc78a1c44c478dc7abb25ff5cbbb7477348f0dd1.tar.gz core-dc78a1c44c478dc7abb25ff5cbbb7477348f0dd1.zip | |
dmapper: when parsing NS_ooxml::LN_CT_Spacing_lineRule, pTopContext may be nil
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d2fc018d165a..4bbba6dbeb4f 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1020,8 +1020,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) #define SINGLE_LINE_SPACING 240 style::LineSpacing aSpacing; PropertyMapPtr pTopContext = m_pImpl->GetTopContext(); - PropertyMap::iterator aLineSpacingIter = pTopContext->find(PropertyDefinition( PROP_PARA_LINE_SPACING, true ) ); - if( aLineSpacingIter != pTopContext->end()) + bool bFound = false; + PropertyMap::iterator aLineSpacingIter; + if (pTopContext) + { + aLineSpacingIter = pTopContext->find(PropertyDefinition( PROP_PARA_LINE_SPACING, true ) ); + bFound = aLineSpacingIter != pTopContext->end(); + } + if (bFound) { aLineSpacingIter->second >>= aSpacing; } @@ -1053,7 +1059,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) else // NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_exact aSpacing.Mode = style::LineSpacingMode::FIX; } - pTopContext->Insert(PROP_PARA_LINE_SPACING, true, uno::makeAny( aSpacing )); + if (pTopContext) + pTopContext->Insert(PROP_PARA_LINE_SPACING, true, uno::makeAny( aSpacing )); } break; case NS_ooxml::LN_CT_Ind_start: |