Kaydet (Commit) 585b789e authored tarafından Michael Stahl's avatar Michael Stahl

cppu: the LogBrige really needs its own SAL_LOG area

Change-Id: I129f3dc1597035664e4ff284276cb0d49a560ab5
üst 218bd97b
...@@ -135,63 +135,63 @@ bool LogBridge::v_isValid(rtl::OUString * pReason) ...@@ -135,63 +135,63 @@ bool LogBridge::v_isValid(rtl::OUString * pReason)
case typelib_TypeClass_STRING: case typelib_TypeClass_STRING:
{ {
const ::rtl::OString sValue( ::rtl::OUStringToOString(*static_cast< ::rtl::OUString*>(pArg),osl_getThreadTextEncoding())); const ::rtl::OString sValue( ::rtl::OUStringToOString(*static_cast< ::rtl::OUString*>(pArg),osl_getThreadTextEncoding()));
SAL_INFO("cppu", "" << sValue.getStr()); SAL_INFO("cppu.log", "" << sValue.getStr());
} }
break; break;
case typelib_TypeClass_BOOLEAN: case typelib_TypeClass_BOOLEAN:
SAL_INFO("cppu", "" << *static_cast<sal_Bool*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<sal_Bool*>(pArg));
break; break;
case typelib_TypeClass_BYTE: case typelib_TypeClass_BYTE:
SAL_INFO("cppu", "" << *static_cast<sal_Int8*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<sal_Int8*>(pArg));
break; break;
case typelib_TypeClass_CHAR: case typelib_TypeClass_CHAR:
SAL_INFO("cppu", "" << *static_cast<sal_Char*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<sal_Char*>(pArg));
break; break;
case typelib_TypeClass_SHORT: case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT: case typelib_TypeClass_UNSIGNED_SHORT:
SAL_INFO("cppu", "" << *static_cast<sal_Int16*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<sal_Int16*>(pArg));
break; break;
case typelib_TypeClass_LONG: case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM: case typelib_TypeClass_ENUM:
SAL_INFO("cppu", "" << *static_cast<sal_Int32*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<sal_Int32*>(pArg));
break; break;
case typelib_TypeClass_HYPER: case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
SAL_INFO("cppu", "" << *static_cast<sal_Int64*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<sal_Int64*>(pArg));
break; break;
case typelib_TypeClass_FLOAT: case typelib_TypeClass_FLOAT:
SAL_INFO("cppu", "" << *static_cast<float*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<float*>(pArg));
break; break;
case typelib_TypeClass_DOUBLE: case typelib_TypeClass_DOUBLE:
SAL_INFO("cppu", "" << *static_cast<double*>(pArg)); SAL_INFO("cppu.log", "" << *static_cast<double*>(pArg));
break; break;
case typelib_TypeClass_TYPE: case typelib_TypeClass_TYPE:
{ {
const ::rtl::OString sValue( ::rtl::OUStringToOString(((com::sun::star::uno::Type*)pArg)->getTypeName(),osl_getThreadTextEncoding())); const ::rtl::OString sValue( ::rtl::OUStringToOString(((com::sun::star::uno::Type*)pArg)->getTypeName(),osl_getThreadTextEncoding()));
SAL_INFO("cppu", "" << sValue.getStr()); SAL_INFO("cppu.log", "" << sValue.getStr());
} }
break; break;
case typelib_TypeClass_ANY: case typelib_TypeClass_ANY:
if ( static_cast<uno_Any*>(pArg)->pData ) if ( static_cast<uno_Any*>(pArg)->pData )
traceValue(static_cast<uno_Any*>(pArg)->pType,static_cast<uno_Any*>(pArg)->pData); traceValue(static_cast<uno_Any*>(pArg)->pType,static_cast<uno_Any*>(pArg)->pData);
else else
SAL_INFO("cppu", "void"); SAL_INFO("cppu.log", "void");
break; break;
case typelib_TypeClass_EXCEPTION: case typelib_TypeClass_EXCEPTION:
SAL_INFO("cppu", "exception"); SAL_INFO("cppu.log", "exception");
break; break;
case typelib_TypeClass_INTERFACE: case typelib_TypeClass_INTERFACE:
{ {
const ::rtl::OString sValue( ::rtl::OUStringToOString(_pTypeRef->pTypeName,osl_getThreadTextEncoding())); const ::rtl::OString sValue( ::rtl::OUStringToOString(_pTypeRef->pTypeName,osl_getThreadTextEncoding()));
SAL_INFO("cppu", "" << sValue.getStr() << "0x" << std::hex << pArg); SAL_INFO("cppu.log", "" << sValue.getStr() << "0x" << std::hex << pArg);
} }
break; break;
case typelib_TypeClass_VOID: case typelib_TypeClass_VOID:
SAL_INFO("cppu", "void"); SAL_INFO("cppu.log", "void");
break; break;
default: default:
SAL_INFO("cppu", "0x" << std::hex << pArg); SAL_INFO("cppu.log", "0x" << std::hex << pArg);
break; break;
} // switch(pParams[i].pTypeRef->eTypeClass) } // switch(pParams[i].pTypeRef->eTypeClass)
} }
...@@ -214,40 +214,40 @@ void LogProbe( ...@@ -214,40 +214,40 @@ void LogProbe(
sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US);
if ( pre ) if ( pre )
{ {
SAL_INFO("cppu", "{ LogBridge () " << sTemp.getStr() ); SAL_INFO("cppu.log", "{ LogBridge () " << sTemp.getStr() );
if ( nParams ) if ( nParams )
{ {
SAL_INFO("cppu", "\n| : ( LogBridge "); SAL_INFO("cppu.log", "\n| : ( LogBridge ");
for(sal_Int32 i = 0;i < nParams;++i) for(sal_Int32 i = 0;i < nParams;++i)
{ {
if ( i > 0 ) if ( i > 0 )
SAL_INFO("cppu", ","); SAL_INFO("cppu.log", ",");
traceValue(pParams[i].pTypeRef,pArgs[i]); traceValue(pParams[i].pTypeRef,pArgs[i]);
} }
SAL_INFO("cppu", ")"); SAL_INFO("cppu.log", ")");
} // if ( nParams ) } // if ( nParams )
SAL_INFO("cppu", "\n"); SAL_INFO("cppu.log", "\n");
} }
else if ( !pre ) else if ( !pre )
{ {
SAL_INFO("cppu", "} LogBridge () " << sTemp.getStr()); SAL_INFO("cppu.log", "} LogBridge () " << sTemp.getStr());
if ( ppException && *ppException ) if ( ppException && *ppException )
{ {
SAL_INFO("cppu", " exception occurred : "); SAL_INFO("cppu.log", " exception occurred : ");
typelib_TypeDescription * pElementTypeDescr = 0; typelib_TypeDescription * pElementTypeDescr = 0;
TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType ); TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType );
const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding())); const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding()));
SAL_INFO("cppu", "" << sValue.getStr()); SAL_INFO("cppu.log", "" << sValue.getStr());
TYPELIB_DANGER_RELEASE( pElementTypeDescr ); TYPELIB_DANGER_RELEASE( pElementTypeDescr );
} }
else if ( pReturnTypeRef ) else if ( pReturnTypeRef )
{ {
SAL_INFO("cppu", " return : "); SAL_INFO("cppu.log", " return : ");
traceValue(pReturnTypeRef,pReturn); traceValue(pReturnTypeRef,pReturn);
} // if ( pReturn && pReturnTypeRef ) } // if ( pReturn && pReturnTypeRef )
SAL_INFO("cppu", "\n"); SAL_INFO("cppu.log", "\n");
} }
} }
......
...@@ -90,6 +90,7 @@ certain functionality. ...@@ -90,6 +90,7 @@ certain functionality.
@section cppu @section cppu
@li @c cppu @li @c cppu
@li @c cppu.log
@li @c cppu.unsafebridge @li @c cppu.unsafebridge
@section cppuhelper @section cppuhelper
......
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