[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[László Németh]

 sw/source/core/frmedt/fecopy.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 46ed3c7fd370416186080a35e091dcbb50d533cf
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Mon Mar 16 11:04:46 2015 +0100

    tdf#37156 insert table copy as nested table in non-starting cell position
    
    Cherry-picked from 7600a2942ce2b9dac66836105bed6620d55abec2
    
    Change-Id: I7584ed179e92abcb10ef0e3a7e4e0d30d24f86bf
    Reviewed-on: https://gerrit.libreoffice.org/14879
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 4d05948..08bf192 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -815,7 +815,12 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
         FOREACHPAM_START(GetCrsr())
 
         if( pSrcNd &&
-            0 != ( pDestNd = GetDoc()->IsIdxInTbl( PCURCRSR->GetPoint()->nNode )))
+            0 != ( pDestNd = GetDoc()->IsIdxInTbl( PCURCRSR->GetPoint()->nNode )) &&
+            // are we at the beginning of the cell? (if not, we will insert a nested table)
+            // first paragraph of the cell?
+            PCURCRSR->GetNode().GetIndex() == PCURCRSR->GetNode().FindTableBoxStartNode()->GetIndex()+1 &&
+            // beginning of the paragraph?
+            !PCURCRSR->GetPoint()->nContent.GetIndex())
         {
             SwPosition aDestPos( *PCURCRSR->GetPoint() );