mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#47347 overwrite incorrect font table entry with the correct one

Browse Source 
Change-Id: I563cf50b6eb029276115b9b02951d36b1ec0d39c
This commit is contained in:
Caolán McNamara 2012-05-05 15:56:03 +01:00
parent 349d64b821
commit a96e7428b7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@ -885,7 +885,15 @@ void RTFDocumentImpl::text(OUString& rString)
writerfilter::Reference<Properties>::Pointer_t const pProp(
new RTFReferenceProperties(m_aStates.top().aTableAttributes, m_aStates.top().aTableSprms)
);
m_aFontTableEntries.insert(make_pair(m_nCurrentFontIndex, pProp));
//See fdo#47347 initial invalid font entry properties are inserted first,
//so when we attempt to insert the correct ones, there's already an
//entry in the map for them, so the new ones aren't inserted.
RTFReferenceTable::Entries_t::iterator lb = m_aFontTableEntries.lower_bound(m_nCurrentFontIndex);
if (lb != m_aFontTableEntries.end() && !(m_aFontTableEntries.key_comp()(m_nCurrentFontIndex, lb->first)))
lb->second = pProp;
else
m_aFontTableEntries.insert(lb, make_pair(m_nCurrentFontIndex, pProp));
}
break;
case DESTINATION_STYLESHEET: