diff options
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5450f1db901a..d7e0206aae1d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -268,11 +268,13 @@ DomainMapper_Impl::~DomainMapper_Impl() // Don't remove last paragraph when pasting, sw expects that empty paragraph. if (m_bIsNewDoc) RemoveLastParagraph(); - getTableManager( ).endLevel(); - popTableManager( ); + if (hasTableManager()) + { + getTableManager().endLevel(); + popTableManager(); + } } - uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles() { if(!m_xPageStyles.is()) @@ -1026,7 +1028,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap ) TagLogger::getInstance().attribute("isTextAppend", sal_uInt32(xTextAppend.is())); #endif - if (xTextAppend.is() && !getTableManager( ).isIgnore() && pParaContext != nullptr) + if (xTextAppend.is() && pParaContext != nullptr && !getTableManager().isIgnore()) { try { |