summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-28 13:49:13 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-28 14:31:15 +0000
commit15f7ad8774d51b376e40c0ee6061d02510d33e2c (patch)
treea3bfc01ed260b1b80436f4909952c2d1c85b505b /writerfilter
parentae464270146e003532653db80687f272de1c616a (diff)
fftester: empty table manager stack
Change-Id: Ia7f7ace8130d5dfe290207e0cd3d2e6a43b8ab46 (cherry picked from commit df9414084b46c1712dc7151f50023438c62301e2) Reviewed-on: https://gerrit.libreoffice.org/27631 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtfbin0 -> 106 bytes
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx3
2 files changed, 3 insertions, 0 deletions
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 000000000000..5b34e7f61835
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf
Binary files differ
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 5ee269bfa7c4..774bfa1d26a1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3200,6 +3200,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);