|
 |
f325b2 |
From 4ce2689bf8616463d224ebfed1d5bc80691c6b8c Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Tue, 10 May 2016 09:34:58 +0100
|
|
|
f325b2 |
Subject: [PATCH] rtf: m_aStates can be empty in the inner condition
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Id262a3019a693f236630b798579f360c9462d12e
|
|
|
f325b2 |
(cherry picked from commit 05cc87ce45fad402445c8d748817e386e56148af)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 +++++++---
|
|
|
f325b2 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
f325b2 |
index 799186d..995772a 100644
|
|
|
f325b2 |
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
f325b2 |
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
f325b2 |
@@ -455,11 +455,15 @@ writerfilter::Reference<Properties>::Pointer_t RTFDocumentImpl::getProperties(RT
|
|
|
f325b2 |
|
|
|
f325b2 |
// cloneAndDeduplicate() wants to know about only a single "style", so
|
|
|
f325b2 |
// let's merge paragraph and character style properties here.
|
|
|
f325b2 |
- int nCharStyle = m_aStates.top().nCurrentCharacterStyleIndex;
|
|
|
f325b2 |
- RTFReferenceTable::Entries_t::iterator itChar = m_aStyleTableEntries.find(nCharStyle);
|
|
|
f325b2 |
+ RTFReferenceTable::Entries_t::iterator itChar = m_aStyleTableEntries.end();
|
|
|
f325b2 |
+ if (!m_aStates.empty())
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ int nCharStyle = m_aStates.top().nCurrentCharacterStyleIndex;
|
|
|
f325b2 |
+ itChar = m_aStyleTableEntries.find(nCharStyle);
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
+
|
|
|
f325b2 |
RTFSprms aStyleSprms;
|
|
|
f325b2 |
RTFSprms aStyleAttributes;
|
|
|
f325b2 |
-
|
|
|
f325b2 |
// Ensure the paragraph style is a flat list.
|
|
|
f325b2 |
lcl_copyFlatten(rProps, aStyleAttributes, aStyleSprms);
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.7.4
|
|
|
f325b2 |
|