diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-13 15:05:09 -0300 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-05-13 18:17:36 +0000 |
| commit | 5b01acf745babb07a1d2c2b926f0aaee2bde0e91 (patch) | |
| tree | 879366bce5ef8eac8ff56694b4fd92319866249e /starmath | |
| parent | 42824b9c5639d8d2ab621e33825b0d19ededff82 (diff) | |
Bin IsDigit method and use isAsciiDigit from CharClass
Also remove the unused function strnccmp.
Change-Id: Ie857dfca1e52b1251f85abfba3cd0e12e509974f
Reviewed-on: https://gerrit.libreoffice.org/3888
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/parse.cxx | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 04278e1e2d9a..9ae5dffb97f1 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -50,12 +50,6 @@ T* lcl_popOrZero( ::std::stack<T*> & rStack ) } } -static inline bool strnccmp(const String &u1, xub_StrLen nIdx, - const sal_Char *s2, xub_StrLen nLen) -{ - return u1.EqualsIgnoreCaseAscii( s2, nIdx, nLen ); -} - static const sal_Unicode aDelimiterTable[] = { ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#', @@ -64,14 +58,6 @@ static const sal_Unicode aDelimiterTable[] = '\0' // end of list symbol }; - -static inline bool IsDigit( sal_Unicode cChar ) -{ - return '0' <= cChar && cChar <= '9'; -} - -/////////////////////////////////////////////////////////////////////////// - SmToken::SmToken() : eType (TUNKNOWN), cMathChar ('\0') @@ -432,7 +418,7 @@ void SmParser::NextToken() // #i45779# parse numbers correctly // i.e. independent from the locale setting. // (note that #i11752# remains fixed) - if ((aRes.TokenType & KParseType::IDENTNAME) && IsDigit( cFirstChar )) + if ((aRes.TokenType & KParseType::IDENTNAME) && CharClass::isAsciiDigit( cFirstChar )) { ParseResult aTmpRes; LanguageTag aOldLoc( aCC.getLanguageTag() ); @@ -928,7 +914,7 @@ void SmParser::NextToken() { cChar = m_aBufferString.GetChar( ++m_nBufferIndex ); } - while ( cChar == '.' || IsDigit( cChar ) ); + while ( cChar == '.' || CharClass::isAsciiDigit( cChar ) ); m_aCurToken.aText = m_aBufferString.Copy( sal::static_int_cast< xub_StrLen >(nTxtStart), sal::static_int_cast< xub_StrLen >(m_nBufferIndex - nTxtStart) ); @@ -1915,7 +1901,7 @@ static bool lcl_IsNumber(const OUString& rText) else bPoint = true; } - else if ( !IsDigit( cChar ) ) + else if ( !CharClass::isAsciiDigit( cChar ) ) return false; } return true; |