Fix up a few little things after r29065. If we're calculating the autosave

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index be8c369ab65912289700af63a0280be34855960d..f0db8396def4261ed8db6c33273f290c372466ad 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -76,7 +76,7 @@ docstring BibTeXInfo::getValueForKey(string const & key,
                BibTeXInfo const * const xref) const
 {
        docstring const ret = operator[](key);
-       if (!ret.empty() or !xref)
+       if (!ret.empty() || !xref)
                return ret;
        return (*xref)[key];
 }
@@ -292,7 +292,7 @@ namespace {
 } // anon namespace
 
 
-docstring const BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
+docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
 {
        if (!info_.empty())
                return info_;
@@ -304,7 +304,7 @@ docstring const BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
        }
  
        // FIXME
-       // This could be made a lot better using the entryType
+       // This could be made a lot better using the entry_type_
        // field to customize the output based upon entry type.
        
        // Search for all possible "required" fields
@@ -318,9 +318,9 @@ docstring const BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
        if (docLoc.empty()) {
                docLoc = getValueForKey("chapter", xref);
                if (!docLoc.empty())
-                       docLoc = from_ascii("Ch. ") + docLoc;
+                       docLoc = _("Ch. ") + docLoc;
        }       else {
-               docLoc = from_ascii("pp. ") + docLoc;
+               docLoc = _("pp. ") + docLoc;
        }
 
        docstring media = getValueForKey("journal", xref);
@@ -353,7 +353,8 @@ docstring const BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
        }
 
        // This should never happen (or at least be very unusual!)
-       return docstring();
+       static docstring e = docstring();
+       return e;
 }