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

[Justin Luth (via logerrit)]

 sw/source/core/edit/acorrect.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 55a7fde6bbe62eb9be2f48f1e97ac86192d932c8
Author:     Justin Luth <justin_l...@sil.org>
AuthorDate: Thu Nov 11 12:28:21 2021 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Dec 21 23:51:46 2021 +0100

    tdf#139922 sw autocorr: don't return GetPrevPara if isEmpty
    
    This fixes a LO 6.2 regression caused by
    commit 4cf5a46f16dec8ce16c6662ce5c17903e28b8fa3.
    
    Change-Id: I4aee8f4e79a40a8b8f82faa3e62dead80a952510
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125037
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 59dc5d00b04927d07df2dcc3c17acfdc760d8765)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125144
    (cherry picked from commit 133fe29d06445daadc556cff013d5194a883ea9b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127156
    Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 7304e6e7b702..286d4d078de5 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -346,8 +346,11 @@ OUString const* SwAutoCorrDoc::GetPrevPara(bool const 
bAtNormalPos)
         }
         sw::GotoPrevLayoutTextFrame(*pIdx, rEditSh.GetLayout());
     }
-    if (pFrame && 0 == 
pFrame->GetTextNodeForParaProps()->GetAttrOutlineLevel())
+    if (pFrame && !pFrame->GetText().isEmpty() &&
+        0 == pFrame->GetTextNodeForParaProps()->GetAttrOutlineLevel())
+    {
         pStr = & pFrame->GetText();
+    }
 
     if( bUndoIdInitialized )
         bUndoIdInitialized = true;