summaryrefslogtreecommitdiff
path: root/writerfilter/source/rtftok
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-03-01 17:38:03 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-06-26 18:23:42 +0200
commita08492814896380afc0bf10981f46c4888da8beb (patch)
tree96010435eafb72849f37337115f82c69ce409d02 /writerfilter/source/rtftok
parentfc12b2f5f98751168019d4019b1ed1abb4bcd2ca (diff)
bnc#823675 fdo#59638 handle RTF_F inside RTF_LISTLEVEL
Word typically uses the Symbol font to describe bullet characters instead of using a sane Unicode value, the previous can only be handled if we parse the custom font set for the list. (cherry picked from commit 58c30a3545a5725d704eabd79071db02f1f2cb23) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I1491f07c40953949e381a035c1596c207cdc4c35
Diffstat (limited to 'writerfilter/source/rtftok')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 67a26e3ae53c..95d7a620b311 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2433,6 +2433,14 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
m_aFontIndexes.push_back(nParam);
m_nCurrentFontIndex = getFontIndex(nParam);
}
+ else if (m_aStates.top().nDestinationState == DESTINATION_LISTLEVEL)
+ {
+ RTFSprms aFontSprms;
+ aFontSprms.set(NS_sprm::LN_CRgFtc0, RTFValue::Pointer_t(new RTFValue(getFontIndex(nParam))));
+ RTFSprms aRunPropsSprms;
+ aRunPropsSprms.set(NS_ooxml::LN_EG_RPrBase_rFonts, RTFValue::Pointer_t(new RTFValue(RTFSprms(), aFontSprms)));
+ m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr, RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)));
+ }
else
{
int nFontIndex = getFontIndex(nParam);