tex2lyx/preamble.cpp: revert r39962 (the string initialization was already reverted)

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 5b972e5e0af210044a6085e03c7ab56a79976523..ff4512b5c6a1279774f434f957140bd294ad90cd 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -75,7 +75,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                if (!Alert::prompt(_("Reload saved document?"),
                          text, 0, 1,  _("&Reload"), _("&Keep Changes"))) {
                        // reload the document
-                       if (!checkBuffer->reload())
+                       if (checkBuffer->reload() != Buffer::ReadSuccess)
                                return 0;
                }
                return checkBuffer;
@@ -94,7 +94,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                        // Buffer creation is not possible.
                        return 0;
                }
-               if (b->loadLyXFile(filename) != Buffer::ReadSuccess) {
+               if (b->loadLyXFile() != Buffer::ReadSuccess) {
                        // do not save an emergency file when releasing the buffer
                        b->markClean();
                        theBufferList().release(b);
@@ -116,7 +116,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 
 // FIXME newFile() should probably be a member method of Application...
 Buffer * newFile(string const & filename, string const & templatename,
-                bool const isNamed)
+                bool is_named)
 {
        // get a free buffer
        Buffer * b = theBufferList().newBuffer(filename);
@@ -132,7 +132,7 @@ Buffer * newFile(string const & filename, string const & templatename,
                tname = makeAbsPath(templatename);
 
        if (!tname.empty()) {
-               if (!b->readFile(tname)) {
+               if (b->loadThisLyXFile(tname) != Buffer::ReadSuccess) {
                        docstring const file = makeDisplayPath(tname.absFileName(), 50);
                        docstring const text  = bformat(
                                _("The specified document template\n%1$s\ncould not be read."),
@@ -143,13 +143,12 @@ Buffer * newFile(string const & filename, string const & templatename,
                }
        }
 
-       if (!isNamed) {
-               b->setUnnamed();
-               b->setFileName(filename);
-       } else
-               // in this case, the user chose the filename, so we assume that she
-               // really does want this file.
+       if (is_named)
+               // in this case, the user chose the filename, so we
+               // assume that she really does want this file.
                b->markDirty();
+       else
+               b->setUnnamed();
 
        b->setReadonly(false);
        b->setFullyLoaded(true);
@@ -180,12 +179,19 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
  * are similar but, unfortunately, they seem to have a different
  * notion of what to count. Since nobody ever complained about that,
  * this proves (again) that any number beats no number ! (JMarc)
+ * We have two use cases:
+ * 1. Count the words of the given range for document statistics
+ * - ignore inset content without output. (skipNoOutput == true)
+ * 2. Count the words to present a progress bar for the spell checker
+ * - has to count whole content. (skipNoOutput == false)
  */
-int countWords(DocIterator const & from, DocIterator const & to)
+int countWords(DocIterator const & from, DocIterator const & to,
+                          bool skipNoOutput)
 {
        int count = 0;
        bool inword = false;
-       for (DocIterator dit = from ; dit != to ; ) {
+       
+       for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
                if (!dit.inTexted()) {
                        dit.forwardPos();
                        continue;
@@ -193,13 +199,18 @@ int countWords(DocIterator const & from, DocIterator const & to)
                
                Paragraph const & par = dit.paragraph();
                pos_type const pos = dit.pos();
-               
+
                // Copied and adapted from isWordSeparator() in Paragraph
-               if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+               if (pos == dit.lastpos()) {
+                       inword = false;
+               } else if (!par.isDeleted(pos)) {
                        Inset const * ins = par.getInset(pos);
-                       if (ins && !ins->producesOutput()) {
-                               //skip this inset
+                       if (ins && skipNoOutput && !ins->producesOutput()) {
+                               // skip this inset
                                ++dit.top().pos();
+                               // stop if end of range was skipped
+                               if (!to.atEnd() && dit >= to)
+                                       break;
                                continue;
                        }
                        if (par.isWordSeparator(pos)) 
@@ -268,7 +279,7 @@ Buffer * loadIfNeeded(FileName const & fname)
                        // Buffer creation is not possible.
                        return 0;
 
-               if (buffer->loadLyXFile(fname) != Buffer::ReadSuccess) {
+               if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
                        //close the buffer we just opened
                        theBufferList().release(buffer);
                        return 0;