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

[Thomas Arnhold]

 starmath/source/mathtype.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ffda2ff88aae5c388fe13ae451cad9af38e41edc
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Sep 4 22:47:59 2013 +0200

    Some more fixes
    
    Forgotten in 150c9f8bbcffacc687a5603e2a589d2a3816dccb
    
    Change-Id: I177c3bcb15bf789a68b8758a8a545d4c6bdf5d85
    Reviewed-on: https://gerrit.libreoffice.org/5820
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 94310db..42f118d 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -664,7 +664,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
     bool bOpenString=false;
     sal_Int32 nTextStart = 0;
     sal_Int32 nSubSupStartPos = 0;
-    sal_Int32 nLastTemplateBracket=STRING_NOTFOUND;
+    sal_Int32 nLastTemplateBracket=-1;
 
     do
     {
@@ -1261,7 +1261,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
                         {
                             bool bOk=false;
                             sal_Int32 nI = rRet.lastIndexOf('{');
-                            if (nI != STRING_NOTFOUND)
+                            if (nI != -1)
                             {
                                 for(nI=nI+1;nI<rRet.getLength();nI++)
                                     if (rRet[nI] != ' ')
@@ -1386,7 +1386,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
 
                             bool bOk=false;
                             sal_Int32 nI = rRet.lastIndexOf('{');
-                            if (nI != STRING_NOTFOUND)
+                            if (nI != -1)
                             {
                                 for(nI=nI+1;nI<rRet.getLength();nI++)
                                     if (rRet[nI] != ' ')
@@ -2694,7 +2694,7 @@ int MathType::HandleMatrix(int nLevel,sal_uInt8 nSelector,
     int nRet = HandleRecords(nLevel+1,nSelector,nVariation,nRows,nCols);
 
     sal_Int32 nI = rRet.lastIndexOf('#');
-    if ((nI != STRING_NOTFOUND) && (nI > 0))
+    if ((nI != -1) && (nI > 0))
         if (rRet[nI-1] != '#')  //missing column
             rRet += "{}";
 
@@ -2723,7 +2723,7 @@ int MathType::HandleTemplate(int nLevel,sal_uInt8 &rSelector,
     //another one after it, mathtype handles it as if the second one was
     //inside the first one and renders it as sub of sub
     bool bRemove=false;
-    if ( (rSelector == 0xf) && (rLastTemplateBracket != STRING_NOTFOUND) )
+    if ( (rSelector == 0xf) && (rLastTemplateBracket != -1) )
     {
         bRemove=true;
         for (sal_Int32 nI = rLastTemplateBracket+1; nI < rRet.getLength(); nI++ )
@@ -2741,12 +2741,12 @@ int MathType::HandleTemplate(int nLevel,sal_uInt8 &rSelector,
     {
         rRet = rRet.replaceAt(rLastTemplateBracket,1,"");
         rRet += "} ";
-        rLastTemplateBracket = STRING_NOTFOUND;
+        rLastTemplateBracket = -1;
     }
     if (rSelector == 0xf)
         rLastTemplateBracket = rRet.lastIndexOf('}');
     else
-        rLastTemplateBracket = STRING_NOTFOUND;
+        rLastTemplateBracket = -1;
 
     rSelector = sal::static_int_cast< sal_uInt8 >(-1);
     return nRet;