[Libreoffice] [REVIEW 3.4(.2)] The number of paragraphs always zerro

Hi,

https://bugs.freedesktop.org/show_bug.cgi?id=36816

The attached patch fixes that - in the original code we were
incrementing the number of paragraphs as the first thing, so I have just
moved the ++rStart.nPara to the original location.

Would be great to get 3 reviews to get it to 3.4.2 :-)

Regards,
Kendy

From 10d13645d3c7701271884eb06fdab90a3ea1fab2 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Wed, 13 Jul 2011 20:17:35 +0200
Subject: [PATCH] Fix counting the paragraphs, fdo#36816.

---
 sw/source/core/txtnode/txtedt.cxx |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 08d0c6b..d54875a 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1803,6 +1803,10 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
     {   // not counting hidden paras
         return;
     }
+
+    // count of non-empty paras
+    ++rStat.nPara;
+
     // Shortcut when counting whole paragraph and current count is clean
     if ( isCountAll && !IsWordCountDirty() )
     {
@@ -1842,8 +1846,6 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
     sal_uInt32 nTmpChars = 0;        // count of all chars
     sal_uInt32 nTmpCharsExcludingSpaces = 0;  // all non-white chars
 
-    ++rStat.nPara;      // count of non-empty paras
-
     // count words in masked and expanded text:
     if( pBreakIt->GetBreakIter().is() )
     {
-- 
1.7.5.4