diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-28 13:49:13 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2016-07-29 20:01:27 +0200 |
commit | 84db766c95711b243e3b0e15ffd265bb65cb7729 (patch) | |
tree | 6259364e20581bbc72a1c5881e3295f821814fc4 /writerfilter | |
parent | 44af1aa2c022278d6586c03ce8f37604f0e4f15d (diff) |
fftester: empty table manager stack
Change-Id: Ia7f7ace8130d5dfe290207e0cd3d2e6a43b8ab46
(cherry picked from commit df9414084b46c1712dc7151f50023438c62301e2)
Reviewed-on: https://gerrit.libreoffice.org/27633
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 3f320c21d27c409aa086d044502acf42f60a1a36)
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf | bin | 0 -> 106 bytes | |||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 3 |
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 Binary files differnew file mode 100644 index 000000000000..5b34e7f61835 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index fc7336c00829..d39e6bb9d11b 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); |