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

[Michael Stahl]

 sw/source/ui/uiview/view2.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 59ea2faff4e938c77c71ec89bf9b6ea17a446cd1
Author: Muhammad Haggag <mhaggag at gmail.com>
Date:   Mon Jun 4 20:25:19 2012 +0200

    fdo#50386 Page count field makes scrolling impossible
    
    (Also fixes fdo#50540 View area jumps when start drawing)
    
    The word count code for the status bar was calling EndAction, which scrolls the view to focus on the cursor.
    We were calling it directly (Start/EndAction) and indirectly (through SwWrtShell::GetUpdatedDocStat). I removed the
    direct calls and replaced the SwWrtShell call with SwDoc::GetUpdatedDocStat, which doesn't call Start/EndAction.
    
    Change-Id: I764e8c2d9c10f8eb685d36d0e26142cf3fee628c
    (cherry picked from commit a8080cad1089431a2d97903f73623eabe2eb23a7)

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 58b5ce4..73a8b96 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1205,10 +1205,8 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 SwDocStat documentStats;
                 {
                     SwWait aWait( *GetDocShell(), sal_True );
-                    rShell.StartAction();
                     rShell.CountWords(selectionStats);
-                    documentStats = rShell.GetUpdatedDocStat();
-                    rShell.EndAction();
+                    documentStats = rShell.GetDoc()->GetUpdatedDocStat();
                 }
 
                 const sal_uInt32 stringId = selectionStats.nWord? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;