Skip to content

Commit 7978444

Browse files
author
Dimitri van Heesch
committed
Merge pull request doxygen#323 from ppescher/master
fix enum brief description in RTF output
2 parents 78e1bdf + 4438e24 commit 7978444

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/doxygen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11672,7 +11672,7 @@ void generateOutput()
1167211672
QString oldDir = QDir::currentDirPath();
1167311673
QDir::setCurrent(Config_getString("HTML_OUTPUT"));
1167411674
portable_sysTimerStart();
11675-
if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE))
11675+
if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd)))
1167611676
{
1167711677
err("failed to run html help compiler on index.hhp\n");
1167811678
}

src/index.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4140,7 +4140,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
41404140
case LayoutNavEntry::Classes:
41414141
if (annotatedClasses>0 && addToIndex)
41424142
{
4143-
Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0);
4143+
Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,"annotated",0);
41444144
Doxygen::indexList->incContentsDepth();
41454145
needsClosing=TRUE;
41464146
}

src/memberlist.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ void MemberList::writePlainDeclarations(OutputList &ol,
409409
{
410410
ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor());
411411
}
412-
ol.endMemberItem();
413412
if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
414413
{
415414
DocRoot *rootNode = validatingParseDoc(
@@ -437,6 +436,7 @@ void MemberList::writePlainDeclarations(OutputList &ol,
437436
delete rootNode;
438437
}
439438
ol.endMemberDeclaration(md->anchor(),inheritId);
439+
ol.endMemberItem();
440440
}
441441
md->warnIfUndocumented();
442442
break;

0 commit comments

Comments
 (0)