sc/source/core/data/funcdesc.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 135df4753db7e03817a2a0dbb6e68ead457385e2
Author: Eike Rathke <er...@redhat.com>
Date: Wed Aug 20 18:13:11 2014 +0200
convert some OSL_TRACE to SAL_WARN
Change-Id: Ifb687de25a6da4696e659e27cb34668a9762445f
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index df48b13..7ab1b47 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -837,8 +837,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool
& rbSuppressed )
{
if (nSuppressed > nArgs)
{
- OSL_TRACE( "ScFuncRes: suppressed parameters count mismatch on
OpCode %u: suppressed %d > params %d",
- aRes.GetId(), (int)nSuppressed, (int)nArgs);
+ SAL_WARN("sc.core", "ScFuncRes: suppressed parameters count
mismatch on OpCode " <<
+ aRes.GetId() << ": suppressed " << nSuppressed << " >
params " << nArgs);
nSuppressed = nArgs; // sanitize
}
for (sal_uInt16 i = 0; i < nSuppressed; ++i)
@@ -848,13 +848,13 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc,
bool & rbSuppressed )
{
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",
- aRes.GetId(), (int)nParam, (int)nArgs);
+ SAL_WARN("sc.core", "ScFuncRes: PAIRED_VAR_ARGS parameters
can't be suppressed, on OpCode " <<
+ aRes.GetId() << ": param " << nParam << " >= arg "
<< nArgs << "-2");
}
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",
- aRes.GetId(), (int)nParam, (int)nArgs);
+ SAL_WARN("sc.core", "ScFuncRes: VAR_ARGS parameters can't
be suppressed, on OpCode " <<
+ aRes.GetId() << ": param " << nParam << " == arg "
<< nArgs << "-1");
}
else
{
@@ -864,8 +864,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool
& rbSuppressed )
}
else
{
- OSL_TRACE( "ScFuncRes: suppressed parameter exceeds count on
OpCode %u: param %d >= args %d",
- aRes.GetId(), (int)nParam, (int)nArgs);
+ SAL_WARN("sc.core", "ScFuncRes: suppressed parameter exceeds
count on OpCode " <<
+ aRes.GetId() << ": param " << nParam << " >= args " <<
nArgs);
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
