Commit e864a6ca authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Merge branch 'albert-github-feature/bug_no_warning_on_cite'

parents ca80d3cd c31a81a8

src/cite.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ void CiteDict::generatePage() const 
  f.setName(citeListFile);

  f.setName(citeListFile);

  if (!f.open(IO_ReadOnly)) 

  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;

  bool insideBib=FALSE;

src/docparser.cpp

+5 −6
Original line number Original line Diff line number Diff line
@@ -2465,10 +2465,9 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont 
  ASSERT(!target.isEmpty());

  ASSERT(!target.isEmpty());

  m_relPath = g_relPath;

  m_relPath = g_relPath;

  CiteInfo *cite = Doxygen::citeDict->find(target);

  CiteInfo *cite = Doxygen::citeDict->find(target);

  if (numBibFiles>0 && cite) // ref to citation

  if (numBibFiles>0 && cite && !cite->text.isEmpty()) // ref to citation

  {

  {

    m_text         = cite->text;

    m_text         = cite->text;

    if (m_text.isEmpty()) m_text = cite->label;

    m_ref          = cite->ref;

    m_ref          = cite->ref;

    m_anchor       = CiteConsts::anchorPrefix+cite->label;

    m_anchor       = CiteConsts::anchorPrefix+cite->label;

    m_file         = convertNameToFile(CiteConsts::fileName,FALSE,TRUE);

    m_file         = convertNameToFile(CiteConsts::fileName,FALSE,TRUE);
@@ -2476,7 +2475,7 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont 
    //    m_text.data(),m_ref.data(),m_file.data(),m_anchor.data());

    //    m_text.data(),m_ref.data(),m_file.data(),m_anchor.data());

    return;

    return;

  }

  }

  m_text = linkToText(SrcLangExt_Unknown,target,FALSE);

  m_text = target;

  warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve reference to `%s' for \\cite command",

  warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve reference to `%s' for \\cite command",

           qPrint(target));

           qPrint(target));

}

}