From 46ed3c7fd370416186080a35e091dcbb50d533cf Mon Sep 17 00:00:00 2001 From: László Németh Date: Mon, 16 Mar 2015 11:04:46 +0100 Subject: 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 Tested-by: Adolfo Jayme Barrientos --- sw/source/core/frmedt/fecopy.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 4d059483f08b..08bf192d55ab 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() ); -- cgit v1.2.3