diff options
author | albert-github <albert.tests@gmail.com> | 2014-08-03 17:17:44 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-08-18 09:32:19 (GMT) |
commit | 1f77638174f715f0f2bcf5b2e32ebb329d531f85 (patch) | |
tree | 912cf1efe41d7e5e71cccc8839cb3953027071c5 | |
parent | ca80d3cda3522a15c6d7149f79103c0aed660400 (diff) | |
download | Doxygen-1f77638174f715f0f2bcf5b2e32ebb329d531f85.zip Doxygen-1f77638174f715f0f2bcf5b2e32ebb329d531f85.tar.gz Doxygen-1f77638174f715f0f2bcf5b2e32ebb329d531f85.tar.bz2 |
No warning in case cite definition is missing
In case the \cite command is used but no entry for it is given in a bib file no warning is given as the CiteInfo entry is present with the right label, but the text item is empty and this is not tested.
(also corrected an error message on opening a file)
-rw-r--r-- | src/cite.cpp | 2 | ||||
-rw-r--r-- | src/docparser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cite.cpp b/src/cite.cpp index 378e7ee..a33f12f 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -211,7 +211,7 @@ void CiteDict::generatePage() const f.setName(citeListFile); if (!f.open(IO_ReadOnly)) { - err("could not open file %s/citelist.doc for reading\n",outputDir.data()); + err("could not open file %s for reading\n",citeListFile.data()); } bool insideBib=FALSE; diff --git a/src/docparser.cpp b/src/docparser.cpp index bab0c75..62d3c06 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -2465,7 +2465,7 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont ASSERT(!target.isEmpty()); m_relPath = g_relPath; CiteInfo *cite = Doxygen::citeDict->find(target); - if (numBibFiles>0 && cite) // ref to citation + if (numBibFiles>0 && cite && cite -> text) // ref to citation { m_text = cite->text; if (m_text.isEmpty()) m_text = cite->label; |