summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2016-08-31 09:54:10 (GMT)
committerGitHub <noreply@github.com>2016-08-31 09:54:10 (GMT)
commitb6897f487f3bda29dbb1eb91e5863ca579222a07 (patch)
treea31c845ac4666624b1ccaac85ead1811385b06f2
parent02c694ba798c09fc9093e2cb9bb927a41115d049 (diff)
parent2b229f69041023f5f473385ee587ef7743850f55 (diff)
downloadDoxygen-b6897f487f3bda29dbb1eb91e5863ca579222a07.zip
Doxygen-b6897f487f3bda29dbb1eb91e5863ca579222a07.tar.gz
Doxygen-b6897f487f3bda29dbb1eb91e5863ca579222a07.tar.bz2
Merge pull request #511 from albert-github/feature/bug_code_unparsed
Bug 737472 - HTML code special commands unconditionally include line numbers
-rw-r--r--src/fileparser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fileparser.cpp b/src/fileparser.cpp
index b54b243..6883622 100644
--- a/src/fileparser.cpp
+++ b/src/fileparser.cpp
@@ -22,7 +22,7 @@ void FileParser::parseCode(CodeOutputInterface &codeOutIntf,
SrcLangExt, // lang
bool, // isExampleBlock
const char *, // exampleName
- FileDef *, // fileDef
+ FileDef * fileDef,
int startLine,
int endLine,
bool, // inlineFragment
@@ -40,8 +40,8 @@ void FileParser::parseCode(CodeOutputInterface &codeOutIntf,
int j=i;
while (j<length && input[j]!='\n') j++;
QCString lineStr = input.mid(i,j-i);
- codeOutIntf.startCodeLine(showLineNumbers);
- if (showLineNumbers) codeOutIntf.writeLineNumber(0,0,0,lineNr);
+ codeOutIntf.startCodeLine(fileDef != 0 && showLineNumbers);
+ if (fileDef != 0 && showLineNumbers) codeOutIntf.writeLineNumber(0,0,0,lineNr);
if (!lineStr.isEmpty()) codeOutIntf.codify(lineStr);
codeOutIntf.endCodeLine();
lineNr++;