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

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 18 18:17:48 UTC 2020


 sw/source/core/crsr/viscrs.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08b86198bd03af1655877f525e55bc6190635f4e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Jun 18 14:13:03 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Jun 18 20:17:18 2020 +0200

    sw: try not to layout in SwShellTableCursor::FillRects()
    
    This crashes after Undo in tdf#134021 bugdoc, because there's no Action
    there so a SwTabFrame::RemoveFollowFlowLine() deletes a row and a11y
    events are sent synchronously, then the a11y code calls back into sw
    and accesses semi-connected cell frames.
    
    Change-Id: I98e8acf4756a44b8776e01d6b831d4b1494792f2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96603
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit c4a4c766483aa18119f051a3885943781a5e68ea)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96589

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index c9d7661cc10f..6f3a1e3b633d 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -866,7 +866,7 @@ void SwShellTableCursor::FillRects()
         if( !pCNd )
             continue;
 
-        std::pair<Point, bool> const tmp(GetSttPos(), true);
+        std::pair<Point, bool> const tmp(GetSttPos(), false);
         SwFrame* pFrame = pCNd->getLayoutFrame(GetShell()->GetLayout(), nullptr, &tmp);
         while( pFrame && !pFrame->IsCellFrame() )
             pFrame = pFrame->GetUpper();


More information about the Libreoffice-commits mailing list