svn commit: r1352469 - in /incubator/ooo/trunk: ./ main/sw/source/core/doc/docedt.cxx

[orw]

Author: orw
Date: Thu Jun 21 09:17:52 2012
New Revision: 1352469

URL: http://svn.apache.org/viewvc?rev=1352469&view=rev
Log:
#119681# - method <SwDoc::ReplaceRangeImpl(..)> - improve fix of #102333#
           - correct adjustment of <PaM> for joining paragraphs
merged from branch AOO34

Modified:
    incubator/ooo/trunk/   (props changed)
    incubator/ooo/trunk/main/sw/source/core/doc/docedt.cxx

Propchange: incubator/ooo/trunk/
------------------------------------------------------------------------------
  Merged /incubator/ooo/branches/AOO34:r1352456

Modified: incubator/ooo/trunk/main/sw/source/core/doc/docedt.cxx
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/doc/docedt.cxx?rev=1352469&r1=1352468&r2=1352469&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/doc/docedt.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/doc/docedt.cxx Thu Jun 21 09:17:52 
2012
@@ -2512,6 +2512,11 @@ SetRedlineMode( eOld );
                        rPam.GetMark()->nContent.Assign( 
aPtNd.GetNode().GetCntntNode(),
                                                                                
                nPtCnt );
 
+            if ( bJoinTxt && !bJoinPrev )
+            {
+                rPam.Move( fnMoveBackward );
+            }
+
                        if( pUndoRpl )
             {
                 pUndoRpl->SetEnd(rPam);