diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-12 09:34:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-12 08:37:10 +0000 |
| commit | 168c867fc0950dfea61e682846d3a014995888b4 (patch) | |
| tree | d3be9f00bc101995be8668cb9b8be7092b16c497 /writerfilter | |
| parent | dd4d65a88e54c01cdaecb8176fefc533de776579 (diff) | |
fftester: no table manager
Change-Id: Icb3c640e04416f9120d37558646a570daeddf0a4
Reviewed-on: https://gerrit.libreoffice.org/28825
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf | bin | 0 -> 1333 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf Binary files differnew file mode 100644 index 000000000000..df41b1f88e2a --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a9f65802775c..403ee507b65c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -837,7 +837,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) TextAppendContext& rAppendContext = m_aTextAppendStack.top(); // n#779642: ignore fly frame inside table as it could lead to messy situations if( rAppendContext.pLastParagraphProperties.get() && rAppendContext.pLastParagraphProperties->IsFrameMode() - && !getTableManager().isInTable() ) + && hasTableManager() && !getTableManager().isInTable() ) { try { |