[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sw/source

[Michael Stahl (via logerrit)]

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

New commits:
commit 12a2344406bec493b2fdc23910fc9cc6f0123ccc
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 17 17:40:48 2020 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Jun 18 14:48:44 2020 +0200

    tdf#133982 sw: fix Copy of document that starts with nested table
    
    Started to assert with ef8427d12a63127a2eb867637699343d630545dd
    because a bookmark was created on the wrong node but this never worked.
    
    Change-Id: Ife01a3c8041b4c7d08b2d749dde77ced388f7215
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96556
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 4de190d55900387bc07971bac84f7cd52e329146)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96578
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    (cherry picked from commit 7866336f1ce3d5b686847e98a218e6b4d4ca9db5)

diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 1900be46994a..efc9e2923841 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -231,7 +231,12 @@ bool SwEditShell::CopySelToDoc( SwDoc* pInsDoc )
                         // Selection starts at the first para of the first cell,
                         // but we want to copy the table and the start node before
                         // the first cell as well.
-                        aPaM.Start()->nNode = aPaM.Start()->nNode.GetNode().FindTableNode()->GetIndex();
+                        // tdf#133982 tables can be nested
+                        while (SwTableNode const* pTableNode =
+                            aPaM.Start()->nNode.GetNode().StartOfSectionNode()->FindTableNode())
+                        {
+                            aPaM.Start()->nNode = *pTableNode;
+                        }
                         aPaM.Start()->nContent.Assign(nullptr, 0);
                     }
                     bRet = GetDoc()->getIDocumentContentOperations().CopyRange( aPaM, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true ) || bRet;