diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /cppu | |
| parent | 826f1bca40a01f0a249d5b6cbb7c39c11638a060 (diff) | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 22 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 4 |
2 files changed, 7 insertions, 19 deletions
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 604369d85186..ac99c395e8f9 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -134,10 +134,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason) switch(_pTypeRef->eTypeClass) { case typelib_TypeClass_STRING: - { - const ::rtl::OString sValue( ::rtl::OUStringToOString(*static_cast< ::rtl::OUString*>(pArg),osl_getThreadTextEncoding())); - SAL_INFO("cppu.log", "" << sValue.getStr()); - } + SAL_INFO("cppu.log", "" << *static_cast< ::rtl::OUString*>(pArg)); break; case typelib_TypeClass_BOOLEAN: SAL_INFO("cppu.log", "" << *static_cast<sal_Bool*>(pArg)); @@ -168,10 +165,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason) SAL_INFO("cppu.log", "" << *static_cast<double*>(pArg)); break; case typelib_TypeClass_TYPE: - { - const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<css::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding())); - SAL_INFO("cppu.log", "" << sValue.getStr()); - } + SAL_INFO("cppu.log", "" << static_cast<css::uno::Type*>(pArg)->getTypeName()); break; case typelib_TypeClass_ANY: if ( static_cast<uno_Any*>(pArg)->pData ) @@ -183,10 +177,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason) SAL_INFO("cppu.log", "exception"); break; case typelib_TypeClass_INTERFACE: - { - const ::rtl::OString sValue( ::rtl::OUStringToOString(_pTypeRef->pTypeName,osl_getThreadTextEncoding())); - SAL_INFO("cppu.log", "" << sValue.getStr() << "0x" << std::hex << pArg); - } + SAL_INFO("cppu.log", "" << _pTypeRef->pTypeName << "0x" << std::hex << pArg); break; case typelib_TypeClass_VOID: SAL_INFO("cppu.log", "void"); @@ -215,7 +206,7 @@ void LogProbe( sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); if ( pre ) { - SAL_INFO("cppu.log", "{ LogBridge () " << sTemp.getStr() ); + SAL_INFO("cppu.log", "{ LogBridge () " << sTemp ); if ( nParams ) { SAL_INFO("cppu.log", "\n| : ( LogBridge "); @@ -232,14 +223,13 @@ void LogProbe( } else if ( !pre ) { - SAL_INFO("cppu.log", "} LogBridge () " << sTemp.getStr()); + SAL_INFO("cppu.log", "} LogBridge () " << sTemp); if ( ppException && *ppException ) { SAL_INFO("cppu.log", " exception occurred : "); typelib_TypeDescription * pElementTypeDescr = nullptr; TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType ); - const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding())); - SAL_INFO("cppu.log", "" << sValue.getStr()); + SAL_INFO("cppu.log", "" << pElementTypeDescr->pTypeName); TYPELIB_DANGER_RELEASE( pElementTypeDescr ); } else if ( pReturnTypeRef ) diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index f869e795c077..cf6621707f16 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -530,9 +530,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { } else { - OString aStr( - rtl::OUStringToOString( (*ppTypeDescr)->pTypeName, RTL_TEXTENCODING_ASCII_US ) ); - SAL_INFO( "cppu.typelib", "type cannot be completed: " << aStr.getStr() ); + SAL_INFO( "cppu.typelib", "type cannot be completed: " << (*ppTypeDescr)->pTypeName ); return false; } } |