[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Michael Stahl]

 sw/source/core/txtnode/txtedt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29ff3d49c8f0bc45a322d3ab67300bd269593181
Author: Muhammad Haggag <mhaggag at gmail.com>
Date:   Sat Jun 9 23:48:27 2012 +0200

    fdo#50141: Character count (with spaces) incorrect with numbering on.
    
    There was a typo in the character counting code of text nodes. When a numbered list is detected, the code attempts to add the character count of the "item number" to the total count, but ends up overwriting it instead (uses '=' instead of '+='). This resulted in the item number strings to be the only ones counted in a numbered list.
    
    Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4
    (cherry picked from commit a585863f013aa4207270e11f5e031126adf1ed4a)

diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index f65bfe9..3fbef67 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1939,7 +1939,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
                 nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord);
             }
 
-            nTmpChars = pBreakIt->getGraphemeCount(aNumString);
+            nTmpChars += pBreakIt->getGraphemeCount(aNumString);
         }
         else if ( HasBullet() )
         {