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

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/crsrsh.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a7fbac52b29da29564e1533030f111ec7e4e9ac
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed May 17 14:49:55 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon May 22 11:27:32 2023 +0200

    tdf#155346 sw: fix crash from changing modal mode
    
    When closing the dialog, UpdateCursor() creates a table cursor for
    ExtendedSelectedAll() because mbSelectAll isn't set.
    
    1  SwShellTableCursor::SwShellTableCursor
    2  SwCursorShell::UpdateCursor
    3  SwCursorShell::ShowCursor
    4  SwView::ShowCursor
    5  SfxViewFrame::Enable
    6  SfxViewFrame::Notify
    7  SfxBroadcaster::Broadcast
    8  SfxObjectShell::SetModalMode_Impl
    9  SfxViewFrame::SetModalMode
    
    (regression from commit d81379db730a163c5ff75d4f3a3cddbd7b5eddda)
    
    Change-Id: Ie73f8e42f764f8041288eb0850721a530d106a0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151880
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 1458d2f935c50ab7f3e2f1277d1bc7d1b5b5f894)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151926
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 53ccb4a839d3..03cecdbbd8bf 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2661,6 +2661,8 @@ void SwCursorShell::ShowCursor()
     if( m_bBasicHideCursor )
         return;
 
+    comphelper::FlagRestorationGuard g(mbSelectAll, StartsWith_() != 
StartsWith::None && ExtendedSelectedAll());
+
     m_bSVCursorVis = true;
     m_pCurrentCursor->SetShowTextInputFieldOverlay( true );
     m_pCurrentCursor->SetShowContentControlOverlay(true);