summaryrefslogtreecommitdiff
path: root/writerfilter/source/rtftok/rtfdispatchdestination.cxx
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-07-25 12:29:07 -0400
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-28 10:40:13 +0200
commit756b2431f0006a01affa7c92c2dede2b11166001 (patch)
treea81e7cec6deb205ef6dcf37b769bd8c12c465872 /writerfilter/source/rtftok/rtfdispatchdestination.cxx
parentea3ca5e10aa3190e28fe37801727f8b5f8543e13 (diff)
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 <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/rtftok/rtfdispatchdestination.cxx')
-rw-r--r--writerfilter/source/rtftok/rtfdispatchdestination.cxx6
1 files changed, 3 insertions, 3 deletions
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<RTFValue>(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;