|
 |
f0633d |
From 70f90c08592ef3e50840afda20428078c25c463a Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com>
|
|
|
f0633d |
Date: Fri, 27 Dec 2013 09:45:05 +0100
|
|
|
f0633d |
Subject: [PATCH 085/109] Fix stepping to the next change
|
|
|
f0633d |
MIME-Version: 1.0
|
|
|
f0633d |
Content-Type: text/plain; charset=UTF-8
|
|
|
f0633d |
Content-Transfer-Encoding: 8bit
|
|
|
f0633d |
|
|
|
f0633d |
Bug description:
|
|
|
f0633d |
In the "Accept or Reject Changes" dialog, when select a change
|
|
|
f0633d |
(it should be after the first few ones) and clicking "Accept"
|
|
|
f0633d |
or "Reject" button, acception/rejection is made but after it
|
|
|
f0633d |
not the next change is selected for futher work,
|
|
|
f0633d |
but a random one. This bug doesn't appear in all case,
|
|
|
f0633d |
just if changes are complex enough.
|
|
|
f0633d |
|
|
|
f0633d |
Solution:
|
|
|
f0633d |
The nPos means absolute position so we have to get the next entry
|
|
|
f0633d |
with the corresponding GetEntryAtAbsPos() method. It seems simple
|
|
|
f0633d |
position can differ from absolute positions if changes are
|
|
|
f0633d |
complex enough.
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I7996f81c2a09c492f9334f071591291d200d533f
|
|
|
f0633d |
(cherry picked from commit dbd8a631bb23c588f52102e5dd2a61c9cd854bc3)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7209
|
|
|
f0633d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
sw/source/ui/misc/redlndlg.cxx | 4 ++--
|
|
|
f0633d |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
|
|
|
f0633d |
index 7885bb4..f1cc96d 100644
|
|
|
f0633d |
--- a/sw/source/ui/misc/redlndlg.cxx
|
|
|
f0633d |
+++ b/sw/source/ui/misc/redlndlg.cxx
|
|
|
f0633d |
@@ -830,9 +830,9 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept )
|
|
|
f0633d |
{
|
|
|
f0633d |
if( nPos >= pTable->GetEntryCount() )
|
|
|
f0633d |
nPos = pTable->GetEntryCount() - 1;
|
|
|
f0633d |
- pEntry = pTable->GetEntry( nPos );
|
|
|
f0633d |
+ pEntry = pTable->GetEntryAtAbsPos( nPos );
|
|
|
f0633d |
if( !pEntry && nPos-- )
|
|
|
f0633d |
- pEntry = pTable->GetEntry( nPos );
|
|
|
f0633d |
+ pEntry = pTable->GetEntryAtAbsPos( nPos );
|
|
|
f0633d |
if( pEntry )
|
|
|
f0633d |
{
|
|
|
f0633d |
pTable->Select( pEntry );
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|