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

[Caolán McNamara]

 editeng/source/items/textitem.cxx |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit afd1a6b516c634392b02beaed51e0ac2a9f877ce
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 10 20:29:18 2017 +0000

    ofz#4582 Floating-point-exception
    
    Change-Id: I808022d970dc6e35839a032f4ebf024a48fadd11

diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e9ec28a812ec..5642f002f7e6 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -875,26 +875,30 @@ static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, M
     switch( eProp )
     {
         case MapUnit::MapRelative:
-            nRet *= 100;
-            nRet /= nProp;
-        break;
+            if (nProp)
+            {
+                nRet *= 100;
+                nRet /= nProp;
+            }
+            break;
         case MapUnit::MapPoint:
         {
             short nTemp = (short)nProp;
             nDiff = nTemp * 20;
             if(!bCoreInTwip)
                 nDiff = (short)convertTwipToMm100((long)nDiff);
+            break;
         }
-        break;
         case MapUnit::Map100thMM:
             //then the core is surely also in 1/100 mm
             nDiff = (short)nProp;
-        break;
+            break;
         case MapUnit::MapTwip:
             // Here surely TWIP
             nDiff = ((short)nProp);
-        break;
-        default: ;//prevent warning
+            break;
+        default:
+            break;
     }
     nRet = (nDiff < 0 || nRet >= static_cast<unsigned short>(nDiff))
         ? nRet - nDiff : 0;