* sk.po

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 6b582b68024e82315136b0c70c9df817f6fd143f..f9ee02d602290af17426cd76dd22f5e2e91a9d71 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)) {
+               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);
@@ -185,6 +184,7 @@ int countWords(DocIterator const & from, DocIterator const & to)
 {
        int count = 0;
        bool inword = false;
+       
        for (DocIterator dit = from ; dit != to ; ) {
                if (!dit.inTexted()) {
                        dit.forwardPos();
@@ -193,9 +193,11 @@ 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
@@ -268,7 +270,7 @@ Buffer * loadIfNeeded(FileName const & fname)
                        // Buffer creation is not possible.
                        return 0;
 
-               if (!buffer->loadLyXFile(fname)) {
+               if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
                        //close the buffer we just opened
                        theBufferList().release(buffer);
                        return 0;