summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-11-18 14:07:11 +0100
committerMichael Stahl <mstahl@redhat.com>2011-11-18 22:24:19 +0100
commite0d4e6f22a4290a4b11a342fd59523b28963838c (patch)
tree76d5d793be59333234aaca5bfdc299b2252e1519
parent74f53711fa7e54c4d449912be53c50eebb002451 (diff)
i#102333: SwDoc::ReplaceRangeImpl:
The fix for this (230fcf4a456636bb466f72834cd57238621d206d) was not quite right; there are 2 different join modes, and moving the cursor backward is required in one of them, but not the other. This can be seen when doing replace all ^$ with several consecutive empty lines.
-rw-r--r--sw/source/core/doc/docedt.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 22292b44d445..d6736f5d9465 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2481,6 +2481,11 @@ SetRedlineMode( eOld );
rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
nPtCnt );
+ if (bJoinTxt && !bJoinPrev)
+ {
+ rPam.Move(fnMoveBackward);
+ }
+
if( pUndoRpl )
{
pUndoRpl->SetEnd(rPam);