]> git.lyx.org Git - features.git/commitdiff
cosmetics
authorAndré Pönitz <poenitz@gmx.net>
Sat, 12 Jan 2008 16:34:02 +0000 (16:34 +0000)
committerAndré Pönitz <poenitz@gmx.net>
Sat, 12 Jan 2008 16:34:02 +0000 (16:34 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22525 a592a061-630c-0410-9148-cb99ea01b6c8

src/buffer_funcs.cpp

index 69e80791936b50565f9079ed6be466883ced80b7..54f5ece6d2d5172a3ef21f57c0a6f0eafeb564e6 100644 (file)
@@ -188,20 +188,18 @@ 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();
+               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 (dit.inTexted() && pos != dit.lastpos() && !par.isDeleted(pos)) {
+                       if (par.isInset(pos)) {
+                               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)