diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-12 09:34:21 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-09-20 23:05:35 +0200 |
| commit | cf914d77a0837feec567d0c0b67ac08bd9f2b610 (patch) | |
| tree | b5bf5f130f581255f6508f46575a25d64128e4ec | |
| parent | 131afa8be07a5772017dc1d45603e3877ef331c9 (diff) | |
fftester: no table manager
Change-Id: Icb3c640e04416f9120d37558646a570daeddf0a4
Reviewed-on: https://gerrit.libreoffice.org/28827
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit d7c00a1e54f72427aeadded00a3c5be03c1c997b)
| -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 5bc6fa531b20..e0dba9c8ab59 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -830,7 +830,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 { |