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

Caolán McNamara caolanm at redhat.com
Fri Jan 19 08:52:30 UTC 2018


 lotuswordpro/source/filter/lwpparastyle.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4bb2a9e17c0ce5188cefae8dd6cc16564b29521
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 18 10:44:11 2018 +0000

    ofz#5468 Integer-overflow
    
    Change-Id: Ie2792b7dffaffe939778a1546653424ac03ea30e
    Reviewed-on: https://gerrit.libreoffice.org/48105
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index 9ebf5e7b3303..ea8ff180c0b8 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -440,8 +440,8 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden
         {
             if (pPara->GetBulletFlag())
             {
-                pTotalIndent->SetMAll(pParentIndent->GetMAll() + pTotalIndent->GetMAll());
-                pTotalIndent->SetMRight(pParentIndent->GetMRight()+ pTotalIndent->GetMRight());
+                pTotalIndent->SetMAll(o3tl::saturating_add(pParentIndent->GetMAll(), pTotalIndent->GetMAll()));
+                pTotalIndent->SetMRight(o3tl::saturating_add(pParentIndent->GetMRight(), pTotalIndent->GetMRight()));
                 pParaStyle->SetMargins(LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(
                     pTotalIndent->GetMAll())), pTotalIndent->GetRight());
                 pPara->SetIndent(pTotalIndent.release());


More information about the Libreoffice-commits mailing list