[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/edit/autofmt.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3a93e29c601078970fb6b2b27d3d9865a93ad4ad
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue May 14 12:56:06 2019 +0200
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Thu May 16 18:39:46 2019 +0200

    tdf#125261 sw_redlinehide: fix inf. loop in SwAutoFormat::AutoCorrect()
    
    The problem is that somehow a subraction of 1 from nPos made its way
    into commit 938f8a6b387828b8c18819184c47a5245bdfac8a, which is likely
    some copypasta blunder.
    
    Change-Id: I46362fb416b9078ffe441396bcf927bfa5a23fd7
    Reviewed-on: https://gerrit.libreoffice.org/72282
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit afb566b6d3b15b013007a71efe0949800aa22666)
    Reviewed-on: https://gerrit.libreoffice.org/72288
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    (cherry picked from commit b25317070ed36cc1c1e588871b4dd7e77d0a7f49)
    Reviewed-on: https://gerrit.libreoffice.org/72362
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 456008c5fdd5..3f7990f45e53 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2145,7 +2145,7 @@ void SwAutoFormat::AutoCorrect(TextFrameIndex nPos)
             if( m_aFlags.bAutoCorrect &&
                 aACorrDoc.ChgAutoCorrWord(reinterpret_cast<sal_Int32&>(nSttPos), sal_Int32(nPos), *pATst, nullptr))
             {
-                nPos = m_pCurTextFrame->MapModelToViewPos(*m_aDelPam.GetPoint()) - TextFrameIndex(1);
+                nPos = m_pCurTextFrame->MapModelToViewPos(*m_aDelPam.GetPoint());
 
                 if( m_aFlags.bWithRedlining )
                 {
@@ -2181,7 +2181,7 @@ void SwAutoFormat::AutoCorrect(TextFrameIndex nPos)
                     SetRedlineText( STR_AUTOFMTREDL_DETECT_URL ) &&
                     pATst->FnSetINetAttr(aACorrDoc, *pText, sal_Int32(nLastBlank), sal_Int32(nPos), eLang)))
             {
-                nPos = m_pCurTextFrame->MapModelToViewPos(*m_aDelPam.GetPoint()) - TextFrameIndex(1);
+                nPos = m_pCurTextFrame->MapModelToViewPos(*m_aDelPam.GetPoint());
             }
             else
             {