writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 3d5a7631942171c2d73fbb172c2a9e7a50e9c3e3 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Mar 1 20:43:59 2018 +0000 forcepoint #12 top empty stack Change-Id: I51f02be13b3cf69e9aaef644a6c4837f1c47ff62 Reviewed-on: https://gerrit.libreoffice.org/50602 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 408a5dc12722..649898923a9b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2284,8 +2284,11 @@ void DomainMapper_Impl::PopShapeContext() { const uno::Reference<beans::XPropertySet> xShapePropertySet( xShape, uno::UNO_QUERY ); SectionPropertyMap* pSectionContext = GetSectionContext(); - if ( pSectionContext && !getTableManager().isInTable() && xShapePropertySet->getPropertySetInfo()->hasPropertyByName(getPropertyName(PROP_RELATIVE_WIDTH)) ) + if ( pSectionContext && (!hasTableManager() || !getTableManager().isInTable()) && + xShapePropertySet->getPropertySetInfo()->hasPropertyByName(getPropertyName(PROP_RELATIVE_WIDTH)) ) + { pSectionContext->addRelativeWidthShape(xShape); + } } m_aAnchoredStack.pop(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits