commit 04019e94680835e7acf475b2ddedb5002c4a5b94
author Caolán McNamara <caolanm@redhat.com> Tue May 14 11:32:47 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue May 14 15:52:12 2019 +0200
tree 2e39705828b729c5daeef76d449b9324802608e5
parent 3f408f8d848c191654cd3f2ead95975b3a3cc933

Resolves: tdf#125229 divide by 0

Change-Id: Iab34aa645252aea9c306f06814d75e405a2160e8
Reviewed-on: https://gerrit.libreoffice.org/72279
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins

sw/source/uibase/utlui/prcntfld.cxx

diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx
index 6564e9b..0bd5199 100644
--- a/sw/source/uibase/utlui/prcntfld.cxx
+++ b/sw/source/uibase/utlui/prcntfld.cxx
@@ -55,8 +55,6 @@ void SwPercentField::ShowPercent(bool bPercent)

    if (bPercent)
    {
        int nCurrentWidth, nPercent;

        nOldValue = get_value();

        eOldUnit = m_pField->get_unit();
@@ -66,16 +64,16 @@ void SwPercentField::ShowPercent(bool bPercent)
        m_pField->set_unit(FieldUnit::PERCENT);
        m_pField->set_digits(0);

        nCurrentWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FieldUnit::TWIP);
        int nCurrentWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FieldUnit::TWIP);
        // round to 0.5 percent
        nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10;
        int nPercent = nRefValue ? (((nCurrentWidth * 10) / nRefValue + 5) / 10) : 0;

        m_pField->set_range(std::max(1, nPercent), 100, FieldUnit::NONE);
        m_pField->set_increments(5, 10, FieldUnit::NONE);
        if (nOldValue != nLastValue)
        {
            nCurrentWidth = MetricField::ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP);
            nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10;
            nPercent = nRefValue ? (((nCurrentWidth * 10) / nRefValue + 5) / 10) : 0;
            m_pField->set_value(nPercent, FieldUnit::NONE);
            nLastPercent = nPercent;
            nLastValue = nOldValue;
@@ -122,7 +120,7 @@ void SwPercentField::set_value(int nNewValue, FieldUnit eInUnit)
            int nValue = Convert(nNewValue, eInUnit, eOldUnit);
            nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP);
        }
        nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10;
        nPercent = nRefValue ? (((nCurrentWidth * 10) / nRefValue + 5) / 10) : 0;
        m_pField->set_value(nPercent, FieldUnit::NONE);
    }
}
@@ -221,7 +219,7 @@ int SwPercentField::Convert(int nValue, FieldUnit eInUnit, FieldUnit eOutUnit)
        else
            nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, FieldUnit::TWIP);
        // Round to 0.5 percent
        return ((nCurrentWidth * 1000) / nRefValue + 5) / 10;
        return nRefValue ? (((nCurrentWidth * 1000) / nRefValue + 5) / 10) : 0;
    }

    return MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, eOutUnit);