Kaydet (Commit) ea5f1ec4 authored tarafından Dennis Francis's avatar Dennis Francis

crashtesting: crash on importing tdf#123420-2.xlsx

since

commit c2f1c68f
Date:   Fri Apr 19 23:15:53 2019 +0530

    tdf#122590: follow-up : import x14:cfRule priorities

Fix is to import the priorities for iconSet x14:cfRule too.

Thanks to Caolán McNamara for notifying me about the regression.

Change-Id: Ib5b703a6911ab6480d42ac1e004a144043d3ad24
Reviewed-on: https://gerrit.libreoffice.org/72035
Tested-by: Jenkins
Reviewed-by: 's avatarDennis Francis <dennis.francis@collabora.com>
üst fac093e5
...@@ -106,6 +106,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl ...@@ -106,6 +106,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl
OUString aType = rAttribs.getString(XML_type, OUString()); OUString aType = rAttribs.getString(XML_type, OUString());
OUString aId = rAttribs.getString(XML_id, OUString()); OUString aId = rAttribs.getString(XML_id, OUString());
nPriority = rAttribs.getInteger( XML_priority, -1 ); nPriority = rAttribs.getInteger( XML_priority, -1 );
maPriorities.push_back(nPriority);
if (aType == "dataBar") if (aType == "dataBar")
{ {
...@@ -181,7 +182,6 @@ void ExtConditionalFormattingContext::onEndElement() ...@@ -181,7 +182,6 @@ void ExtConditionalFormattingContext::onEndElement()
case XM_TOKEN(f): case XM_TOKEN(f):
{ {
rFormulas.push_back(aChars); rFormulas.push_back(aChars);
maPriorities.push_back(nPriority);
} }
break; break;
case XLS14_TOKEN( cfRule ): case XLS14_TOKEN( cfRule ):
...@@ -226,9 +226,7 @@ void ExtConditionalFormattingContext::onEndElement() ...@@ -226,9 +226,7 @@ void ExtConditionalFormattingContext::onEndElement()
std::vector< std::unique_ptr<ExtCfCondFormat> >& rExtFormats = getCondFormats().importExtCondFormat(); std::vector< std::unique_ptr<ExtCfCondFormat> >& rExtFormats = getCondFormats().importExtCondFormat();
rExtFormats.push_back(std::make_unique<ExtCfCondFormat>(aRange, maEntries, &maPriorities)); rExtFormats.push_back(std::make_unique<ExtCfCondFormat>(aRange, maEntries, &maPriorities));
if (isPreviousElementF) maPriorities.clear();
maPriorities.clear();
isPreviousElementF = false; isPreviousElementF = false;
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment