diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 14:30:13 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-17 23:23:36 +0200 |
| commit | 90907c49809e29a1484abc999b2bc560c52e8972 (patch) | |
| tree | e44fc5cb354fb14e6a8e49d357d84309da6baf8a /writerfilter | |
| parent | 4b936c0eb416941f1e25268ee3b7edcd602f37cd (diff) | |
tdf#94049 RTF import: add missing check for empty shape when popping state
Change-Id: I3c9a5f89df721618bb60b8932b69a371bb6f3ff1
(cherry picked from commit 0d79e4c07a7a7328cc0bed1d7998317b634543d8)
Reviewed-on: https://gerrit.libreoffice.org/19366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4bfde7402dee4f3639bd23c1dc987ceafea87cfc)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9e07150f7cd7..d61c6646196a 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -5407,9 +5407,12 @@ RTFError RTFDocumentImpl::popState() OSL_ASSERT(pShape.get()); if (pShape.get()) pShape->getAny() >>= xShape; - Mapper().startShape(xShape); - Mapper().props(pProperties); - Mapper().endShape(); + if (xShape.is()) + { + Mapper().startShape(xShape); + Mapper().props(pProperties); + Mapper().endShape(); + } m_aObjectAttributes.clear(); m_aOLEAttributes.clear(); m_bObject = false; |