diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-05 16:38:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-07 09:16:23 +0100 |
| commit | bb84effbc0e4fe1b718ff8aa101c3811b0c568e4 (patch) | |
| tree | b22676ab20f19e6fa065dcfbefae4bbdba56d711 /sw/source | |
| parent | 8bf74a9e51272ea7808286160e27c8642a8bf2b8 (diff) | |
more fix higher debug level build
Change-Id: Ifc76287f330818d87f52af9186caf787471a94a9
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/bastyp/calc.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 096c8cae7f56..9082c04f1d17 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -657,7 +657,7 @@ SwCalcOper SwCalc::GetToken() coContFlags, aEmptyStr ); bool bSetError = true; - xub_StrLen nRealStt = nCommandPos + (xub_StrLen)aRes.LeadingWhiteSpace; + sal_Int32 nRealStt = nCommandPos + aRes.LeadingWhiteSpace; if( aRes.TokenType & (KParseType::ASC_NUMBER | KParseType::UNI_NUMBER) ) { nNumberValue.PutDouble( aRes.Value ); @@ -675,7 +675,7 @@ SwCalcOper SwCalc::GetToken() // catch currency symbol if( sLowerCaseName == sCurrSym ) { - nCommandPos = (xub_StrLen)aRes.EndPos; + nCommandPos = aRes.EndPos; return GetToken(); // call again } @@ -701,7 +701,7 @@ SwCalcOper SwCalc::GetToken() default: break; } - nCommandPos = (xub_StrLen)aRes.EndPos; + nCommandPos = aRes.EndPos; return eCurrOper; } aVarName = aName; @@ -848,7 +848,7 @@ SwCalcOper SwCalc::GetToken() eError = CALC_SYNTAX; eCurrOper = CALC_PRINT; } - nCommandPos = (xub_StrLen)aRes.EndPos; + nCommandPos = aRes.EndPos; }; #if OSL_DEBUG_LEVEL > 1 @@ -993,17 +993,17 @@ SwCalcOper SwCalc::GetToken() case '"': { - xub_StrLen nStt = nCommandPos; + sal_Int32 nStt = nCommandPos; while( 0 != ( ch = NextCh( sCommand, nCommandPos ) ) && '"' != ch ) { ; } - xub_StrLen nLen = nCommandPos - nStt; + sal_Int32 nLen = nCommandPos - nStt; if( '"' == ch ) --nLen; - nNumberValue.PutString( sCommand.Copy( nStt, nLen )); + nNumberValue.PutString( sCommand.copy( nStt, nLen )); eCurrOper = CALC_NUMBER; } break; @@ -1012,7 +1012,7 @@ SwCalcOper SwCalc::GetToken() if (ch && (pCharClass->isLetter( sCommand, nCommandPos - 1) || '_' == ch)) { - xub_StrLen nStt = nCommandPos-1; + sal_Int32 nStt = nCommandPos-1; while( 0 != (ch = NextCh( sCommand, nCommandPos )) && (pCharClass->isLetterNumeric( sCommand, nCommandPos - 1) || ch == '_' || ch == '.' ) ) |