sw/source/core/edit/autofmt.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b25317070ed36cc1c1e588871b4dd7e77d0a7f49
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue May 14 12:56:06 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed May 15 09:25:21 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.st...@cib.de>
(cherry picked from commit afb566b6d3b15b013007a71efe0949800aa22666)
Reviewed-on: https://gerrit.libreoffice.org/72288
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
