mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fix higher debug level build

Browse Source 
Change-Id: Ifc76287f330818d87f52af9186caf787471a94a9
This commit is contained in:
Caolán McNamara
2013-10-05 16:38:37 +01:00
parent 8bf74a9e51
commit bb84effbc0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sw/inc/calc.hxx
View File

@@ -174,7 +174,7 @@ class SwCalc
SwSbxValue nLastLeft; SwSbxValue nLastLeft;
SwSbxValue nNumberValue; SwSbxValue nNumberValue;
SwCalcExp aErrExpr; SwCalcExp aErrExpr;
xub_StrLen nCommandPos; sal_Int32 nCommandPos;
SwDoc& rDoc; SwDoc& rDoc;
SvtSysLocale m_aSysLocale; SvtSysLocale m_aSysLocale;

16
sw/source/core/bastyp/calc.cxx
View File

@@ -657,7 +657,7 @@ SwCalcOper SwCalc::GetToken()
coContFlags, aEmptyStr ); coContFlags, aEmptyStr );
bool bSetError = true; 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) ) if( aRes.TokenType & (KParseType::ASC_NUMBER | KParseType::UNI_NUMBER) )
{ {
nNumberValue.PutDouble( aRes.Value ); nNumberValue.PutDouble( aRes.Value );
@@ -675,7 +675,7 @@ SwCalcOper SwCalc::GetToken()
// catch currency symbol // catch currency symbol
if( sLowerCaseName == sCurrSym ) if( sLowerCaseName == sCurrSym )
{ {
nCommandPos = (xub_StrLen)aRes.EndPos; nCommandPos = aRes.EndPos;
return GetToken(); // call again return GetToken(); // call again
} }
@@ -701,7 +701,7 @@ SwCalcOper SwCalc::GetToken()
default: default:
break; break;
} }
nCommandPos = (xub_StrLen)aRes.EndPos; nCommandPos = aRes.EndPos;
return eCurrOper; return eCurrOper;
} }
aVarName = aName; aVarName = aName;
@@ -848,7 +848,7 @@ SwCalcOper SwCalc::GetToken()
eError = CALC_SYNTAX; eError = CALC_SYNTAX;
eCurrOper = CALC_PRINT; eCurrOper = CALC_PRINT;
} }
nCommandPos = (xub_StrLen)aRes.EndPos; nCommandPos = aRes.EndPos;
}; };
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@@ -993,17 +993,17 @@ SwCalcOper SwCalc::GetToken()
case '"': case '"':
{ {
xub_StrLen nStt = nCommandPos; sal_Int32 nStt = nCommandPos;
while( 0 != ( ch = NextCh( sCommand, nCommandPos ) ) && while( 0 != ( ch = NextCh( sCommand, nCommandPos ) ) &&
'"' != ch ) '"' != ch )
{ {
; ;
} }
xub_StrLen nLen = nCommandPos - nStt; sal_Int32 nLen = nCommandPos - nStt;
if( '"' == ch ) if( '"' == ch )
--nLen; --nLen;
nNumberValue.PutString( sCommand.Copy( nStt, nLen )); nNumberValue.PutString( sCommand.copy( nStt, nLen ));
eCurrOper = CALC_NUMBER; eCurrOper = CALC_NUMBER;
} }
break; break;
@@ -1012,7 +1012,7 @@ SwCalcOper SwCalc::GetToken()
if (ch && (pCharClass->isLetter( sCommand, nCommandPos - 1) || if (ch && (pCharClass->isLetter( sCommand, nCommandPos - 1) ||
'_' == ch)) '_' == ch))
{ {
xub_StrLen nStt = nCommandPos-1; sal_Int32 nStt = nCommandPos-1;
while( 0 != (ch = NextCh( sCommand, nCommandPos )) && while( 0 != (ch = NextCh( sCommand, nCommandPos )) &&
(pCharClass->isLetterNumeric( sCommand, nCommandPos - 1) || (pCharClass->isLetterNumeric( sCommand, nCommandPos - 1) ||
ch == '_' || ch == '.' ) ) ch == '_' || ch == '.' ) )