diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 14:30:13 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 14:30:13 +0200 |
commit | 0d79e4c07a7a7328cc0bed1d7998317b634543d8 (patch) | |
tree | 2bf851061a61ef770d115bfd07492d9610c8d806 /writerfilter | |
parent | ac33ef3a4abe73c65600e1f199d25e1a1f0080db (diff) |
tdf#94049 RTF import: add missing check for empty shape when popping state
Change-Id: I3c9a5f89df721618bb60b8932b69a371bb6f3ff1
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 1dd819752be0..a343a2a4679f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -5410,9 +5410,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; |