From 756b2431f0006a01affa7c92c2dede2b11166001 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Tue, 25 Jul 2017 12:29:07 -0400 Subject: tdf#108949 rtf writerfilter: apply char properties to footnote commit fdfdea4d5af51a68f2d497cc5c3359d74c385fd5 for tdf#82173 added that functionality for .docx, but since .rtf didn't support character props for footnotes, it messed up other formatting. start/EndCharacterGroup() fixes the reported bug. runProps() adds the functionality for .rtf that was requested for .docx in bug 82173. Change-Id: Ia9a2332659247a0fe2c2a506f1967c148362928f Reviewed-on: https://gerrit.libreoffice.org/40430 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- writerfilter/source/rtftok/rtfdispatchdestination.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'writerfilter/source/rtftok/rtfdispatchdestination.cxx') diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx index 4d1960df367e..4799a3be8978 100644 --- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx +++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx @@ -303,8 +303,8 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) } } m_aStates.top().eDestination = Destination::FOOTNOTE; - if (bCustomMark) - Mapper().startCharacterGroup(); + Mapper().startCharacterGroup(); + runProps(); if (!m_aStates.top().pCurrentBuffer) resolveSubstream(m_nGroupStartPos - 1, nId, aCustomMark); else @@ -322,8 +322,8 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) auto pValue = std::make_shared(1); m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdnRef_customMarkFollows, pValue); text(aCustomMark); - Mapper().endCharacterGroup(); } + Mapper().endCharacterGroup(); m_aStates.top().eDestination = Destination::SKIP; } break; -- cgit