From be4fb2753c2f028a53d657a7920267a4191cd566 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 28 May 2018 15:10:28 +0200 Subject: Bug 782754 - rtf generation Looks like problem has been introduced with the fix for bug 445105 (release 1.5.3), in this case the \par is necessary. The fix for bug 741547 (pull request #596) is related to this problem and the fix here is not necessary with this fix. Related to bug 778525, here 2 problems occur and the mangling is solved with this patch. --- src/classdef.cpp | 14 -------------- src/rtfgen.cpp | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index 4ce48a7..45afd90 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1935,21 +1935,7 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade if (rootNode && !rootNode->isEmpty()) { ol.startMemberDescription(anchor()); - - ol.pushGeneratorState(); - ol.disableAll(); - ol.enable(OutputGenerator::RTF); - ol.writeString("{"); - ol.popGeneratorState(); - ol.writeDoc(rootNode,this,0); - - ol.pushGeneratorState(); - ol.disableAll(); - ol.enable(OutputGenerator::RTF); - ol.writeString("\\par}"); - ol.popGeneratorState(); - if (isLinkableInProject()) { writeMoreLink(ol,anchor()); diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 9a6f549..0faf565 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -1639,11 +1639,11 @@ void RTFGenerator::endMemberDescription() { DBG_RTF(t << "{\\comment (endMemberDescription)}" << endl) endEmphasis(); - newParagraph(); + //newParagraph(); decrementIndentLevel(); - //t << "\\par"; + t << "\\par"; t << "}" << endl; - //m_omitParagraph = TRUE; + m_omitParagraph = TRUE; } void RTFGenerator::startDescList(SectionTypes) -- cgit v0.12