Release-1.8.2-20120930

1 files changed, 4 insertions, 4 deletions

diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 744e86f..3df3774 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -621,7 +621,7 @@ QCString HtmlHelp::recode(const QCString &s)
   char *oPtr       = output.data();
   if (!portable_iconv(m_fromUtf8,&iPtr,&iLeft,&oPtr,&oLeft))
   {
-    oSize -= oLeft;
+    oSize -= (int)oLeft;
     output.resize(oSize+1);
     output.at(oSize)='\0';
     return output;
@@ -692,7 +692,7 @@ void HtmlHelp::addContentsItem(bool isDir,
 
 
 void HtmlHelp::addIndexItem(Definition *context,MemberDef *md,
-                            const char *word)
+                            const char *sectionAnchor,const char *word)
 {
   if (md)
   {
@@ -712,14 +712,14 @@ void HtmlHelp::addIndexItem(Definition *context,MemberDef *md,
     QCString level2  = md->name();
     QCString contRef = separateMemberPages ? cfname : cfiname;
     QCString memRef  = cfname;
-    QCString anchor  = md->anchor();
+    QCString anchor  = sectionAnchor ? QCString(sectionAnchor) : md->anchor();
     index->addItem(level1,level2,contRef,anchor,TRUE,FALSE);
     index->addItem(level2,level1,memRef,anchor,TRUE,TRUE);
   }
   else if (context)
   {
     QCString level1  = word ? QCString(word) : context->name();
-    index->addItem(level1,0,context->getOutputFileBase(),0,TRUE,FALSE);
+    index->addItem(level1,0,context->getOutputFileBase(),sectionAnchor,TRUE,FALSE);
   }
 }