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

[Caolán McNamara]

 starmath/source/mathmlimport.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 8f0a740bd6ab84c7d95944b448b4ade4f2ce3e89
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 28 21:23:54 2017 +0000

    ofz#4733: align size types
    
    Change-Id: I43d136b131ba43401871a6afa455386f050d6c1e

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 270388d0258b..0caa425e8cba 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2646,10 +2646,10 @@ void SmXMLTableContext_Impl::EndElement()
     SmNodeStack aReverseStack;
     aExpressionArray.resize(rNodeStack.size()-nElementCount);
 
-    auto nRows = rNodeStack.size()-nElementCount;
-    sal_uInt16 nCols = 0;
+    size_t nRows = rNodeStack.size()-nElementCount;
+    size_t nCols = 0;
 
-    for (auto i=nRows;i > 0;i--)
+    for (size_t i = nRows; i > 0; --i)
     {
         SmNode* pArray = rNodeStack.front().release();
         rNodeStack.pop_front();
@@ -2672,8 +2672,7 @@ void SmXMLTableContext_Impl::EndElement()
             pArray = pExprNode;
         }
 
-        if (pArray->GetNumSubNodes() > nCols)
-            nCols = pArray->GetNumSubNodes();
+        nCols = std::max(nCols, pArray->GetNumSubNodes());
         aReverseStack.push_front(std::unique_ptr<SmNode>(pArray));
     }
     aExpressionArray.resize(nCols*nRows);