* InsetSpecialChar.cpp:

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index e5ce08efb90e43629898bb6683f9dabf7a2b4744..c3e277c433a1b6299243c2c3540a0c5df264187b 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -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);
@@ -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);
@@ -185,7 +184,8 @@ int countWords(DocIterator const & from, DocIterator const & to)
 {
        int count = 0;
        bool inword = false;
-       for (DocIterator dit = from ; dit != to ; ) {
+       
+       for (DocIterator dit = from ; dit != to && !dit.empty(); ) {
                if (!dit.inTexted()) {
                        dit.forwardPos();
                        continue;
@@ -193,13 +193,17 @@ 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
                                ++dit.top().pos();
+                               if (dit >= to)
+                                       break;
                                continue;
                        }
                        if (par.isWordSeparator(pos)) 
@@ -268,7 +272,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;