From 1f21c23c57c91ba6901c0de38bb236f7246e88c9 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 3 Feb 2015 21:42:45 +0100 Subject: Bug 743604 - Duplicate anchors from tagfiles --- src/doxygen.cpp | 10 +++++----- src/index.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 30ee02b..54187a1 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10636,7 +10636,7 @@ static void writeTagFile() FileDef *fd; for (fni.toFirst();(fd=fni.current());++fni) { - fd->writeTagFile(tagFile); + if (fd->isLinkableInProject()) fd->writeTagFile(tagFile); } } // for each class @@ -10644,28 +10644,28 @@ static void writeTagFile() ClassDef *cd; for ( ; (cd=cli.current()) ; ++cli ) { - cd->writeTagFile(tagFile); + if (cd->isLinkableInProject()) cd->writeTagFile(tagFile); } // for each namespace NamespaceSDict::Iterator nli(*Doxygen::namespaceSDict); NamespaceDef *nd; for ( ; (nd=nli.current()) ; ++nli ) { - nd->writeTagFile(tagFile); + if (nd->isLinkableInProject()) nd->writeTagFile(tagFile); } // for each group GroupSDict::Iterator gli(*Doxygen::groupSDict); GroupDef *gd; for (gli.toFirst();(gd=gli.current());++gli) { - gd->writeTagFile(tagFile); + if (gd->isLinkableInProject()) gd->writeTagFile(tagFile); } // for each page PageSDict::Iterator pdi(*Doxygen::pageSDict); PageDef *pd=0; for (pdi.toFirst();(pd=pdi.current());++pdi) { - pd->writeTagFile(tagFile); + if (pd->isLinkableInProject()) pd->writeTagFile(tagFile); } if (Doxygen::mainPage) Doxygen::mainPage->writeTagFile(tagFile); diff --git a/src/index.cpp b/src/index.cpp index 9ded1ab..e448094 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3114,9 +3114,9 @@ static void writePages(PageDef *pd,FTVHelp *ftv) if (ftv) { - //printf("*** adding %s\n",pageTitle.data()); + //printf("*** adding %s hasSubPages=%d hasSections=%d\n",pageTitle.data(),hasSubPages,hasSections); ftv->addContentsItem( - hasSubPages || hasSections,pageTitle, + hasSubPages,pageTitle, pd->getReference(),pd->getOutputFileBase(), 0,hasSubPages,TRUE,pd); } -- cgit v0.12