From 82625bb98e256b83351328d3bf2a14e3dd244eef Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 20 Dec 2013 14:23:33 +0200 Subject: remove unnecessary sal_Unicode casts in OUStringBuffer::append calls Convert code like: buf.append( static_cast('!') ); to: buf.append( '!' ); Change-Id: Iacb03a61de65a895540940953b49620677b3d051 --- cppu/source/cppu/cppu_opt.cxx | 6 +++--- cppu/source/typelib/typelib.cxx | 4 ++-- cppu/source/uno/lbenv.cxx | 8 ++++---- cppu/source/uno/lbmap.cxx | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'cppu') diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx index 785928c8a3ad..dfe092e47dc7 100644 --- a/cppu/source/cppu/cppu_opt.cxx +++ b/cppu/source/cppu/cppu_opt.cxx @@ -33,7 +33,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( OUStringBuffer buf( 64 ); buf.append( "unsatisfied query for interface of type " ); buf.append( OUString::unacquired( &pType->pTypeName ) ); - buf.append( (sal_Unicode) '!' ); + buf.append( '!' ); OUString ret( buf.makeStringAndClear() ); rtl_uString_acquire( ret.pData ); return ret.pData; @@ -47,7 +47,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( OUStringBuffer buf( 64 ); buf.append( "invalid attempt to assign an empty interface of type " ); buf.append( OUString::unacquired( &pType->pTypeName ) ); - buf.append( (sal_Unicode) '!' ); + buf.append( '!' ); OUString ret( buf.makeStringAndClear() ); rtl_uString_acquire( ret.pData ); return ret.pData; @@ -63,7 +63,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg buf.append( OUString::unacquired(&pAny->pType->pTypeName) ); buf.append( ") to " ); buf.append( OUString::unacquired(&pType->pTypeName) ); - buf.append( static_cast('!') ); + buf.append( '!' ); const OUString ret( buf.makeStringAndClear() ); rtl_uString_acquire( ret.pData ); return ret.pData; diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 46bc91935d29..585b6c5c8ec4 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -1201,9 +1201,9 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface( rtl::OUStringBuffer aBuf(pDirectBaseMember->pTypeName); aBuf.append(":@"); aBuf.append(i->directBaseIndex); - aBuf.append(static_cast< sal_Unicode >(',')); + aBuf.append(','); aBuf.append(i->memberOffset + j); - aBuf.append(static_cast< sal_Unicode >(':')); + aBuf.append(':'); aBuf.append(pITD->aBase.pTypeName); rtl::OUString aName(aBuf.makeStringAndClear()); typelib_TypeDescriptionReference * pDerivedMember = 0; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 107be170caaf..a29d2498d31f 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -748,7 +748,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment( buf.append( pOEntry->nRef, 10 ); buf.append( "; oid=\"" ); buf.append( pOEntry->oid ); - buf.append( (sal_Unicode) '\"' ); + buf.append( '\"' ); writeLine( stream, buf.makeStringAndClear(), pFilter ); for ( ::std::size_t nPos = 0; @@ -839,7 +839,7 @@ namespace // good guid sal_uInt8 ar[16]; ::rtl_getGlobalProcessId( ar ); - aRet.append( (sal_Unicode)';' ); + aRet.append( ';' ); for ( sal_Int32 i = 0; i < 16; ++i ) aRet.append( (sal_Int32)ar[i], 16 ); @@ -881,10 +881,10 @@ static void SAL_CALL unoenv_computeObjectIdentifier( // interface ::rtl::OUStringBuffer oid( 64 ); oid.append( reinterpret_cast< sal_Int64 >(pUnoI), 16 ); - oid.append( static_cast< sal_Unicode >(';') ); + oid.append( ';' ); // environment[context] oid.append( ((uno_Environment *) pEnv)->pTypeName ); - oid.append( static_cast< sal_Unicode >('[') ); + oid.append( '[' ); oid.append( reinterpret_cast< sal_Int64 >( reinterpret_cast< uno_Environment * >(pEnv)->pContext ), 16 ); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 6fb589ed68b7..41a2059e6d38 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -286,15 +286,15 @@ static inline OUString getMappingName( { OUStringBuffer aKey( 64 ); aKey.append( rAddPurpose ); - aKey.append( (sal_Unicode)';' ); + aKey.append( ';' ); aKey.append( rFrom.getTypeName() ); - aKey.append( (sal_Unicode)'[' ); + aKey.append( '[' ); aKey.append( reinterpret_cast< sal_IntPtr >(rFrom.get()), 16 ); aKey.append( "];" ); aKey.append( rTo.getTypeName() ); - aKey.append( (sal_Unicode)'[' ); + aKey.append( '[' ); aKey.append( reinterpret_cast< sal_IntPtr >(rTo.get()), 16 ); - aKey.append( (sal_Unicode)']' ); + aKey.append( ']' ); return aKey.makeStringAndClear(); } //================================================================================================== @@ -306,10 +306,10 @@ static inline OUString getBridgeName( if (!rAddPurpose.isEmpty()) { aBridgeName.append( rAddPurpose ); - aBridgeName.append( (sal_Unicode)'_' ); + aBridgeName.append( '_' ); } aBridgeName.append( EnvDcp::getTypeName(rFrom.getTypeName()) ); - aBridgeName.append( (sal_Unicode)'_' ); + aBridgeName.append( '_' ); aBridgeName.append( EnvDcp::getTypeName(rTo.getTypeName()) ); return aBridgeName.makeStringAndClear(); } -- cgit