summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Haggag <mhaggag@gmail.com>2012-06-04 20:25:19 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-05 19:39:03 +0200
commita8080cad1089431a2d97903f73623eabe2eb23a7 (patch)
treec2aeeebf6a78ba8f453768c302895004f2cee1a7
parent3ec6e1378545b5d5071531d1f6de259ac9028176 (diff)
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
-rw-r--r--sw/source/ui/uiview/view2.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 58b5ce4289b3..73a8b9672817 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;