summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-05-27 23:45:25 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-05-27 23:45:25 +0200
commit24d92c8657503f9ca949c4012ad0b8909e9e3e88 (patch)
tree9d93c6ea85b4abfc29101b899b5ac122a61ac98f
parent4a666eae740a888e9fecf5dd6ec370fb044bc377 (diff)
rtf: m_aStates can be empty in the inner condition
Change-Id: Id262a3019a693f236630b798579f360c9462d12e
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f9ec8fbbd80e..c1733c57d515 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -439,8 +439,13 @@ void RTFDocumentImpl::setNeedSect(bool bNeedSect)
writerfilter::Reference<Properties>::Pointer_t RTFDocumentImpl::getProperties(RTFSprms& rAttributes, RTFSprms& rSprms)
{
- int nStyle = m_aStates.top().nCurrentStyleIndex;
- RTFReferenceTable::Entries_t::iterator it = m_aStyleTableEntries.find(nStyle);
+ RTFReferenceTable::Entries_t::iterator it = m_aStyleTableEntries.end();
+ if (!m_aStates.empty())
+ {
+ int nStyle = m_aStates.top().nCurrentStyleIndex;
+ it = m_aStyleTableEntries.find(nStyle);
+ }
+
if (it != m_aStyleTableEntries.end())
{
RTFReferenceProperties& rProps = *(RTFReferenceProperties*)it->second.get();