sw/source/core/crsr/crsrsh.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit c2efddb1839ef5936daf69e62f4b9436bbbbc6cd
Author: Michael Stahl <[email protected]>
AuthorDate: Wed May 17 14:49:55 2023 +0200
Commit: Xisco Fauli <[email protected]>
CommitDate: Tue May 30 21:41:17 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 <[email protected]>
(cherry picked from commit 1458d2f935c50ab7f3e2f1277d1bc7d1b5b5f894)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151926
Reviewed-by: Xisco Fauli <[email protected]>
(cherry picked from commit 9d8d7fc60c345e02e8d73a3c2476c00217066885)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152093
Reviewed-by: Ilmari Lauhakangas <[email protected]>
Reviewed-by: Hossein <[email protected]>
Tested-by: Xisco Fauli <[email protected]>
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);
