sw/source/core/frmedt/fecopy.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 90e12e00da614311620b36973aca5d5f4c78516e
Author: László Németh <laszlo.nem...@collabora.com>
Date: Mon Mar 16 11:04:46 2015 +0100
fdo#37156 insert table copy as nested table in non-starting cell position
Cherry-picked from 7600a2942ce2b9dac66836105bed6620d55abec2
Change-Id: I7584ed179e92abcb10ef0e3a7e4e0d30d24f86bf
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index cd6abb8..b9c6f8f 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -813,7 +813,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() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
