diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-26 15:47:54 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-26 17:30:02 +0200 |
commit | 55162d7422a3b175c7fe9c175e0dec91b1932b6a (patch) | |
tree | f5111bd4a3d1a3dbb3ab8f5966459e259aada700 /writerfilter | |
parent | Resolves: #i121751# restore cursor/selection on Undo/Redo language... (diff) | |
download | core-55162d7422a3b175c7fe9c175e0dec91b1932b6a.tar.gz core-55162d7422a3b175c7fe9c175e0dec91b1932b6a.zip |
bnc#823675 RTF import: fix import of numbering bullet associated font
There were multiple problems here:
- \f had a special handler for the listlevel destination, \af had not
- in case of multiple \f or \af, the first one is used for the bullet
font
- in case only \af is used for the bullet font, its value should be used
for \f as well
Change-Id: I6631504c1aa9f2e0792a3469a5fdce5b7bd49518
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 1043b7a0a8e6..13691197ded2 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok)) $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ configmgr/source/configmgr \ + i18npool/util/i18npool \ svtools/util/svt \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c60128eb0fe4..953810165633 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2700,7 +2700,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) // Trivial character sprms. switch (nKeyword) { - case RTF_AF: nSprm = (m_aStates.top().bIsCjk ? NS_sprm::LN_CRgFtc1 : NS_sprm::LN_CRgFtc2); break; case RTF_FS: nSprm = NS_sprm::LN_CHps; break; case RTF_AFS: nSprm = NS_sprm::LN_CHpsBi; break; case RTF_ANIMTEXT: nSprm = NS_sprm::LN_CSfxText; break; @@ -2831,6 +2830,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) switch (nKeyword) { case RTF_F: + case RTF_AF: + if (nKeyword == RTF_F) + nSprm = NS_sprm::LN_CRgFtc0; + else + nSprm = (m_aStates.top().bIsCjk ? NS_sprm::LN_CRgFtc1 : NS_sprm::LN_CRgFtc2); if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE || m_aStates.top().nDestinationState == DESTINATION_FONTENTRY) { m_aFontIndexes.push_back(nParam); @@ -2839,16 +2843,21 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) else if (m_aStates.top().nDestinationState == DESTINATION_LISTLEVEL) { RTFSprms aFontSprms; - aFontSprms.set(NS_sprm::LN_CRgFtc0, RTFValue::Pointer_t(new RTFValue(getFontIndex(nParam)))); + aFontSprms.set(nSprm, RTFValue::Pointer_t(new RTFValue(getFontIndex(nParam)))); + // In the context of listlevels, \af seems to imply \f. + if (nKeyword == RTF_AF) + 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))); + // If there are multiple \f or \af tokens, only handle the first one. + if (!m_aStates.top().aTableSprms.find(NS_ooxml::LN_CT_Lvl_rPr)) + m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr, RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms))); } else { int nFontIndex = getFontIndex(nParam); RTFValue::Pointer_t pValue(new RTFValue(nFontIndex)); - m_aStates.top().aCharacterSprms.set(NS_sprm::LN_CRgFtc0, pValue); + m_aStates.top().aCharacterSprms.set(nSprm, pValue); m_aStates.top().nCurrentEncoding = getEncoding(nFontIndex); } break; |