Kaydet (Commit) 135df475 authored tarafından Eike Rathke's avatar Eike Rathke

convert some OSL_TRACE to SAL_WARN

Change-Id: Ifb687de25a6da4696e659e27cb34668a9762445f
üst 29e1b2f1
...@@ -837,8 +837,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) ...@@ -837,8 +837,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
{ {
if (nSuppressed > nArgs) if (nSuppressed > nArgs)
{ {
OSL_TRACE( "ScFuncRes: suppressed parameters count mismatch on OpCode %u: suppressed %d > params %d", SAL_WARN("sc.core", "ScFuncRes: suppressed parameters count mismatch on OpCode " <<
aRes.GetId(), (int)nSuppressed, (int)nArgs); aRes.GetId() << ": suppressed " << nSuppressed << " > params " << nArgs);
nSuppressed = nArgs; // sanitize nSuppressed = nArgs; // sanitize
} }
for (sal_uInt16 i = 0; i < nSuppressed; ++i) for (sal_uInt16 i = 0; i < nSuppressed; ++i)
...@@ -848,13 +848,13 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) ...@@ -848,13 +848,13 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
{ {
if (pDesc->nArgCount >= PAIRED_VAR_ARGS && nParam >= nArgs-2) if (pDesc->nArgCount >= PAIRED_VAR_ARGS && nParam >= nArgs-2)
{ {
OSL_TRACE( "ScFuncRes: PAIRED_VAR_ARGS parameters can't be suppressed, on OpCode %u: param %d >= arg %d-2", SAL_WARN("sc.core", "ScFuncRes: PAIRED_VAR_ARGS parameters can't be suppressed, on OpCode " <<
aRes.GetId(), (int)nParam, (int)nArgs); aRes.GetId() << ": param " << nParam << " >= arg " << nArgs << "-2");
} }
else if (pDesc->nArgCount >= VAR_ARGS && nParam == nArgs-1) else if (pDesc->nArgCount >= VAR_ARGS && nParam == nArgs-1)
{ {
OSL_TRACE( "ScFuncRes: VAR_ARGS parameters can't be suppressed, on OpCode %u: param %d == arg %d-1", SAL_WARN("sc.core", "ScFuncRes: VAR_ARGS parameters can't be suppressed, on OpCode " <<
aRes.GetId(), (int)nParam, (int)nArgs); aRes.GetId() << ": param " << nParam << " == arg " << nArgs << "-1");
} }
else else
{ {
...@@ -864,8 +864,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) ...@@ -864,8 +864,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
} }
else else
{ {
OSL_TRACE( "ScFuncRes: suppressed parameter exceeds count on OpCode %u: param %d >= args %d", SAL_WARN("sc.core", "ScFuncRes: suppressed parameter exceeds count on OpCode " <<
aRes.GetId(), (int)nParam, (int)nArgs); aRes.GetId() << ": param " << nParam << " >= args " << nArgs);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment