Commit 54f60c11 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 708806 - Wrong path to graph_legend figure in graph_legend.html when CREATE_SUBDIRS = YES

parent 8e0e64c0
...@@ -3300,15 +3300,21 @@ void writeGraphInfo(OutputList &ol) ...@@ -3300,15 +3300,21 @@ void writeGraphInfo(OutputList &ol)
ol.pushGeneratorState(); ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Html); ol.disableAllBut(OutputGenerator::Html);
generateGraphLegend(Config_getString("HTML_OUTPUT")); generateGraphLegend(Config_getString("HTML_OUTPUT"));
bool &stripCommentsStateRef = Config_getBool("STRIP_CODE_COMMENTS");
bool oldStripCommentsState = stripCommentsStateRef;
bool &createSubdirs = Config_getBool("CREATE_SUBDIRS");
bool oldCreateSubdirs = createSubdirs;
// temporarily disable the stripping of comments for our own code example!
stripCommentsStateRef = FALSE;
// temporarily disable create subdirs for linking to our example
createSubdirs = FALSE;
startFile(ol,"graph_legend",0,theTranslator->trLegendTitle().data()); startFile(ol,"graph_legend",0,theTranslator->trLegendTitle().data());
startTitle(ol,0); startTitle(ol,0);
ol.parseText(theTranslator->trLegendTitle()); ol.parseText(theTranslator->trLegendTitle());
endTitle(ol,0,0); endTitle(ol,0,0);
ol.startContents(); ol.startContents();
bool &stripCommentsStateRef = Config_getBool("STRIP_CODE_COMMENTS");
bool oldStripCommentsState = stripCommentsStateRef;
// temporarily disable the stripping of comments for our own code example!
stripCommentsStateRef = FALSE;
QCString legendDocs = theTranslator->trLegendDocs(); QCString legendDocs = theTranslator->trLegendDocs();
int s = legendDocs.find("<center>"); int s = legendDocs.find("<center>");
int e = legendDocs.find("</center>"); int e = legendDocs.find("</center>");
...@@ -3319,7 +3325,11 @@ void writeGraphInfo(OutputList &ol) ...@@ -3319,7 +3325,11 @@ void writeGraphInfo(OutputList &ol)
} }
FileDef fd("","graph_legend"); FileDef fd("","graph_legend");
ol.generateDoc("graph_legend",1,&fd,0,legendDocs,FALSE,FALSE); ol.generateDoc("graph_legend",1,&fd,0,legendDocs,FALSE,FALSE);
// restore config settings
stripCommentsStateRef = oldStripCommentsState; stripCommentsStateRef = oldStripCommentsState;
createSubdirs = oldCreateSubdirs;
endFile(ol); endFile(ol);
ol.popGeneratorState(); ol.popGeneratorState();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment