Fix bug 4493 - countChars assert.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 54f5ece6d2d5172a3ef21f57c0a6f0eafeb564e6..8ca9ea36b36080db684aa0f273739a06c14009b6 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -188,10 +188,12 @@ 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()) {
+
+               if (!dit.inTexted()) continue;
                Paragraph const & par = dit.paragraph();
                pos_type const pos = dit.pos();
 
-               if (dit.inTexted() && pos != dit.lastpos() && !par.isDeleted(pos)) {
+               if (pos != dit.lastpos() && !par.isDeleted(pos)) {
                        if (par.isInset(pos)) {
                                Inset const * ins = par.getInset(pos);
                                if (ins->isLetter())
@@ -508,14 +510,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