[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - writerfilter/qa writerfilter/source

[Caolán McNamara]

 writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d7c00a1e54f72427aeadded00a3c5be03c1c997b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 12 09:34:21 2016 +0100

    fftester: no table manager
    
    Change-Id: Icb3c640e04416f9120d37558646a570daeddf0a4
    Reviewed-on: https://gerrit.libreoffice.org/28827
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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 0000000..df41b1f
Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ca9980c..31bb9c3 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
         {