summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtfbin0 -> 1333 bytes
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx2
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
new file mode 100644
index 000000000000..df41b1f88e2a
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf
Binary files differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ca9980c53923..31bb9c38a0ef 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -831,7 +831,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
{