svn commit: r1603804 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/ui/wrtsh/wrtsh2.cxx

[orw]

Author: orw
Date: Thu Jun 19 10:01:55 2014
New Revision: 1603804

URL: http://svn.apache.org/r1603804
Log:
125050: correct text range for comment/annotation at a table cell selection

        cherry-picked from trunk


Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1600590

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main:r1600590

Modified: openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx?rev=1603804&r1=1603803&r2=1603804&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx Thu Jun 19 
10:01:55 2014
@@ -100,7 +100,10 @@ void SwWrtShell::Insert( SwField& rFld )
                 GetTblCrs()->Normalize( sal_False );
                 const SwPosition rStartPos( 
*(GetTblCrs()->GetMark()->nNode.GetNode().GetCntntNode()), 0 );
                 KillPams();
-                EndPara();
+                if ( !IsEndOfPara() )
+                {
+                    EndPara();
+                }
                 const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint() 
);
                 pAnnotationTextRange = new SwPaM( rStartPos, rEndPos );
             }