diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-01 20:43:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-02 09:50:27 +0100 |
| commit | 3d5a7631942171c2d73fbb172c2a9e7a50e9c3e3 (patch) | |
| tree | c5864b4f2bb60b66284953d03fbd8a1cd76eed4f /writerfilter | |
| parent | e8b708b7707b4df997b3ec3c9b8a004b7dabb9ad (diff) | |
forcepoint #12 top empty stack
Change-Id: I51f02be13b3cf69e9aaef644a6c4837f1c47ff62
Reviewed-on: https://gerrit.libreoffice.org/50602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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(); |