* InsetSpecialChar.cpp:

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index f9ee02d602290af17426cd76dd22f5e2e91a9d71..c3e277c433a1b6299243c2c3540a0c5df264187b 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -185,7 +185,7 @@ 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;
@@ -202,6 +202,8 @@ int countWords(DocIterator const & from, DocIterator const & to)
                        if (ins && !ins->producesOutput()) {
                                //skip this inset
                                ++dit.top().pos();
+                               if (dit >= to)
+                                       break;
                                continue;
                        }
                        if (par.isWordSeparator(pos))