Revert 23154.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 69e80791936b50565f9079ed6be466883ced80b7..c07f136c0efbde341861b30ec771d56fb59ce383 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -80,7 +80,14 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
                return checkAndLoadLyXFile(filename);
        }
 
-       if (filename.isReadableFile()) {
+       if (filename.exists()) {
+               if (!filename.isReadableFile()) {
+                       docstring text = bformat(_("The file %1$s exists but is not "
+                               "readable by the current user."),
+                               from_utf8(filename.absFilename()));
+                       Alert::error(_("File not readable!"), text);
+                       return 0;
+               }
                Buffer * b = theBufferList().newBuffer(filename.absFilename());
                if (!b)
                        // Buffer creation is not possible.
@@ -188,20 +195,19 @@ int countChars(DocIterator const & from, DocIterator const & to, bool with_blank
        int chars = 0;
        int blanks = 0;
        for (DocIterator dit = from ; dit != to ; dit.forwardPos()) {
-               Paragraph const para = dit.paragraph();
+
+               if (!dit.inTexted()) continue;
+               Paragraph const & par = dit.paragraph();
                pos_type const pos = dit.pos();
 
-               if (dit.inTexted()
-                   && pos != dit.lastpos()
-                   && !para.isDeleted(pos)) {
-                       if (para.isInset(pos)) {
-                               Inset const * ins = para.getInset(pos);
+               if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+                       if (Inset const * ins = par.getInset(pos)) {
                                if (ins->isLetter())
                                        ++chars;
-                               else if (ins->isSpace() && with_blanks)
+                               else if (with_blanks && ins->isSpace())
                                        ++blanks;
                        } else {
-                               char_type const c = para.getChar(pos);
+                               char_type const c = par.getChar(pos);
                                if (isPrintableNonspace(c))
                                        ++chars;
                                else if (isSpace(c) && with_blanks)
@@ -510,14 +516,4 @@ void updateLabels(Buffer const & buf, bool childonly)
 }
 
 
-void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
-{
-       if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
-               Buffer const * master = buffer.masterBuffer();
-               master->tocBackend().updateItem(par_it);
-               master->structureChanged();
-       }
-}
-
-
 } // namespace lyx