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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8par6.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f3deaa2963d3b240b4770d6494d539de68a310f
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Wed Apr 7 12:27:51 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Fri Apr 9 14:42:59 2021 +0200

    if (x > 0), then there is no need for abs(x)
    
    and the if() was added at the same times as abs().
    Sigh.
    
    Change-Id: I04431b7f17f92471eb7adcf786c3d14587ce1a01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113780
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index bf9569c16aab..16572f2905cb 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -617,7 +617,7 @@ void wwSectionManager::GetPageULData(const wwSection &rSection,
         // #i19922# - correction:
         // consider that <nWWUp> can be negative, compare only if it's positive
         if ( nWWUp > 0 &&
-             o3tl::make_unsigned(abs(nWWUp)) >= nWWHTop )
+             o3tl::make_unsigned(nWWUp) >= nWWHTop )
             rData.nSwHLo = nWWUp - nWWHTop;
         else
             rData.nSwHLo = 0;
@@ -635,7 +635,7 @@ void wwSectionManager::GetPageULData(const wwSection &rSection,
         rData.nSwLo = nWWFBot;              // footer -> convert
         // #i19922# - correction: consider that <nWWLo> can be negative, compare only if it's positive
         if ( nWWLo > 0 &&
-             o3tl::make_unsigned(abs(nWWLo)) >= nWWFBot )
+             o3tl::make_unsigned(nWWLo) >= nWWFBot )
             rData.nSwFUp = nWWLo - nWWFBot;
         else
             rData.nSwFUp = 0;