[Libreoffice-commits] core.git: sw/source

[Oliver-Rainer Wittmann]

 sw/source/uibase/wrtsh/wrtsh2.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 136cd0f3a55284c28279870369392ad80dffb0f9
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Jun 5 10:49:57 2014 +0000

    Resolves: #i125050# correct text range for comment/annotation...
    
    at a table cell selection
    
    (cherry picked from commit ec7fc735e031f643e324b0924a1f2ca753cb314d)
    
    Change-Id: I51fa9ab0a77ab06e295452216865d0fae44bc263

diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index e0cf20b..1abb581 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -91,7 +91,10 @@ void SwWrtShell::Insert(SwField &rFld)
                 GetTblCrs()->Normalize( 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 );
             }