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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit d21b5b132976474338e57506fb04a2e9b294db9d
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Jan 12 16:00:46 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Jan 14 09:28:19 2021 +0100

    tdf#139566: Fix select all (table + text) when document window looses focus.
    
    Without setting mbSelectAll properly the selection cursor
    is converted to a SwShellTableCursor, which can't handle
    if a selection is extended outside of the table.
    
    Change-Id: Ibd43097ac782b9fc02ff818d3911ebcd20efbd21
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109185
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109205
    Tested-by: Jenkins
    (cherry picked from commit 68b1ae7b493eea4d77f36a0c8566ca0224f04798)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109123
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1aba8c3ac22f..701e2f16a7e9 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2430,6 +2430,8 @@ void SwCursorShell::ShellLoseFocus()
 
 void SwCursorShell::ShellGetFocus()
 {
+    comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll());
+
     m_bHasFocus = true;
     if( !m_bBasicHideCursor && VisArea().Width() )
     {