diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-09-04 22:47:59 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-09-04 20:56:20 +0000 |
| commit | ffda2ff88aae5c388fe13ae451cad9af38e41edc (patch) | |
| tree | 14a4b5217341342efb81094d34b85565c8f8a6c8 /starmath | |
| parent | 62d50671919424ca4dd80cd7733b7b259132b9ab (diff) | |
Some more fixes
Forgotten in 150c9f8bbcffacc687a5603e2a589d2a3816dccb
Change-Id: I177c3bcb15bf789a68b8758a8a545d4c6bdf5d85
Reviewed-on: https://gerrit.libreoffice.org/5820
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/mathtype.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 94310dbfa16b..42f118dc8498 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; |