diff options
| author | Noel Grandin <noel@peralex.com> | 2013-12-20 14:23:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-01-07 09:43:37 +0200 |
| commit | 82625bb98e256b83351328d3bf2a14e3dd244eef (patch) | |
| tree | 9b661850ae5df9ea27fcac063cfe61862046c8d1 | |
| parent | 347af397cafa97cfa7d5027f83fff784ca04a397 (diff) | |
remove unnecessary sal_Unicode casts in OUStringBuffer::append calls
Convert code like:
buf.append( static_cast<sal_Unicode>('!') );
to:
buf.append( '!' );
Change-Id: Iacb03a61de65a895540940953b49620677b3d051
96 files changed, 253 insertions, 258 deletions
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx index 9ce12f618540..d3e713956a1e 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #ifdef DEBUG diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx index 2f1df7a85adb..1ab474212989 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx @@ -144,7 +144,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } OUString result( buf.makeStringAndClear() ); diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx index 95e44d40c9b9..7696f6184df7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index bb3694e72fe2..c5e837effe85 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -76,7 +76,7 @@ namespace CPPU_CURRENT_NAMESPACE buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index 73ddede13810..2e4e149cb6f0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -76,7 +76,7 @@ namespace CPPU_CURRENT_NAMESPACE buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx index 95e44d40c9b9..7696f6184df7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index a49bd952feca..ee26ba03f33e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -77,7 +77,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index 73ddede13810..2e4e149cb6f0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -76,7 +76,7 @@ namespace CPPU_CURRENT_NAMESPACE buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index e8608b3eabb1..bbc9b62da626 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -73,7 +73,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if defined BRIDGES_DEBUG diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx index 95e44d40c9b9..7696f6184df7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx index 95e44d40c9b9..7696f6184df7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx index 95e44d40c9b9..7696f6184df7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx index 95e44d40c9b9..7696f6184df7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx @@ -75,7 +75,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index 5c4ad93bc6ea..e78c2407c443 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -74,7 +74,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if defined BRIDGES_DEBUG diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index 18a6eff69fea..2e1536899abd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -74,7 +74,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index 0c31eed41b58..4a551895574b 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -146,7 +146,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx index bb5057bf7f80..80ccc1eb10fb 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx @@ -74,7 +74,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 0c31eed41b58..4a551895574b 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -146,7 +146,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 97fbbc98c3b5..9c0c937af520 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -76,7 +76,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index 996eb5aac46c..a869281433c8 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -73,7 +73,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if defined BRIDGES_DEBUG diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index ae82fbb13483..330f66881db7 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -80,7 +80,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx index ae82fbb13483..330f66881db7 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx @@ -80,7 +80,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) buf.appendAscii( p, n ); p += n; if ('E' != *p) - buf.append( (sal_Unicode)'.' ); + buf.append( '.' ); } #if OSL_DEBUG_LEVEL > 1 diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index b2c97badabcc..2aecc3a03afc 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -56,7 +56,7 @@ static inline OUString toUNOname( OUString const & rRTTIname ) throw () aRet.append( aStr.copy( n +1, nPos -n -1 ) ); if (n >= 0) { - aRet.append( (sal_Unicode)'.' ); + aRet.append( '.' ); } nPos = n; } @@ -72,10 +72,10 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw () { sal_Int32 n = rUNOname.lastIndexOf( '.', nPos ); aRet.append( rUNOname.copy( n +1, nPos -n -1 ) ); - aRet.append( (sal_Unicode)'@' ); + aRet.append( '@' ); nPos = n; } - aRet.append( (sal_Unicode)'@' ); + aRet.append( '@' ); return aRet.makeStringAndClear(); } diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index cb3134c74fa5..26688aa29d96 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -273,7 +273,7 @@ static inline OUString toUNOname( aRet.append( aStr.copy( n +1, nPos -n -1 ) ); if (n >= 0) { - aRet.append( (sal_Unicode)'.' ); + aRet.append( '.' ); } nPos = n; } @@ -291,10 +291,10 @@ static inline OUString toRTTIname( { sal_Int32 n = rUNOname.lastIndexOf( '.', nPos ); aRet.append( rUNOname.copy( n +1, nPos -n -1 ) ); - aRet.append( (sal_Unicode)'@' ); + aRet.append( '@' ); nPos = n; } - aRet.append( (sal_Unicode)'@' ); + aRet.append( '@' ); return aRet.makeStringAndClear(); } diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index bacd9a721348..c6ec241ad367 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -110,12 +110,12 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) // interface OUStringBuffer oid( 64 ); oid.append( reinterpret_cast< sal_Int64 >(xHome.get()), 16 ); - oid.append( (sal_Unicode)';' ); + oid.append( ';' ); // ;environment[context] oid.append( *reinterpret_cast< OUString const * >( &((uno_Environment *) pEnv)->pTypeName ) ); - oid.append( (sal_Unicode)'[' ); + oid.append( '[' ); oid.append( reinterpret_cast< sal_Int64 >( ((uno_Environment *)pEnv)->pContext), diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 9a05a9ea8653..4ca85e58ab2f 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -219,7 +219,7 @@ OUString AbstractShapeFactory::getStackedString( const OUString& rString, bool b for( sal_Int32 nPosSrc=0; nPosSrc < nLen; nPosSrc++ ) { if( nPosSrc ) - aStackStr.append( sal_Unicode('\r') ); + aStackStr.append( '\r' ); aStackStr.append(rString[nPosSrc]); } return aStackStr.makeStringAndClear(); diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx index 9cf551a965f3..624c973290c7 100644 --- a/comphelper/source/misc/anytostring.cxx +++ b/comphelper/source/misc/anytostring.cxx @@ -34,7 +34,7 @@ void appendTypeError( { buf.append( "<cannot get type description of type " ); buf.append( OUString::unacquired( &typeRef->pTypeName ) ); - buf.append( static_cast< sal_Unicode >('>') ); + buf.append( '>' ); } inline void appendChar( OUStringBuffer & buf, sal_Unicode c ) @@ -44,7 +44,7 @@ inline void appendChar( OUStringBuffer & buf, sal_Unicode c ) OUString const s( OUString::number( static_cast< sal_Int32 >(c), 16 ) ); for ( sal_Int32 f = 4 - s.getLength(); f > 0; --f ) - buf.append( static_cast< sal_Unicode >('0') ); + buf.append( '0' ); buf.append( s ); } else { @@ -68,14 +68,14 @@ void appendValue( OUStringBuffer & buf, typeRef->eTypeClass != typelib_TypeClass_CHAR && typeRef->eTypeClass != typelib_TypeClass_BOOLEAN) { - buf.append( static_cast< sal_Unicode >('(') ); + buf.append( '(' ); buf.append( OUString::unacquired( &typeRef->pTypeName ) ); buf.append( ") " ); } switch (typeRef->eTypeClass) { case typelib_TypeClass_INTERFACE: { - buf.append( static_cast<sal_Unicode>('@') ); + buf.append( '@' ); buf.append( reinterpret_cast< sal_Int64 >( *static_cast< void * const * >(val) ), 16 ); uno::Reference< lang::XServiceInfo > xServiceInfo( @@ -201,7 +201,7 @@ void appendValue( OUStringBuffer & buf, )->pTypeName ); break; case typelib_TypeClass_STRING: { - buf.append( static_cast< sal_Unicode >('\"') ); + buf.append( '\"' ); OUString const & str = OUString::unacquired( static_cast< rtl_uString * const * >(val) ); sal_Int32 len = str.getLength(); @@ -215,7 +215,7 @@ void appendValue( OUStringBuffer & buf, else appendChar( buf, c ); } - buf.append( static_cast< sal_Unicode >('\"') ); + buf.append( '\"' ); break; } case typelib_TypeClass_ENUM: { @@ -257,7 +257,7 @@ void appendValue( OUStringBuffer & buf, buf.append( "false" ); break; case typelib_TypeClass_CHAR: { - buf.append( static_cast< sal_Unicode >('\'') ); + buf.append( '\'' ); sal_Unicode c = *static_cast< sal_Unicode const * >(val); if (c == '\'') buf.append( "\\\'" ); @@ -265,7 +265,7 @@ void appendValue( OUStringBuffer & buf, buf.append( "\\\\" ); else appendChar( buf, c ); - buf.append( static_cast< sal_Unicode >('\'') ); + buf.append( '\'' ); break; } case typelib_TypeClass_FLOAT: @@ -303,7 +303,7 @@ void appendValue( OUStringBuffer & buf, // case typelib_TypeClass_SERVICE: // case typelib_TypeClass_MODULE: default: - buf.append( static_cast< sal_Unicode >('?') ); + buf.append( '?' ); break; } } diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 8e6dff91b3ad..37eee505d7d6 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -165,7 +165,7 @@ namespace connectivity OSL_VERIFY( aConfig.getNodeValue( *pNodeNames ) >>= sPermittedMethod ); if ( !aPermittedMethods.isEmpty() ) - aPermittedMethods.append( (sal_Unicode)';' ); + aPermittedMethods.append( ';' ); aPermittedMethods.append( sPermittedMethod ); } 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<sal_Unicode>('!') ); + 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(); } diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 8f722f0a90d3..9045c4ff2ed1 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -172,9 +172,9 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p buf.append( (*(typelib_TypeDescriptionReference **)pVal)->pTypeName ); break; case typelib_TypeClass_STRING: - buf.append( (sal_Unicode)'\"' ); + buf.append( '\"' ); buf.append( *(rtl_uString **)pVal ); - buf.append( (sal_Unicode)'\"' ); + buf.append( '\"' ); break; case typelib_TypeClass_ENUM: { @@ -194,7 +194,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p if (nPos >= 0) buf.append( ((typelib_EnumTypeDescription *)pTypeDescr)->ppEnumNames[ nPos ] ); else - buf.append( (sal_Unicode)'?' ); + buf.append( '?' ); ::typelib_typedescription_release( pTypeDescr ); break; @@ -206,9 +206,9 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p buf.append( "false" ); break; case typelib_TypeClass_CHAR: - buf.append( (sal_Unicode)'\'' ); + buf.append( '\'' ); buf.append( *(sal_Unicode *)pVal ); - buf.append( (sal_Unicode)'\'' ); + buf.append( '\'' ); break; case typelib_TypeClass_FLOAT: buf.append( *(float *)pVal ); @@ -253,7 +253,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p #endif break; default: - buf.append( (sal_Unicode)'?' ); + buf.append( '?' ); } return buf.makeStringAndClear(); diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 461f55f81b09..663ffa0458fd 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -163,7 +163,7 @@ void ProgressLogImpl::update( Any const & Status ) OUStringBuffer buf; OSL_ASSERT( m_log_level >= 0 ); for ( sal_Int32 n = 0; n < m_log_level; ++n ) - buf.append( static_cast<sal_Unicode>(' ') ); + buf.append( ' ' ); OUString msg; if (Status >>= msg) { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 16250ca4a027..913f53d7ac8a 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -921,7 +921,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() { // already existing, append extensions: OUStringBuffer buf; buf.append( insertion.first->second ); - buf.append( static_cast<sal_Unicode>(';') ); + buf.append( ';' ); buf.append( filter ); insertion.first->second = buf.makeStringAndClear(); } diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 98e066853b0f..178946a8ad0e 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -411,13 +411,13 @@ OUString UpdateDialog::Thread::getUpdateDisplayString( { OSL_ASSERT(data.aInstalledPackage.is()); OUStringBuffer b(data.aInstalledPackage->getDisplayName()); - b.append(static_cast< sal_Unicode >(' ')); + b.append(' '); { SolarMutexGuard g; if(!m_stop) b.append(m_dialog.m_version); } - b.append(static_cast< sal_Unicode >(' ')); + b.append(' '); if (!version.isEmpty()) b.append(version); else @@ -425,7 +425,7 @@ OUString UpdateDialog::Thread::getUpdateDisplayString( if (!data.sWebsiteURL.isEmpty()) { - b.append(static_cast< sal_Unicode >(' ')); + b.append(' '); { SolarMutexGuard g; if(!m_stop) diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 1792ee1ef44b..3bc0c7895979 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -624,7 +624,7 @@ OUString PackageManagerImpl::insertToActivationLayer( //Folder. No need to unzip, just copy buf.append(sourceContent.getURL()); } - buf.append( static_cast<sal_Unicode>('/') ); + buf.append( '/' ); sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv, m_xComponentContext ); } diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 5d64ce217137..8496d31e9dba 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -248,7 +248,7 @@ inline OUString encodeForRcFile( OUString const & str ) case '\\': case '{': case '}': - buf.append( static_cast<sal_Unicode>('\\') ); + buf.append( '\\' ); break; } buf.append( c ); @@ -270,7 +270,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) relPath = relPath.copy( 1 ); if (!relPath.isEmpty()) { - buf.append( static_cast<sal_Unicode>('/') ); + buf.append( '/' ); if (baseURL.match( "vnd.sun.star.expand:" )) { // encode for macro expansion: relPath is supposed to have no // macros, so encode $, {} \ (bootstrap mimic) diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 830f865360ae..95ff81a531ec 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -94,7 +94,7 @@ namespace const OUString operator () () { OUStringBuffer buf; buf.append( StrOperatingSystem::get() ); - buf.append( static_cast<sal_Unicode>('_') ); + buf.append( '_' ); buf.append( StrCPU::get() ); return buf.makeStringAndClear(); } diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 2fff496c5a1a..82ca1438e99b 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -233,7 +233,7 @@ bool readLine( OUString * res, OUString const & startingWith, if (pos < file.getLength() && (file[ pos ] == ' ' || file[ pos ] == '\t')) { - buf.append( static_cast<sal_Unicode>(' ') ); + buf.append( ' ' ); ++pos; start = pos; continue; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index fdb3fba23a2a..7fae937d5f66 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -171,7 +171,7 @@ OUString normalizeMediaType( OUString const & mediaType ) buf.append( mediaType.getToken( 0, '/', index ).trim() ); if (index < 0) break; - buf.append( static_cast< sal_Unicode >('/') ); + buf.append( '/' ); } return buf.makeStringAndClear(); } diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 44333de608f0..0b6dece25682 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1071,7 +1071,7 @@ void BackendImpl::PackageImpl::exportTo( rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ); - buf.append( static_cast<sal_Unicode>('/') ); + buf.append( '/' ); OUString destFolder( buf.makeStringAndClear() ); ::ucbhelper::Content destFolderContent( diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 58253b1faa7e..850ebeff625a 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -697,11 +697,11 @@ namespace pcr if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_LABEL ) ) { OUStringBuffer aValue; - aValue.append( (sal_Unicode)'<' ); + aValue.append( '<' ); OUString sLabel; OSL_VERIFY( xSet->getPropertyValue( PROPERTY_LABEL ) >>= sLabel ); aValue.append( sLabel ); - aValue.append( (sal_Unicode)'>' ); + aValue.append( '>' ); sControlValue = aValue.makeStringAndClear(); } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 064271a670ac..291472d6f0fa 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1190,10 +1190,10 @@ namespace pcr ) { if ( strings != _rStrings.begin() ) - aComposed.append( (sal_Unicode)';' ); - aComposed.append( (sal_Unicode)'\"' ); + aComposed.append( ';' ); + aComposed.append( '\"' ); aComposed.append( *strings ); - aComposed.append( (sal_Unicode)'\"' ); + aComposed.append( '\"' ); } return aComposed.makeStringAndClear(); } diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index f7c137513275..214fb77693ed 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -579,9 +579,9 @@ void LwpFormulaFunc::AddArg(LwpFormulaArg* pArg) OUString LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap) { OUStringBuffer aFormula; - aFormula.append(static_cast<sal_Unicode>('(')); + aFormula.append('('); aFormula.append(ToString(pCellsMap)); - aFormula.append(static_cast<sal_Unicode>(')')); + aFormula.append(')'); return aFormula.makeStringAndClear(); } /** diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 3ec61568dd35..4a6a65614cea 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -102,7 +102,7 @@ void Diagram::setLayout( const DiagramLayoutPtr & pLayout) OString normalizeDotName( const OUString& rStr ) { OUStringBuffer aBuf; - aBuf.append((sal_Unicode)'N'); + aBuf.append('N'); const sal_Int32 nLen(rStr.getLength()); sal_Int32 nCurrIndex(0); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 7b44d3045f6c..03ec2abd4339 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -316,7 +316,7 @@ OUString lcl_flattenStringSequence( const Sequence< OUString > & rSequence ) if( !rSequence[nIndex].isEmpty()) { if( bPrecedeWithSpace ) - aResult.append( static_cast< sal_Unicode >( ' ' )); + aResult.append( ' ' ); aResult.append( rSequence[nIndex] ); bPrecedeWithSpace = true; } diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index e4f45fbcafa9..c04c58eab73c 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -141,7 +141,7 @@ namespace oox { namespace ppt { } else { - sRes.append((sal_Unicode)'x'); + sRes.append('x'); } bRet = true; break; @@ -152,7 +152,7 @@ namespace oox { namespace ppt { } else { - sRes.append((sal_Unicode)'y'); + sRes.append('y'); } bRet = true; break; diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 826130cf65a9..26d3752b1209 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -383,7 +383,7 @@ void PresentationFragmentHandler::finalizeImport() { aPageRange = OUStringBuffer() .append( static_cast< sal_Int32 >( 1 ) ) - .append( static_cast< sal_Unicode >( '-' ) ) + .append( '-' ) .append( nPageCount ).makeStringAndClear(); } diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 6cb37b764fde..2685e2d27146 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -437,7 +437,7 @@ void SpaPrinterController::printPage( int ) const aToken = PaResId( aResIds[i].nResId ); nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth; aPrintText.append( aToken ); - aPrintText.append( (sal_Unicode)'\n' ); + aPrintText.append( '\n' ); }; pPrinter->DrawText( Rectangle( Point( 1000, 1000 ), diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 7a420a69aa64..be8906172e6c 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -71,9 +71,9 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef return OUString("void"); OUStringBuffer buf( 64 ); - buf.append( (sal_Unicode)'(' ); + buf.append( '(' ); buf.append( pTypeRef->pTypeName ); - buf.append( (sal_Unicode)')' ); + buf.append( ')' ); switch (pTypeRef->eTypeClass) { @@ -204,9 +204,9 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef buf.append( (*(typelib_TypeDescriptionReference **)pVal)->pTypeName ); break; case typelib_TypeClass_STRING: - buf.append( (sal_Unicode)'\"' ); + buf.append( '\"' ); buf.append( *(rtl_uString **)pVal ); - buf.append( (sal_Unicode)'\"' ); + buf.append( '\"' ); break; case typelib_TypeClass_ENUM: { @@ -223,7 +223,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef if (nPos >= 0) buf.append( ((typelib_EnumTypeDescription *)pTypeDescr)->ppEnumNames[nPos] ); else - buf.append( (sal_Unicode)'?' ); + buf.append( '?' ); TYPELIB_DANGER_RELEASE( pTypeDescr ); break; @@ -235,9 +235,9 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef buf.append( "false" ); break; case typelib_TypeClass_CHAR: - buf.append( (sal_Unicode)'\'' ); + buf.append( '\'' ); buf.append( *(sal_Unicode *)pVal ); - buf.append( (sal_Unicode)'\'' ); + buf.append( '\'' ); break; case typelib_TypeClass_FLOAT: buf.append( *(float *)pVal ); @@ -288,7 +288,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef case typelib_TypeClass_SERVICE: case typelib_TypeClass_MODULE: default: - buf.append( (sal_Unicode)'?' ); + buf.append( '?' ); } return buf.makeStringAndClear(); diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 5ef8cbe79b26..f92c3cf456fb 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -661,7 +661,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, OUStringBuffer sFullPath(sFullKeyName.getLength()); OUString token; - sFullPath.append((sal_Unicode)'/'); + sFullPath.append('/'); sal_Int32 nIndex = 0; do @@ -675,7 +675,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, } sFullPath.append(token); - sFullPath.append((sal_Unicode)'/'); + sFullPath.append('/'); } } while( nIndex != -1 ); diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index f3cf9de7328b..f80777b9dc80 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -698,7 +698,7 @@ namespace rtl_Bootstrap rtl::OUString p(t_getSourcePath(TESTSHL2_INI)); for (sal_Int32 i = 0; i < p.getLength(); ++i) { if (p[i] != 'u') { - b.append(static_cast< sal_Unicode >('\\')); + b.append('\\'); } b.append(p[i]); } diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index ad660993fc22..63a53b10922e 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -201,7 +201,7 @@ void Test::test_Uri() { aBuffer.append(static_cast< sal_Unicode >(0xD800)); // %F0%90%8F%BF aBuffer.append(static_cast< sal_Unicode >(0xDFFF)); aBuffer.append(static_cast< sal_Unicode >(0xDFFF)); // %ED%BF%BF - aBuffer.append(static_cast< sal_Unicode >('A')); // A + aBuffer.append('A'); // A aText1 = aBuffer.makeStringAndClear(); aText2 = rtl::OUString( "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A"); @@ -230,7 +230,7 @@ void Test::test_Uri() { aBuffer.append(static_cast< sal_Unicode >(0xD800)); aBuffer.append(static_cast< sal_Unicode >(0xDFFF)); aBuffer.append("%ED%BF%BF"); - aBuffer.append(static_cast< sal_Unicode >('A')); + aBuffer.append('A'); aText2 = aBuffer.makeStringAndClear(); CPPUNIT_ASSERT_MESSAGE( "failure 14", diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 62e5b4838971..8a0d82873399 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1243,22 +1243,22 @@ static void convertTime( const com::sun::star::util::DateTime& i_rDateTime) { if (i_rDateTime.Hours < 10) { - i_rBuffer.append(sal_Unicode('0')); + i_rBuffer.append('0'); } i_rBuffer.append( static_cast<sal_Int32>(i_rDateTime.Hours) ) - .append(sal_Unicode(':')); + .append(':'); if (i_rDateTime.Minutes < 10) { - i_rBuffer.append(sal_Unicode('0')); + i_rBuffer.append('0'); } i_rBuffer.append( static_cast<sal_Int32>(i_rDateTime.Minutes) ) - .append(sal_Unicode(':')); + .append(':'); if (i_rDateTime.Seconds < 10) { - i_rBuffer.append(sal_Unicode('0')); + i_rBuffer.append('0'); } i_rBuffer.append( static_cast<sal_Int32>(i_rDateTime.Seconds) ); if (i_rDateTime.NanoSeconds > 0) { OSL_ENSURE(i_rDateTime.NanoSeconds < 1000000000,"NanoSeconds cannot be more than 999 999 999"); - i_rBuffer.append(sal_Unicode('.')); + i_rBuffer.append('.'); std::ostringstream ostr; ostr.fill('0'); ostr.width(9); @@ -1339,7 +1339,7 @@ void Converter::convertDateTime( i_rDateTime.Hours != 0 || i_bAddTimeIf0AM ) { - i_rBuffer.append(sal_Unicode('T')); + i_rBuffer.append('T'); convertTime(i_rBuffer, i_rDateTime); } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index e977e46095bc..9be1ad212564 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1563,7 +1563,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : if( XclTokenArrayHelper::GetStringList( aString, *xScTokArr, '\n' ) ) { OUStringBuffer sFormulaBuf; - sFormulaBuf.append( (sal_Unicode) '"' ); + sFormulaBuf.append( '"' ); /* Formula is a list of string tokens -> build the Excel string. Data validity is BIFF8 only (important for the XclExpString object). Excel uses the NUL character as string list separator. */ @@ -1576,14 +1576,14 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : if( nToken > 0 ) { mxString1->Append(OUString(static_cast<sal_Unicode>('\0'))); - sFormulaBuf.append( (sal_Unicode) ',' ); + sFormulaBuf.append( ',' ); } mxString1->Append( aToken ); sFormulaBuf.append( aToken ); } ::set_flag( mnFlags, EXC_DV_STRINGLIST ); - sFormulaBuf.append( (sal_Unicode) '"' ); + sFormulaBuf.append( '"' ); msFormula1 = sFormulaBuf.makeStringAndClear(); } else diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index e2af13224428..85b5f868518b 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -668,7 +668,7 @@ SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPref else if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLocalName, XML_P)) ) { if(nParagraphCount) - sCommentBuffer.append(static_cast<sal_Unicode>('\n')); + sCommentBuffer.append('\n'); ++nParagraphCount; pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLocalName, xAttrList, sCommentBuffer); } @@ -1060,9 +1060,9 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem } if (nRepeat) for (sal_Int32 j = 0; j < nRepeat; ++j) - sText.append(static_cast<sal_Unicode>(' ')); + sText.append(' '); else - sText.append(static_cast<sal_Unicode>(' ')); + sText.append(' '); } else { diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 29b91dca5b2f..8e3c496226e1 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -70,9 +70,9 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, } if (nRepeat) for (sal_Int32 j = 0; j < nRepeat; ++j) - sOUText.append(static_cast<sal_Unicode>(' ')); + sOUText.append(' '); else - sOUText.append(static_cast<sal_Unicode>(' ')); + sOUText.append(' '); } if( !pContext ) diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 6ed17807c847..45181098b5b7 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -532,7 +532,7 @@ SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPre case XML_TOK_P: { if(nParagraphCount) - sMessage.append(static_cast<sal_Unicode>('\n')); + sMessage.append('\n'); ++nParagraphCount; pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, xAttrList, sMessage); } @@ -606,7 +606,7 @@ SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPr case XML_TOK_P: { if(nParagraphCount) - sMessage.append(static_cast<sal_Unicode>('\n')); + sMessage.append('\n'); ++nParagraphCount; pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, xAttrList, sMessage); } diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index fbe95423d954..e0d262747f82 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -586,14 +586,14 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) int seenright = 0; if ( bForLike ) - sResult.append(static_cast<sal_Unicode>('^')); + sResult.append('^'); while (start < end) { switch (*start) { case '?': - sResult.append(static_cast<sal_Unicode>('.')); + sResult.append('.'); start++; break; case '*': @@ -605,13 +605,13 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) start++; break; case '~': - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*(++start)); start++; break; // dump the ~ and escape the next characture case ']': - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start++); break; case '[': @@ -624,7 +624,7 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) case '[': case '?': case '*': - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start); break; case ']': @@ -632,11 +632,11 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) seenright = 1; break; case '!': - sResult.append(static_cast<sal_Unicode>('^')); + sResult.append('^'); break; default: if (NeedEsc(*start)) - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start); break; } @@ -645,13 +645,13 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) break; default: if (NeedEsc(*start)) - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start++); } } if ( bForLike ) - sResult.append(static_cast<sal_Unicode>('$')); + sResult.append('$'); return sResult.makeStringAndClear( ); } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index ce814efaff3f..76d414a1deef 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -2111,28 +2111,28 @@ void implWriteCharToBuffer( OUStringBuffer& aBuf, sal_Unicode cu, bool bKey ) { if( cu == '\\' ) { - aBuf.append( (sal_Unicode)'\\' ); - aBuf.append( (sal_Unicode)'\\' ); + aBuf.append( '\\' ); + aBuf.append( '\\' ); } else if( cu == 0x000a ) { - aBuf.append( (sal_Unicode)'\\' ); - aBuf.append( (sal_Unicode)'n' ); + aBuf.append( '\\' ); + aBuf.append( 'n' ); } else if( cu == 0x000d ) { - aBuf.append( (sal_Unicode)'\\' ); - aBuf.append( (sal_Unicode)'r' ); + aBuf.append( '\\' ); + aBuf.append( 'r' ); } else if( bKey && cu == '=' ) { - aBuf.append( (sal_Unicode)'\\' ); - aBuf.append( (sal_Unicode)'=' ); + aBuf.append( '\\' ); + aBuf.append( '=' ); } else if( bKey && cu == ':' ) { - aBuf.append( (sal_Unicode)'\\' ); - aBuf.append( (sal_Unicode)':' ); + aBuf.append( '\\' ); + aBuf.append( ':' ); } // ISO/IEC 8859-1 range according to: // http://en.wikipedia.org/wiki/ISO/IEC_8859-1 @@ -2147,8 +2147,8 @@ void implWriteCharToBuffer( OUStringBuffer& aBuf, sal_Unicode cu, bool bKey ) else { // Unicode encoding - aBuf.append( (sal_Unicode)'\\' ); - aBuf.append( (sal_Unicode)'u' ); + aBuf.append( '\\' ); + aBuf.append( 'u' ); sal_uInt16 nVal = cu; for( sal_uInt16 i = 0 ; i < 4 ; i++ ) diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3d7daa85cc7d..b69e002915d1 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -2556,7 +2556,7 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri if( aAny >>= aName ) { if( !aNames.isEmpty() ) - aNames.append( (sal_Unicode)';' ); + aNames.append( ';' ); aNames.append( aName ); } diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 7eba5b092fb7..4d74e08182cc 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -169,12 +169,12 @@ uno::Reference<rdf::XURI> createBaseURI( const OUString last( xBaseURI->getPathSegment(count - 1) ); buf.append(last); } - buf.append(static_cast<sal_Unicode>('/')); + buf.append('/'); } if (!i_rSubDocument.isEmpty()) { buf.append(i_rSubDocument); - buf.append(static_cast<sal_Unicode>('/')); + buf.append('/'); } const OUString Path(buf.makeStringAndClear()); if (!Path.isEmpty()) @@ -561,7 +561,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, } } catch (const uno::Exception &) { } OUStringBuffer buf(i_rBaseURI); - buf.append(dir).append(static_cast<sal_Unicode>('/')); + buf.append(dir).append('/'); readStream(i_rImpl, xDir, rest, buf.makeStringAndClear() ); } else { throw mkException(OUString( @@ -663,7 +663,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, } } catch (const uno::Exception &) { } OUStringBuffer buf(i_rBaseURI); - buf.append(dir).append(static_cast<sal_Unicode>('/')); + buf.append(dir).append('/'); writeStream(i_rImpl, xDir, i_xGraphName, rest, buf.makeStringAndClear()); uno::Reference<embed::XTransactedObject> const xTransaction( diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 996ce8089449..425289d8833f 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -1597,7 +1597,7 @@ OUString SAL_CALL MetadatableMixin::getLocalName() } OUStringBuffer buf; buf.append(mdref.First); - buf.append(static_cast<sal_Unicode>('#')); + buf.append('#'); buf.append(mdref.Second); return buf.makeStringAndClear(); } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 99a0061fe7df..66a54ed5bc1a 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -426,17 +426,17 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) OUStringBuffer buf; sal_Int32 n = (nTimeSecs / 3600); if (n < 10) - buf.append( static_cast<sal_Unicode>('0') ); + buf.append( '0' ); buf.append( n ); - buf.append( static_cast<sal_Unicode>(':') ); + buf.append( ':' ); n = ((nTimeSecs % 3600) / 60); if (n < 10) - buf.append( static_cast<sal_Unicode>('0') ); + buf.append( '0' ); buf.append( n ); - buf.append( static_cast<sal_Unicode>(':') ); + buf.append( ':' ); n = (nTimeSecs % 60); if (n < 10) - buf.append( static_cast<sal_Unicode>('0') ); + buf.append( '0' ); buf.append( n ); const OUString time = buf.makeStringAndClear(); diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 7fb713d4f589..a09275060079 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -1375,12 +1375,12 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel) case FNTSIZ_MULTIPLY: ::sax::Converter::convertDouble(sStrBuf, static_cast<double>(aFrac*Fraction(100.00))); - sStrBuf.append(static_cast<sal_Unicode>('%')); + sStrBuf.append('%'); break; case FNTSIZ_DIVIDE: ::sax::Converter::convertDouble(sStrBuf, static_cast<double>(Fraction(100.00)/aFrac)); - sStrBuf.append(static_cast<sal_Unicode>('%')); + sStrBuf.append('%'); break; case FNTSIZ_ABSOLUT: ::sax::Converter::convertDouble(sStrBuf, diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 3490320f9aa8..bceef4b026ea 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -972,7 +972,7 @@ static void insert_singletons( OUStringBuffer buf( 64 ); buf.append( "existing singleton service (" ); buf.append( singleton_name ); - buf.append( (sal_Unicode)'=' ); + buf.append( '=' ); buf.append( existing_name ); buf.append( ") does not support given one: " ); buf.append( service_name ); diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 448db7ea9f75..03b6fd437b37 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -92,7 +92,7 @@ static inline OUString makeStrings( { buf.appendAscii( *strings ); if (mask << 1) // more items following - buf.append( (sal_Unicode)',' ); + buf.append( ',' ); } mask = (mask << 1); ++strings; @@ -247,19 +247,19 @@ OUString SocketPermission::toString() const SAL_THROW(()) buf.append( m_host ); if (m_resolvedHost) { - buf.append( (sal_Unicode)'[' ); + buf.append( '[' ); buf.append( m_ip ); - buf.append( (sal_Unicode)']' ); + buf.append( ']' ); } // port if (0 != m_lowerPort || 65535 != m_upperPort) { - buf.append( (sal_Unicode)':' ); + buf.append( ':' ); if (m_lowerPort > 0) buf.append( m_lowerPort ); if (m_upperPort > m_lowerPort) { - buf.append( (sal_Unicode)'-' ); + buf.append( '-' ); if (m_upperPort < 65535) buf.append( m_upperPort ); } diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index 3544b60e2c96..a671aee07de3 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -57,11 +57,11 @@ OUString UriReference::getUriReference() throw (css::uno::RuntimeException) OUStringBuffer buf; if (!m_scheme.isEmpty()) { buf.append(m_scheme); - buf.append(static_cast< sal_Unicode >(':')); + buf.append(':'); } appendSchemeSpecificPart(buf); if (m_hasFragment) { - buf.append(static_cast< sal_Unicode >('#')); + buf.append('#'); buf.append(m_fragment); } return buf.makeStringAndClear(); @@ -189,7 +189,7 @@ void UriReference::appendSchemeSpecificPart(OUStringBuffer & buffer) const } buffer.append(m_path); if (m_hasQuery) { - buffer.append(static_cast< sal_Unicode >('?')); + buffer.append('?'); buffer.append(m_query); } } diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index 121c761d5a88..a6edbc135551 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -421,7 +421,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( return abs; } else { OUStringBuffer abs(baseUriReference->getScheme()); - abs.append(static_cast< sal_Unicode >(':')); + abs.append(':'); if (uriReference->hasAuthority()) { abs.append("//"); abs.append(uriReference->getAuthority()); @@ -442,7 +442,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( // these rules for consistent results. bool slash = !baseUriReference->getPath().isEmpty(); if (slash) { - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } for (Segments::iterator i(segments.begin()); i != segments.end(); ++i) @@ -452,24 +452,24 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( baseUriReference->getPathSegment(-(*i + 2))); if (!segment.isEmpty() || segments.size() > 1) { if (!slash) { - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } abs.append(segment); slash = true; - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } } else if (*i > 1) { OUString segment(uriReference->getPathSegment(*i - 2)); if (!segment.isEmpty() || segments.size() > 1) { if (!slash) { - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } abs.append(segment); slash = false; } } else if (*i == 0) { if (segments.size() > 1 && !slash) { - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } } else { switch (excessParentSegments) { @@ -478,12 +478,12 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( case css::uri::RelativeUriExcessParentSegments_RETAIN: if (!slash) { - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } abs.append(".."); slash = *i < 0; if (slash) { - abs.append(static_cast< sal_Unicode >('/')); + abs.append('/'); } break; @@ -500,11 +500,11 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( abs.append(uriReference->getPath()); } if (uriReference->hasQuery()) { - abs.append(static_cast< sal_Unicode >('?')); + abs.append('?'); abs.append(uriReference->getQuery()); } if (uriReference->hasFragment()) { - abs.append(static_cast< sal_Unicode >('#')); + abs.append('#'); abs.append(uriReference->getFragment()); } return parse(abs.makeStringAndClear()); @@ -570,7 +570,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( || uriReference->getPath().getLength() > 1) { if (uriReference->getPath().isEmpty()) { - rel.append(static_cast< sal_Unicode >('/')); + rel.append('/'); } else { assert(uriReference->getPath()[0] == '/'); if (uriReference->getPath().startsWith("//")) { @@ -585,7 +585,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( bool segments = false; for (sal_Int32 j = i; j < count1 - 1; ++j) { if (segments) { - rel.append(static_cast< sal_Unicode >('/')); + rel.append('/'); } rel.append(".."); segments = true; @@ -598,12 +598,12 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( || (parseScheme(uriReference->getPathSegment(i)) >= 0))) { - rel.append(static_cast< sal_Unicode >('.')); + rel.append('.'); segments = true; } for (; i < count2; ++i) { if (segments) { - rel.append(static_cast< sal_Unicode >('/')); + rel.append('/'); } OUString s(uriReference->getPathSegment(i)); if (encodeRetainedSpecialSegments && s == ".") { @@ -619,11 +619,11 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( } } if (!omitQuery && uriReference->hasQuery()) { - rel.append(static_cast< sal_Unicode >('?')); + rel.append('?'); rel.append(uriReference->getQuery()); } if (uriReference->hasFragment()) { - rel.append(static_cast< sal_Unicode >('#')); + rel.append('#'); rel.append(uriReference->getFragment()); } return parse(rel.makeStringAndClear()); diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index a7be7da9bc2f..9f0977776f05 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -85,9 +85,9 @@ OString createTestAssertEqualMessage( { OUStringBuffer buf; buf.appendAscii(token1); - buf.append(static_cast< sal_Unicode >('|')); + buf.append('|'); append(buf, token2); - buf.append(static_cast< sal_Unicode >('|')); + buf.append('|'); append(buf, token3); buf.append(": TEST_ASSERT_EQUAL("); buf.appendAscii(expectedExpr); @@ -97,7 +97,7 @@ OString createTestAssertEqualMessage( append(buf, expected); buf.append("> != <"); append(buf, actual); - buf.append(static_cast< sal_Unicode >('>')); + buf.append('>'); return OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); } diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 67b20b9ebcfa..0b77892b1ef8 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -74,9 +74,9 @@ void DocumentLockFile::WriteEntryToStream( uno::Sequence< OUString > aEntry, uno { aBuffer.append( EscapeCharacters( aEntry[nEntryInd] ) ); if ( nEntryInd < aEntry.getLength() - 1 ) - aBuffer.append( (sal_Unicode)',' ); + aBuffer.append( ',' ); else - aBuffer.append( (sal_Unicode)';' ); + aBuffer.append( ';' ); } OString aStringData( OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index 3f13e35aad7c..e0f3f89d0325 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -176,7 +176,7 @@ OUString LockFileCommon::EscapeCharacters( const OUString& aSource ) for ( sal_Int32 nInd = 0; nInd < aSource.getLength() && pStr[nInd] != 0; nInd++ ) { if ( pStr[nInd] == '\\' || pStr[nInd] == ';' || pStr[nInd] == ',' ) - aBuffer.append( (sal_Unicode)'\\' ); + aBuffer.append( '\\' ); aBuffer.append( pStr[nInd] ); } diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index 62e413a8973a..c1e69060fc0d 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -215,9 +215,9 @@ void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence< { aBuffer.append( EscapeCharacters( aUsersData[nInd][nEntryInd] ) ); if ( nEntryInd < SHARED_ENTRYSIZE - 1 ) - aBuffer.append( (sal_Unicode)',' ); + aBuffer.append( ',' ); else - aBuffer.append( (sal_Unicode)';' ); + aBuffer.append( ';' ); } } diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index d2c1783f9fe0..c20d4766ad9b 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -203,7 +203,7 @@ OUString normalize( return uriReference; } OUStringBuffer head(ref->getScheme()); - head.append(static_cast< sal_Unicode >(':')); + head.append(':'); if (ref->hasAuthority()) { head.append("//"); head.append(ref->getAuthority()); @@ -211,7 +211,7 @@ OUString normalize( for (sal_Int32 i = count - 1; i > 0; --i) { OUStringBuffer buf(head); for (sal_Int32 j = 0; j < i; ++j) { - buf.append(static_cast< sal_Unicode >('/')); + buf.append('/'); buf.append(ref->getPathSegment(j)); } normalized = buf.makeStringAndClear(); @@ -228,7 +228,7 @@ OUString normalize( // normalizePrefix may have added or removed a final slash: if (preCount != i) { if (preCount == i - 1) { - buf.append(static_cast< sal_Unicode >('/')); + buf.append('/'); } else if (preCount - 1 == i && !buf.isEmpty() && buf[buf.getLength() - 1] == '/') { @@ -239,15 +239,15 @@ OUString normalize( } } for (sal_Int32 j = i; j < count; ++j) { - buf.append(static_cast< sal_Unicode >('/')); + buf.append('/'); buf.append(ref->getPathSegment(j)); } if (ref->hasQuery()) { - buf.append(static_cast< sal_Unicode >('?')); + buf.append'?'); buf.append(ref->getQuery()); } if (ref->hasFragment()) { - buf.append(static_cast< sal_Unicode >('#')); + buf.append('#'); buf.append(ref->getFragment()); } return buf.makeStringAndClear(); diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 3726c331cd71..6119ca2c3a8f 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -3482,7 +3482,7 @@ bool ImpSvNumberInputScan::IsNumberFormat( const OUString& rString, // s } if ( nDecPos == 2 && k < nAnzNums ) // . somewhere { - sResString.append((sal_Unicode)'.'); + sResString.append('.'); sal_uInt16 nStop = (eScannedType == NUMBERFORMAT_SCIENTIFIC ? nAnzNums-1 : nAnzNums); for ( ; k < nStop; k++) @@ -3497,10 +3497,10 @@ bool ImpSvNumberInputScan::IsNumberFormat( const OUString& rString, // s } else { // append exponent - sResString.append((sal_Unicode)'E'); + sResString.append('E'); if ( nESign == -1 ) { - sResString.append((sal_Unicode)'-'); + sResString.append('-'); } sResString.append(sStrArray[nNums[nAnzNums-1]]); rtl_math_ConversionStatus eStatus; diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 9d1b5d98ac40..3263b125ce62 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -433,7 +433,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) case '&': bEqSignFound = false; if( bReadXMP ) - sTmpBuffer.append( (sal_Unicode)'&' ); + sTmpBuffer.append( '&' ); else { sal_uLong nStreamPos = rInput.Tell(); @@ -542,7 +542,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) { // back in stream, insert '&' // and restart with next character - sTmpBuffer.append( (sal_Unicode)'&' ); + sTmpBuffer.append( '&' ); DBG_ASSERT( rInput.Tell()-nStreamPos == (sal_uLong)(nPos+1)*GetCharSize(), @@ -618,7 +618,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) // &{...};-JavaScript-Macros are not supported any longer. else if( IsParserWorking() ) { - sTmpBuffer.append( (sal_Unicode)'&' ); + sTmpBuffer.append( '&' ); bNextCh = false; break; } @@ -632,7 +632,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) // \ has to be escaped as well. // Space is protected because it's not a delimiter between // options. - sTmpBuffer.append( (sal_Unicode)'\\' ); + sTmpBuffer.append( '\\' ); if( MAX_LEN == sTmpBuffer.getLength() ) aToken += sTmpBuffer.makeStringAndClear(); } @@ -670,11 +670,11 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( '>'==cBreak ) { // Innerhalb von Tags kennzeichnen - sTmpBuffer.append( (sal_Unicode)'\\' ); + sTmpBuffer.append( '\\' ); if( MAX_LEN == sTmpBuffer.getLength() ) aToken += sTmpBuffer.makeStringAndClear(); } - sTmpBuffer.append( (sal_Unicode)'\\' ); + sTmpBuffer.append( '\\' ); break; case '\"': @@ -713,7 +713,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( '>' == cBreak ) { // If scanning options treat it like a space, ... - sTmpBuffer.append( (sal_Unicode)' ' ); + sTmpBuffer.append( ' ' ); } else { diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 50266e8c069c..1661cd8f5370 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -104,7 +104,7 @@ namespace svx ) { aExtensionList.append( *pExtension ); - aExtensionList.append( (sal_Unicode)';' ); + aExtensionList.append( ';' ); } m_rLocationInput.SetFilter( aExtensionList.makeStringAndClear() ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 66a67eec3a96..94d4c2e8fad7 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2967,7 +2967,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt // the prefix for the next level aNextLevelPrefix = _rCurrentLevelPrefix; if ( !_rCurrentLevelPrefix.isEmpty() ) - aNextLevelPrefix.append( (sal_Unicode)'/' ); + aNextLevelPrefix.append( '/' ); aNextLevelPrefix.append( sCurrentFormName ); // remember both the form and it's "display name" diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 470c5c2b4154..a1d36049ac68 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -307,7 +307,7 @@ static void lcl_xmltble_appendBoxPrefix( OUStringBuffer& rBuffer, sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop ) { rBuffer.append( rNamePrefix ); - rBuffer.append( (sal_Unicode)'.' ); + rBuffer.append( '.' ); if( bTop ) { OUString sTmp; @@ -317,7 +317,7 @@ static void lcl_xmltble_appendBoxPrefix( OUStringBuffer& rBuffer, else { rBuffer.append( (sal_Int32)(nCol + 1)); - rBuffer.append( (sal_Unicode)'.' ); + rBuffer.append( '.' ); } rBuffer.append( (sal_Int32)(nRow + 1)); } @@ -541,7 +541,7 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ) if( rCol.GetRelWidth() ) { sValue.append( (sal_Int32)rCol.GetRelWidth() ); - sValue.append( (sal_Unicode)'*' ); + sValue.append( '*' ); AddAttribute( XML_NAMESPACE_STYLE, XML_REL_COLUMN_WIDTH, sValue.makeStringAndClear() ); } @@ -618,7 +618,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, else { sBuffer.append( rNamePrefix ); - sBuffer.append( (sal_Unicode)'.' ); + sBuffer.append( '.' ); if( bTop ) { OUString sTmp; diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 6e4223f62a3b..17105e61411c 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -149,11 +149,11 @@ void SwXMLTextParagraphExport::exportStyleContent( if( eFunc != XML_TOKEN_INVALID ) { sBuffer.append( GetXMLToken(eFunc) ); - sBuffer.append( (sal_Unicode)'(' ); - sBuffer.append( (sal_Unicode)')' ); + sBuffer.append( '(' ); + sBuffer.append( ')' ); if( !sVal.isEmpty() ) { - sBuffer.append( (sal_Unicode)'=' ); + sBuffer.append( '=' ); sBuffer.append( sVal ); } @@ -511,11 +511,11 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( case '\\': if( aBuffer.isEmpty() ) { - aBuffer.append( (sal_Unicode)'\'' ); + aBuffer.append( '\'' ); aBuffer.append( sRange.copy( 0, i ) ); } if( '\'' == c || '\\' == c ) - aBuffer.append( (sal_Unicode)'\\' ); + aBuffer.append( '\\' ); // no break! default: if( !aBuffer.isEmpty() ) @@ -524,7 +524,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( } if( !aBuffer.isEmpty() ) { - aBuffer.append( (sal_Unicode)'\'' ); + aBuffer.append( '\'' ); sRange = aBuffer.makeStringAndClear(); } diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 572e0584319d..dadb401cbc3f 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -1122,7 +1122,7 @@ SfxItemPresentation SwGammaGrf::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) aText.append(SW_RESSTR(STR_GAMMA)); - aText.append(GetValue()).append(static_cast<sal_Unicode>('%')); + aText.append(GetValue()).append('%'); break; default: diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 354e970e2e0e..6701f409d314 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -202,7 +202,7 @@ void appendStringLiteral(OUStringBuffer * pBuffer, { OSL_ASSERT(pBuffer); - pBuffer->append(sal_Unicode('"')); + pBuffer->append('"'); sal_Unicode const * p = rString.getStr(); sal_Unicode const * pEnd = p + rString.getLength(); while (p != pEnd) diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx index f9d5976dece6..b5d0cf9aa7b4 100644 --- a/unotools/source/config/docinfohelper.cxx +++ b/unotools/source/config/docinfohelper.cxx @@ -40,7 +40,7 @@ OUString DocInfoHelper::GetGeneratorString() if ( !aValue.isEmpty() ) { aResult.append( aValue.replace( ' ', '_' ) ); - aResult.append( (sal_Unicode)'/' ); + aResult.append( '/' ); aValue = utl::ConfigManager::getProductVersion(); if ( !aValue.isEmpty() ) @@ -58,11 +58,11 @@ OUString DocInfoHelper::GetGeneratorString() OUString arch( "$_ARCH" ); ::rtl::Bootstrap::expandMacros(os); ::rtl::Bootstrap::expandMacros(arch); - aResult.append( (sal_Unicode)'$' ); + aResult.append( '$' ); aResult.append( os ); - aResult.append( (sal_Unicode)'_' ); + aResult.append( '_' ); aResult.append( arch ); - aResult.append( (sal_Unicode)' ' ); + aResult.append( ' ' ); } // second product: LibreOffice_project/<build_information> @@ -79,13 +79,13 @@ OUString DocInfoHelper::GetGeneratorString() { case '(': case '[': - aResult.append( (sal_Unicode)'$' ); + aResult.append( '$' ); break; case ')': case ']': break; case ':': - aResult.append( (sal_Unicode)'-' ); + aResult.append( '-' ); break; default: aResult.append( c ); diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 1ff373c66f0a..a05ee218d664 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1745,7 +1745,7 @@ OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); OUStringBuffer aDebugMsg(rDebugMsg); - aDebugMsg.append(static_cast<sal_Unicode>('\n')); + aDebugMsg.append('\n'); aDebugMsg.append(maLanguageTag.getBcp47()); aDebugMsg.appendAscii(" requested\n"); LanguageTag aLoaded = getLoadedLanguageTag(); diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index ae2077f7128a..6b184a6ae77a 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -569,14 +569,14 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) int seenright = 0; if ( bForLike ) - sResult.append(static_cast<sal_Unicode>('^')); + sResult.append('^'); while (start < end) { switch (*start) { case '?': - sResult.append(static_cast<sal_Unicode>('.')); + sResult.append('.'); start++; break; case '*': @@ -588,13 +588,13 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) start++; break; case '~': - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*(++start)); start++; break; // dump the ~ and escape the next characture case ']': - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start++); break; case '[': @@ -607,7 +607,7 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) case '[': case '?': case '*': - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append(('\\'); sResult.append(*start); break; case ']': @@ -615,11 +615,11 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) seenright = 1; break; case '!': - sResult.append(static_cast<sal_Unicode>('^')); + sResult.append('^'); break; default: if (NeedEsc(*start)) - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start); break; } @@ -628,13 +628,13 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) break; default: if (NeedEsc(*start)) - sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append('\\'); sResult.append(*start++); } } if ( bForLike ) - sResult.append(static_cast<sal_Unicode>('$')); + sResult.append('$'); return sResult.makeStringAndClear( ); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 26401f548e0b..4a46a0fec92e 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -532,7 +532,7 @@ OUString lcl_flattenStringSequence( const Sequence< OUString > & rSequence ) if( !rSequence[nIndex].isEmpty()) { if( bPrecedeWithSpace ) - aResult.append( static_cast< sal_Unicode >( ' ' )); + aResult.append( ' ' ); aResult.append( rSequence[nIndex] ); bPrecedeWithSpace = true; } @@ -1113,7 +1113,7 @@ static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Se if(nIndex>=0) { if(bHasPredecessor) - aBuf.append( static_cast< sal_Unicode >( ' ' )); + aBuf.append( ' ' ); aBuf.append( nIndex, 10 ); bHasPredecessor = true; } diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index db543753ced6..a2dd40013ee2 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -65,13 +65,8 @@ makeCURIE(SvXMLExport * i_pExport, OSL_ENSURE(!Namespace.isEmpty(), "makeCURIE: no namespace"); if (Namespace.isEmpty()) throw uno::RuntimeException(); - OUStringBuffer buf; - buf.append( i_pExport->EnsureNamespace(Namespace) ); - buf.append( static_cast<sal_Unicode>(':') ); // N.B.: empty LocalName is valid! - buf.append( i_xURI->getLocalName() ); - - return buf.makeStringAndClear(); + return i_pExport->EnsureNamespace(Namespace) + ":" + i_xURI->getLocalName(); } // #i112473# SvXMLExport::GetRelativeReference() not right for RDF on SaveAs diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 07255e7c1797..25a4b1c8c59c 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -148,7 +148,7 @@ namespace xmloff bSuccess = SvXMLUnitConverter::convertEnum(aReturn, nType, OEnumMapper::getEnumMap(OEnumMapper::epFontEmphasis), XML_NONE); if (bSuccess) { - aReturn.append( (sal_Unicode)' ' ); + aReturn.append( ' ' ); aReturn.append( GetXMLToken(bBelow ? XML_BELOW : XML_ABOVE) ); _rStrExpValue = aReturn.makeStringAndClear(); diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 6db245243dd8..e28fed2cf49a 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -243,7 +243,7 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno: nBegin = i_rBuildId.indexOf( sBuildCompare, nEnd ); if ( nBegin != -1 ) { - sBuffer.append( (sal_Unicode)'$' ); + sBuffer.append( '$' ); sBuffer.append( i_rBuildId.copy( nBegin + sBuildCompare.getLength() ) ); sBuildId = sBuffer.makeStringAndClear(); diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index 92f145fc69f7..32f7abe6a132 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -108,21 +108,21 @@ bool XMLClipPropertyHandler::exportXML( OUString& rStrExpValue, const uno::Any& if( rValue >>= aCrop ) { aOut.append( GetXMLToken(XML_RECT) ); - aOut.append( (sal_Unicode)'(' ); + aOut.append( '(' ); rUnitConverter.convertMeasureToXML( aOut, aCrop.Top ); if( !m_bODF11 ) - aOut.append( (sal_Unicode)',' ); - aOut.append( (sal_Unicode)' ' ); + aOut.append( ',' ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, aCrop.Right ); if( !m_bODF11 ) - aOut.append( (sal_Unicode)',' ); - aOut.append( (sal_Unicode)' ' ); + aOut.append( ',' ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, aCrop.Bottom ); if( !m_bODF11 ) - aOut.append( (sal_Unicode)',' ); - aOut.append( (sal_Unicode)' ' ); + aOut.append( ',' ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, aCrop.Left ); - aOut.append( (sal_Unicode)')' ); + aOut.append( ')' ); rStrExpValue = aOut.makeStringAndClear(); bRet = true; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 6658a3eb3aab..e6084ac02c61 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -289,7 +289,7 @@ static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool b aFmtName.append( nKey ); if (!bDefPart) { - aFmtName.append( (sal_Unicode)'P' ); + aFmtName.append( 'P' ); aFmtName.append( nPart ); } return aFmtName.makeStringAndClear(); @@ -706,11 +706,11 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit, aCondStr.appendAscii( "value()" ); //! define constant switch ( nOp ) { - case NUMBERFORMAT_OP_EQ: aCondStr.append( (sal_Unicode) '=' ); break; + case NUMBERFORMAT_OP_EQ: aCondStr.append( '=' ); break; case NUMBERFORMAT_OP_NE: aCondStr.appendAscii( "<>" ); break; - case NUMBERFORMAT_OP_LT: aCondStr.append( (sal_Unicode) '<' ); break; + case NUMBERFORMAT_OP_LT: aCondStr.append( '<' ); break; case NUMBERFORMAT_OP_LE: aCondStr.appendAscii( "<=" ); break; - case NUMBERFORMAT_OP_GT: aCondStr.append( (sal_Unicode) '>' ); break; + case NUMBERFORMAT_OP_GT: aCondStr.append( '>' ); break; case NUMBERFORMAT_OP_GE: aCondStr.appendAscii( ">=" ); break; default: OSL_FAIL("unknown operator"); diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index 838020d99693..eea85b9e0006 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -167,7 +167,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) { // style:rel-width ::sax::Converter::convertNumber( sValue, pColumns->Width ); - sValue.append( (sal_Unicode)'*' ); + sValue.append( '*' ); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_REL_WIDTH, sValue.makeStringAndClear() ); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 721e9b26f77b..8835667d46ee 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3082,9 +3082,9 @@ void XMLTextParagraphExport::_exportTextGraphic( { OUStringBuffer sRet( GetXMLToken(XML_ROTATE).getLength()+4 ); sRet.append( GetXMLToken(XML_ROTATE)); - sRet.append( (sal_Unicode)'(' ); + sRet.append( '(' ); ::sax::Converter::convertNumber( sRet, (sal_Int32)nVal ); - sRet.append( (sal_Unicode)')' ); + sRet.append( ')' ); GetExport().AddAttribute( XML_NAMESPACE_SVG, XML_TRANSFORM, sRet.makeStringAndClear() ); } diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index f6112e435bcb..eb6575d3f7cf 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -937,7 +937,7 @@ bool XMLTextEmphasizePropHdl_Impl::exportXML( if( nType != 0 ) { enum XMLTokenEnum ePos = bBelow ? XML_BELOW : XML_ABOVE; - aOut.append( (sal_Unicode)' ' ); + aOut.append( ' ' ); aOut.append( GetXMLToken(ePos) ); } rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index cc2702e9f153..d6d707b6c72d 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -89,8 +89,8 @@ namespace XmlSec { if (i != vecAttrValueOfDN.begin()) { - s1.append(static_cast<sal_Unicode>(',')); - s2.append(static_cast<sal_Unicode>('\n')); + s1.append(','); + s2.append('\n'); } s1.append(i->second); s2.append(i->first + sEqual + i->second); |