diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-29 21:24:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-29 21:24:46 +0100 |
commit | d00fc303bca7765762a602531b7d3b40ce8f1740 (patch) | |
tree | 0f2e676dd1462b00a220c166ad425dd0a81a5c80 /writerfilter | |
parent | 1ca11b55aecb18f9dcca1e9678910dc2e7593623 (diff) |
fftester: another empty table manager stack
Change-Id: If3148cb6e16cff4aad28c4f86467c66ed04bcd05
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf | bin | 0 -> 121 bytes | |||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 3 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf Binary files differnew file mode 100644 index 000000000000..58328edc97db --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 2db5af3dc59e..f6e51162cf63 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2920,7 +2920,8 @@ void DomainMapper::lcl_endShape( ) // empty paragraph at the end of the shape text will cause problems: if // the shape text ends with a table, the extra paragraph will be // handled as an additional row of the ending table. - m_pImpl->getTableManager().endTable(); + if (m_pImpl->hasTableManager()) + m_pImpl->getTableManager().endTable(); lcl_endParagraphGroup(); m_pImpl->PopShapeContext( ); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5f6e05ded800..1d22fa4fb274 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2013,8 +2013,11 @@ void DomainMapper_Impl::UpdateEmbeddedShapeProps(const uno::Reference< drawing:: void DomainMapper_Impl::PopShapeContext() { - getTableManager().endLevel(); - popTableManager(); + if (hasTableManager()) + { + getTableManager().endLevel(); + popTableManager(); + } if ( m_aAnchoredStack.size() > 0 ) { // For OLE object replacement shape, the text append context was already removed |