anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify code in BiblioInfo.cpp

Browse Source 
... and avoid MSVC warning

Fixes bug #10905
This commit is contained in:
Jean-Marc Lasgouttes 2017-12-14 15:41:54 +01:00
parent 639d63607a
commit eebea6284d
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/BiblioInfo.cpp
View File

@ -1261,10 +1261,8 @@ docstring const BiblioInfo::getYear(docstring const & key, bool use_modifier) co
if (xrefs.empty())
// no luck
return docstring();
vector<docstring>::const_iterator it = xrefs.begin();
vector<docstring>::const_iterator en = xrefs.end();
for (; it != en; ++it) {
BiblioInfo::const_iterator const xrefit = find(*it);
for (docstring const & xref : xrefs) {
BiblioInfo::const_iterator const xrefit = find(xref);
if (xrefit == end())
continue;
BibTeXInfo const & xref_data = xrefit->second;
@ -1298,14 +1296,10 @@ docstring const BiblioInfo::getInfo(docstring const & key,
BibTeXInfo const & data = it->second;
BibTeXInfoList xrefptrs;
vector<docstring> const xrefs = getXRefs(data);
if (!xrefs.empty()) {
vector<docstring>::const_iterator it = xrefs.begin();
vector<docstring>::const_iterator en = xrefs.end();
for (; it != en; ++it) {
BiblioInfo::const_iterator const xrefit = find(*it);
if (xrefit != end())
xrefptrs.push_back(&(xrefit->second));
}
for (docstring const & xref : getXRefs(data)) {
BiblioInfo::const_iterator const xrefit = find(xref);
if (xrefit != end())
xrefptrs.push_back(&(xrefit->second));
}
return data.getInfo(xrefptrs, buf, ci);
}
@ -1337,15 +1331,10 @@ docstring const BiblioInfo::getLabel(vector<docstring> keys,
vector<BibTeXInfo const *> xrefptrs;
if (it != end()) {
data = it->second;
vector<docstring> const xrefs = getXRefs(data);
if (!xrefs.empty()) {
vector<docstring>::const_iterator it = xrefs.begin();
vector<docstring>::const_iterator en = xrefs.end();
for (; it != en; ++it) {
BiblioInfo::const_iterator const xrefit = find(*it);
if (xrefit != end())
xrefptrs.push_back(&(xrefit->second));
}
for (docstring const & xref : getXRefs(data)) {
BiblioInfo::const_iterator const xrefit = find(xref);
if (xrefit != end())
xrefptrs.push_back(&(xrefit->second));
}
}
ret = data.getLabel(xrefptrs, buf, ret, ci, key + 1 != ken, i == 1);