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

[Caolán McNamara (via logerrit)]

 sw/source/core/docnode/ndtbl.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 0d5affd7a25396dbff866adae524a4c01329801f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 5 21:08:04 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Aug 10 11:56:32 2020 +0200

    tdf#135098 update SwTableCursor m_SelectedBoxes before merge
    
    so it does not contain the soon to-be-deleted SwTableBox so if the rPam is
    queried via a11y it doesn't claim the deleted cell still exists.
    
    tdf#122844 may be the same issue
    
    Change-Id: I1ac3752676162ba5a29c0916039b2b467e2ac41a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100214
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 00e249b9e0fb..15a49729ce51 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2280,6 +2280,15 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
             while( &rPam != ( pTmp = pTmp->GetNext() ))
                 for( int i = 0; i < 2; ++i )
                     pTmp->GetBound( static_cast<bool>(i) ) = *rPam.GetPoint();
+
+            if (SwTableCursor* pTableCursor = dynamic_cast<SwTableCursor*>(&rPam))
+            {
+                // tdf#135098 update selection so rPam's m_SelectedBoxes is updated
+                // to not contain the soon to-be-deleted SwTableBox so if the rPam
+                // is queried via a11y it doesn't claim the deleted cell still
+                // exists
+                pTableCursor->NewTableSelection();
+            }
         }
 
         // Merge them