FindAdv: A try to handle backslashes in text

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 01969651532811f28285cec6f9f7192500b6c7fd..5ef7c91c9d09d42345c1fdd2e571bc37150a4bee 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1771,7 +1771,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
        catch (EncodingException const & e) {
                docstring const failed(1, e.failed_char);
                ostringstream oss;
-               oss << "0x" << hex << e.failed_char << dec;
+               oss << "0x" << hex << static_cast<uint32_t>(e.failed_char) << dec;
                if (getParFromID(e.par_id).paragraph().layout().pass_thru) {
                        docstring msg = bformat(_("Uncodable character '%1$s'"
                                                  " (code point %2$s)"),
@@ -2137,7 +2137,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
                // parsep in output_docbook.cpp).
                os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                   << "<!-- This DocBook file was created by LyX " << lyx_version
-                  << "\n  See http://www.lyx.org/ for more information -->\n";
+                  << "\n  See https://www.lyx.org/ for more information -->\n";
 
                // Directly output the root tag, based on the current type of document.
                string languageCode = params().language->code();
@@ -2592,18 +2592,16 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 }
 
 
-void Buffer::addBiblioInfo(BiblioInfo const & bin) const
+void Buffer::addBiblioInfo(BiblioInfo const & bi_in) const
 {
-       // We add the biblio info to the master buffer,
-       // if there is one, but also to every single buffer,
-       // in case a child is compiled alone.
-       BiblioInfo & bi = d->bibinfo_;
-       bi.mergeBiblioInfo(bin);
+       // We add the biblio info to the parent buffer,
+       // if there is one, but also to this buffer, in case
+       // it is compiled alone.
+       BiblioInfo & our_bi = d->bibinfo_;
+       our_bi.mergeBiblioInfo(bi_in);
 
-       if (parent() != nullptr) {
-               BiblioInfo & masterbi = parent()->d->bibinfo_;
-               masterbi.mergeBiblioInfo(bin);
-       }
+       if (parent())
+               parent()->addBiblioInfo(bi_in);
 }