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

[Caolán McNamara]

 writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf |binary
 writerfilter/source/dmapper/DomainMapper.cxx                     |    3 +++
 2 files changed, 3 insertions(+)

New commits:
commit 3f320c21d27c409aa086d044502acf42f60a1a36
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 28 13:49:13 2016 +0100

    fftester: empty table manager stack
    
    Change-Id: Ia7f7ace8130d5dfe290207e0cd3d2e6a43b8ab46
    (cherry picked from commit df9414084b46c1712dc7151f50023438c62301e2)
    Reviewed-on: https://gerrit.libreoffice.org/27633
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf
new file mode 100644
index 0000000..5b34e7f
Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf differ
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 4a08120..ef46300 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3157,6 +3157,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
         return;
     }
 
+    if (!m_pImpl->hasTableManager())
+        return;
+
     try
     {
         m_pImpl->getTableManager().utext(data_, len);