[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/text/txtfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ea6f385d36966de8e30b9a537ac2875075ca9eb
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Apr 15 18:18:27 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Apr 16 14:34:10 2019 +0200

    tdf#124722 sw_redlinehide: don't set negative SwTextFrame offsets
    
    nLen may be larger than the master SwTextFrame, but its follow can't
    have negative offset.
    
    (regression from 0acde7514e666fc04805fd36503bd174162336ca)
    
    Change-Id: I6177c748480cdf61e8f15a7032ba52d3ae2ea52c
    Reviewed-on: https://gerrit.libreoffice.org/70816
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 66beb06d3928..90541798c63f 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1856,7 +1856,7 @@ static void lcl_ModifyOfst(SwTextFrame & rFrame,
     assert(nLen != TextFrameIndex(COMPLETE_STRING));
     if (rFrame.IsFollow() && nPos < rFrame.GetOfst())
     {
-        rFrame.ManipOfst( op(rFrame.GetOfst(), nLen) );
+        rFrame.ManipOfst( std::max(TextFrameIndex(0), op(rFrame.GetOfst(), nLen)) );
     }
 }