diff options
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index ad460fa21d6a..0e188529ebe4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1086,7 +1086,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) dmapper_logger->attribute("isTextAppend", xTextAppend.is()); #endif - if(xTextAppend.is() && ! getTableManager( ).isIgnore() && pParaContext != NULL) + if (xTextAppend.is() && !getTableManager( ).isIgnore() && pParaContext != NULL) { try { @@ -1221,14 +1221,17 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) } m_bParaChanged = false; - if(!pParaContext->IsFrameMode()) + if (!pParaContext || !pParaContext->IsFrameMode()) { // If the paragraph is in a frame, it's not a paragraph of the section itself. m_bIsFirstParaInSection = false; m_bIsLastParaInSection = false; } - // Reset the frame properties for the next paragraph - pParaContext->ResetFrameProperties(); + if (pParaContext) + { + // Reset the frame properties for the next paragraph + pParaContext->ResetFrameProperties(); + } #ifdef DEBUG_DOMAINMAPPER dmapper_logger->endElement(); |