Fix #1736

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index dab77c8994fa160c83bf38f807ddb019f279b6cb..154f365ffd9cb88e35abaa3af481fa2a7126de09 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -93,7 +93,7 @@ using lyx::support::createBufferTmpDir;
 using lyx::support::destroyDir;
 using lyx::support::FileInfo;
 using lyx::support::FileInfo;
-using lyx::support::getExtFromContents;
+using lyx::support::getFormatFromContents;
 using lyx::support::IsDirWriteable;
 using lyx::support::IsFileWriteable;
 using lyx::support::LibFileSearch;
@@ -532,7 +532,7 @@ void Buffer::insertStringAsLines(ParagraphList & pars,
 bool Buffer::readFile(string const & filename)
 {
        // Check if the file is compressed.
-       string const format = getExtFromContents(filename);
+       string const format = getFormatFromContents(filename);
        if (format == "gzip" || format == "zip" || format == "compress") {
                params().compressed = true;
        }
@@ -1032,12 +1032,12 @@ void Buffer::makeLinuxDocFile(string const & fname,
                ofs << ">\n\n";
 
                if (params().options.empty())
-                       sgml::openTag(*this, ofs, 0, false, top_element);
+                       sgml::openTag(ofs, top_element);
                else {
                        string top = top_element;
                        top += ' ';
                        top += params().options;
-                       sgml::openTag(*this, ofs, 0, false, top);
+                       sgml::openTag(ofs, top);
                }
        }
 
@@ -1049,7 +1049,7 @@ void Buffer::makeLinuxDocFile(string const & fname,
 
        if (!body_only) {
                ofs << "\n\n";
-               sgml::closeTag(ofs, 0, false, top_element);
+               sgml::closeTag(ofs, top_element);
        }
 
        ofs.close();
@@ -1095,7 +1095,7 @@ void Buffer::makeDocBookFile(string const & fname,
                        preamble += "<!ENTITY % output.print.eps \"IGNORE\">\n";
                        preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
                }
-                       
+
                string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
                         : fname;
                preamble += features.getIncludedFiles(name);
@@ -1126,10 +1126,10 @@ void Buffer::makeDocBookFile(string const & fname,
 
        params().getLyXTextClass().counters().reset();
 
-       sgml::openTag(*this, ofs, 0, false, top);
+       sgml::openTag(ofs, top);
        ofs << '\n';
        docbookParagraphs(paragraphs(), *this, ofs, runparams);
-       sgml::closeTag(ofs, 0, false, top_element);
+       sgml::closeTag(ofs, top_element);
 
        ofs.close();
        if (ofs.fail())
@@ -1323,9 +1323,9 @@ void Buffer::changeLanguage(Language const * from, Language const * to)
        // Take care of l10n/i18n
        updateDocLang(to);
 
-       ParIterator end = par_iterator_end();
-       for (ParIterator it = par_iterator_begin(); it != end; ++it)
-               it->changeLanguage(params(), from, to);
+       for_each(par_iterator_begin(),
+                par_iterator_end(),
+                bind(&Paragraph::changeLanguage, _1, params(), from, to));
 }
 
 
@@ -1367,20 +1367,8 @@ ParIterator Buffer::getParFromID(int id) const
 
 bool Buffer::hasParWithID(int id) const
 {
-       ParConstIterator it = par_iterator_begin();
-       ParConstIterator end = par_iterator_end();
-
-       if (id < 0) {
-               // John says this is called with id == -1 from undo
-               lyxerr << "hasParWithID(), id: " << id << endl;
-               return 0;
-       }
-
-       for (; it != end; ++it)
-               if (it->id() == id)
-                       return true;
-
-       return false;
+       ParConstIterator it = getParFromID(id);
+       return it != par_iterator_end();
 }