Attachment 62532 Details for Bug 50386 – Proposed patch.

[patch] Proposed patch.

0001-fdo-50386-Page-count-field-makes-scrolling-impossibl.patch (text/plain), 1.55 KB, created by Muhammad Haggag on 2012-06-04 11:33:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Haggag

Created: 2012-06-04 11:33:00 UTC

Size: 1.55 KB

patch

obsolete

>From 77487c0ad811166ebffa10761bc66f8c8f460af1 Mon Sep 17 00:00:00 2001
>From: Muhammad Haggag <mhaggag@gmail.com>
>Date: Mon, 4 Jun 2012 20:25:19 +0200
>Subject: [PATCH] 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
>---
> sw/source/ui/uiview/view2.cxx |    4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
>index 7b37adb..ceec38d 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;
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 50386: 62532