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

[Caolán McNamara]

 starmath/source/mathtype.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a8781520e3d47dd0ea25039cf45eea1ed8704af7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 6 09:54:18 2017 +0000

    ofz: oom, variation 0 and 1 have one argument
    
    while variation 2 has two arguments
    
    Change-Id: Ia2a9bd5e33b589b6e002da78d1a5b45d703565ef
    Reviewed-on: https://gerrit.libreoffice.org/45926
    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/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 9dd5ec5f9297..dba5c8494721 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1644,9 +1644,8 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
                                 rRet.clear();
                                 newline--;
                             }
-                            else if ((nPart == 2) ||
-                                     ((nPart == 1) && (nVariation == 0)) ||
-                                     (nVariation == 1))
+                            else if ((nPart == 2) || ((nPart == 1) &&
+                                    (nVariation == 0 || nVariation == 1)))
                             {
                                 sPush+=rRet;
                                 rRet = sPush;