Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index d306c87e5f149cfb254327fb3748f2a71aac1c89..44321bcad3f90a62a7e25489757a7da6603a6f75 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -756,8 +756,7 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
                ret = html::cleanAttr(ret);
 
        // make sure it is not too big
-       if (ret.size() > maxsize)
-               ret = ret.substr(0, maxsize - 3) + from_ascii("...");
+       support::truncateWithEllipsis(ret, maxsize);
        return ret;
 }
 
@@ -928,14 +927,9 @@ docstring const BiblioInfo::getLabel(vector<docstring> keys,
                        before, after, dialog, key + 1 != ken);
        }
 
-       if (ret.size() > max_size) {
-               ret.resize(max_size - 3);
-               ret += "...";
-       } else if (too_many_keys) {
-               if (ret.size() > max_size - 3)
-                       ret.resize(max_size - 3);
-               ret += "...";
-       }
+       if (too_many_keys)
+               ret.push_back(0x2026);//HORIZONTAL ELLIPSIS
+       support::truncateWithEllipsis(ret, max_size);
        return ret;
 }
 
@@ -1066,6 +1060,11 @@ void BiblioInfo::makeCitationLabels(Buffer const & buf)
                        docstring const num = convert<docstring>(++keynumber);
                        entry.setCiteNumber(num);
                } else {
+                       // coverity complains about our derefercing the iterator last,
+                       // which was not initialized above. but it does get initialized
+                       // after the first time through the loop, which is the point of
+                       // the first test.
+                       // coverity[FORWARD_NULL]
                        if (it != cited_entries_.begin()
                            && entry.getAbbreviatedAuthor() == last->second.getAbbreviatedAuthor()
                            // we access the year via getYear() so as to get it from the xref,