diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-13 12:10:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2013-11-14 06:16:12 +0000 |
| commit | 39c8da8c86decbe3443a786ad445a18b0078daa3 (patch) | |
| tree | 6a94899b413111ddf497885b17bb8df751a0d9f6 | |
| parent | f50699c816de8e4be3433c6387e37d92aedd41a0 (diff) | |
remove unnecessary sal_Unicode casts in XMLOFF module
Change-Id: I836c7a28d5ec9039c0b185e8db2aa6d01ac62566
Reviewed-on: https://gerrit.libreoffice.org/6665
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
45 files changed, 247 insertions, 247 deletions
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 12c639f88e54..c72f1afab145 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -946,11 +946,11 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume OUStringBuffer aRoleBuffer("error-bars-"); if( bYError ) - aRoleBuffer.append( sal_Unicode( 'y' )); + aRoleBuffer.append( 'y' ); else - aRoleBuffer.append( sal_Unicode( 'x' )); + aRoleBuffer.append( 'x'); - aRoleBuffer.append( sal_Unicode( '-' )); + aRoleBuffer.append( '-' ); if( bPositiveValue ) aRoleBuffer = aRoleBuffer.appendAscii( "positive" ); diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 0f26b13b8048..54f0aa9df2e7 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -219,7 +219,7 @@ OUString DomExport::qualifiedName( const OUString& sPrefix, { addNamespace( sPrefix, sURI ); sBuffer.append( sPrefix ); - sBuffer.append( sal_Unicode( ':' ) ); + sBuffer.append( ':' ); } sBuffer.append( sLocalName ); return sBuffer.makeStringAndClear(); diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 7297b5f7878f..204fb11acf40 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -180,7 +180,7 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const const OUString & prefix( (*aIter).second->sPrefix ); if (!prefix.isEmpty()) // not default namespace { - sAttrName.append( sal_Unicode(':') ); + sAttrName.append( ':' ); sAttrName.append( prefix ); } } @@ -209,7 +209,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, sQName.append ( sXMLNS ); if (!rLocalName.isEmpty()) // not default namespace { - sQName.append ( sal_Unicode(':') ); + sQName.append ( ':' ); sQName.append ( rLocalName ); } return sQName.makeStringAndClear(); @@ -219,7 +219,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, // this namespace is reserved, and needs not to be declared OUStringBuffer sQName; sQName.append ( GetXMLToken(XML_XML) ); - sQName.append ( sal_Unicode(':') ); + sQName.append ( ':' ); sQName.append ( rLocalName ); return sQName.makeStringAndClear(); } @@ -243,7 +243,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, if (!prefix.isEmpty()) // not default namespace { sQName.append( prefix ); - sQName.append( sal_Unicode(':') ); + sQName.append( ':' ); } sQName.append ( rLocalName ); if (bCache) @@ -307,7 +307,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName, { rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry()); - sal_Int32 nColonPos = rAttrName.indexOf( sal_Unicode(':') ); + sal_Int32 nColonPos = rAttrName.indexOf( ':' ); if( -1L == nColonPos ) { // case: no ':' found -> default namespace diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index e51c612c4477..c6e4c4d8ad0d 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -66,7 +66,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const { const sal_uInt16 nAttrCount = mpContainer->GetAttrCount(); - sal_Int32 nPos = aName.indexOf( sal_Unicode(':') ); + sal_Int32 nPos = aName.indexOf( ':' ); if( nPos == -1L ) { for( sal_uInt16 nAttr = 0; nAttr < nAttrCount; nAttr++ ) @@ -142,7 +142,7 @@ uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames(void { OUStringBuffer sBuffer( mpContainer->GetAttrPrefix(nAttr) ); if( !sBuffer.isEmpty() ) - sBuffer.append( (sal_Unicode)':' ); + sBuffer.append( ':' ); sBuffer.append( mpContainer->GetAttrLName(nAttr) ); *pNames++ = sBuffer.makeStringAndClear(); } @@ -167,7 +167,7 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons xml::AttributeData* pData = (xml::AttributeData*)aElement.getValue(); - sal_Int32 nPos = aName.indexOf( sal_Unicode(':') ); + sal_Int32 nPos = aName.indexOf( ':' ); if( nPos != -1L ) { const OUString aPrefix( aName.copy( 0L, nPos )); @@ -210,7 +210,7 @@ throw( lang::IllegalArgumentException, container::ElementExistException, lang::W xml::AttributeData* pData = (xml::AttributeData*)aElement.getValue(); - sal_Int32 nPos = aName.indexOf( sal_Unicode(':') ); + sal_Int32 nPos = aName.indexOf( ':' ); if( nPos != -1L ) { const OUString aPrefix( aName.copy( 0L, nPos )); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 1bec1845f824..3459747cdf4b 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -913,7 +913,7 @@ SvXMLExport::EnsureNamespace(OUString const & i_rNamespace, // add the namespace to the map and as attribute mpNamespaceMap->Add( sPrefix, i_rNamespace ); buf.append( GetXMLToken(XML_XMLNS) ); - buf.append( sal_Unicode(':') ); + buf.append( ':' ); buf.append( sPrefix ); AddAttribute( buf.makeStringAndClear(), i_rNamespace ); } diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index a980f8f4d4b8..8f9f9210153a 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -377,35 +377,35 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, } sal_uInt16 nTemp = aDate.GetYear(); if (nTemp < 1000) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); if (nTemp < 100) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); if (nTemp < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( nTemp)); - rBuffer.append( sal_Unicode('-')); + rBuffer.append( '-'); nTemp = aDate.GetMonth(); if (nTemp < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( nTemp)); - rBuffer.append( sal_Unicode('-')); + rBuffer.append( '-'); nTemp = aDate.GetDay(); if (nTemp < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( nTemp)); if(bHasTime || bAddTimeIf0AM) { - rBuffer.append( sal_Unicode('T')); + rBuffer.append( 'T'); if (fHoursValue < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( fHoursValue)); - rBuffer.append( sal_Unicode(':')); + rBuffer.append( ':'); if (fMinsValue < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( fMinsValue)); - rBuffer.append( sal_Unicode(':')); + rBuffer.append( ':'); if (fSecsValue < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( fSecsValue)); if (f100SecsValue > 0.0) { @@ -414,7 +414,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, XML_MAXDIGITSCOUNT_TIME - nCount, '.', sal_True)); if ( a100th.getLength() > 2 ) { - rBuffer.append( sal_Unicode('.')); + rBuffer.append( '.'); rBuffer.append( a100th.copy( 2 ) ); // strip 0. } } @@ -448,7 +448,7 @@ sal_Bool SvXMLUnitConverter::convertDateTime( double& fDateTime, } -SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator /* = sal_Unicode(' ') */ ) +SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator /* = ' ' */ ) : maTokenString( rString ), mnNextTokenPos(0), mcSeparator( cSeparator ) { } @@ -485,7 +485,7 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri return false; sal_Int32 nPos(1L); - sal_Int32 nFound = _sValue.indexOf(sal_Unicode(' '), nPos); + sal_Int32 nFound = _sValue.indexOf(' ', nPos); if(nFound == -1 || nFound <= nPos) return false; @@ -493,7 +493,7 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri _rContentX = _sValue.copy(nPos, nFound - nPos); nPos = nFound + 1; - nFound = _sValue.indexOf(sal_Unicode(' '), nPos); + nFound = _sValue.indexOf(' ', nPos); if(nFound == -1 || nFound <= nPos) return false; @@ -501,7 +501,7 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri _rContentY = _sValue.copy(nPos, nFound - nPos); nPos = nFound + 1; - nFound = _sValue.indexOf(sal_Unicode(')'), nPos); + nFound = _sValue.indexOf(')', nPos); if(nFound == -1 || nFound <= nPos) return false; @@ -519,20 +519,20 @@ sal_Bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, co rtl_math_ConversionStatus eStatus; - rVector.setX(::rtl::math::stringToDouble(aContentX, sal_Unicode('.'), - sal_Unicode(','), &eStatus, NULL)); + rVector.setX(::rtl::math::stringToDouble(aContentX, '.', + ',', &eStatus, NULL)); if( eStatus != rtl_math_ConversionStatus_Ok ) return sal_False; - rVector.setY(::rtl::math::stringToDouble(aContentY, sal_Unicode('.'), - sal_Unicode(','), &eStatus, NULL)); + rVector.setY(::rtl::math::stringToDouble(aContentY, '.', + ',', &eStatus, NULL)); if( eStatus != rtl_math_ConversionStatus_Ok ) return sal_False; - rVector.setZ(::rtl::math::stringToDouble(aContentZ, sal_Unicode('.'), - sal_Unicode(','), &eStatus, NULL)); + rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.', + ',', &eStatus, NULL)); return ( eStatus == rtl_math_ConversionStatus_Ok ); @@ -541,13 +541,13 @@ sal_Bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, co /** convert ::basegfx::B3DVector to string */ void SvXMLUnitConverter::convertB3DVector( OUStringBuffer &rBuffer, const ::basegfx::B3DVector& rVector ) { - rBuffer.append(sal_Unicode('(')); + rBuffer.append('('); ::sax::Converter::convertDouble(rBuffer, rVector.getX()); - rBuffer.append(sal_Unicode(' ')); + rBuffer.append(' '); ::sax::Converter::convertDouble(rBuffer, rVector.getY()); - rBuffer.append(sal_Unicode(' ')); + rBuffer.append(' '); ::sax::Converter::convertDouble(rBuffer, rVector.getZ()); - rBuffer.append(sal_Unicode(')')); + rBuffer.append(')'); } /** convert string to Position3D */ @@ -569,13 +569,13 @@ sal_Bool SvXMLUnitConverter::convertPosition3D( drawing::Position3D& rPosition, void SvXMLUnitConverter::convertPosition3D( OUStringBuffer &rBuffer, const drawing::Position3D& rPosition ) { - rBuffer.append( sal_Unicode('(') ); + rBuffer.append( '(' ); convertDouble( rBuffer, rPosition.PositionX, sal_True ); - rBuffer.append( sal_Unicode(' ') ); + rBuffer.append( ' ' ); convertDouble( rBuffer, rPosition.PositionY, sal_True ); - rBuffer.append( sal_Unicode(' ') ); + rBuffer.append( ' ' ); convertDouble( rBuffer, rPosition.PositionZ, sal_True ); - rBuffer.append( sal_Unicode(')') ); + rBuffer.append( ')' ); } sal_Bool SvXMLUnitConverter::convertNumFormat( @@ -599,11 +599,11 @@ sal_Bool SvXMLUnitConverter::convertNumFormat( { switch( rNumFmt[0] ) { - case sal_Unicode('1'): rType = NumberingType::ARABIC; break; - case sal_Unicode('a'): rType = NumberingType::CHARS_LOWER_LETTER; break; - case sal_Unicode('A'): rType = NumberingType::CHARS_UPPER_LETTER; break; - case sal_Unicode('i'): rType = NumberingType::ROMAN_LOWER; break; - case sal_Unicode('I'): rType = NumberingType::ROMAN_UPPER; break; + case '1': rType = NumberingType::ARABIC; break; + case 'a': rType = NumberingType::CHARS_LOWER_LETTER; break; + case 'A': rType = NumberingType::CHARS_UPPER_LETTER; break; + case 'i': rType = NumberingType::ROMAN_LOWER; break; + case 'I': rType = NumberingType::ROMAN_UPPER; break; default: bExt = true; break; } if( !bExt && IsXMLToken( rNumLetterSync, XML_TRUE ) ) @@ -818,7 +818,7 @@ OUString SvXMLUnitConverter::encodeStyleName( } else { - aBuffer.append( static_cast< sal_Unicode >( '_' ) ); + aBuffer.append( '_' ); if( c > 0x0fff ) aBuffer.append( static_cast< sal_Unicode >( aHexTab[ (c >> 12) & 0x0f ] ) ); @@ -830,7 +830,7 @@ OUString SvXMLUnitConverter::encodeStyleName( aHexTab[ (c >> 4) & 0x0f ] ) ); aBuffer.append( static_cast< sal_Unicode >( aHexTab[ c & 0x0f ] ) ); - aBuffer.append( static_cast< sal_Unicode >( '_' ) ); + aBuffer.append( '_' ); if( pEncoded ) *pEncoded = sal_True; } diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index b7ebd2ba526f..2fbcf17cc032 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -607,7 +607,7 @@ void AnimationsExporterImpl::exportTransitionNode() mxPageProps->getPropertyValue("TransitionDuration") >>= fDuration; ::sax::Converter::convertDouble( sTmp, fDuration ); - sTmp.append( sal_Unicode('s')); + sTmp.append( 's'); mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() ); SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) ); @@ -792,7 +792,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod if( aTemp >>= fTemp ) { ::sax::Converter::convertDouble( sTmp, fTemp ); - sTmp.append( sal_Unicode('s')); + sTmp.append( 's'); mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() ); } else @@ -1059,7 +1059,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& else { sTmp.append( fTemp ); - sTmp.append( (sal_Unicode)'s' ); + sTmp.append( 's' ); mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, sTmp.makeStringAndClear() ); } } @@ -1201,7 +1201,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat while( nLength-- ) { if( !sTmp.isEmpty() ) - sTmp.append( (sal_Unicode)';' ); + sTmp.append( ';' ); sTmp.append( *p++ ); } @@ -1245,7 +1245,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat while( nLength-- ) { if( !sTmp.isEmpty() ) - sTmp.append( (sal_Unicode)';' ); + sTmp.append( ';' ); sTmp.append( OUString::number(p->Time) + "," + OUString::number(p->Progress) ); @@ -1458,7 +1458,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString const ValuePair* pValuePair = static_cast< const ValuePair* >( rValue.getValue() ); OUStringBuffer sTmp2; convertValue( eAttributeName, sTmp, pValuePair->First ); - sTmp.append( (sal_Unicode)',' ); + sTmp.append( ',' ); convertValue( eAttributeName, sTmp2, pValuePair->Second ); sTmp.append( sTmp2.makeStringAndClear() ); } @@ -1474,7 +1474,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString for( nElement = 0; nElement < nLength; nElement++, pAny++ ) { if( !sTmp.isEmpty() ) - sTmp.append( (sal_Unicode)';' ); + sTmp.append( ';' ); convertValue( eAttributeName, sTmp2, *pAny ); sTmp.append( sTmp2.makeStringAndClear() ); } @@ -1556,7 +1556,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa for( nElement = 0; nElement < nLength; nElement++, pAny++ ) { if( !sTmp.isEmpty() ) - sTmp.append( (sal_Unicode)';' ); + sTmp.append( ';' ); convertTiming( sTmp2, *pAny ); sTmp.append( sTmp2.makeStringAndClear() ); } @@ -1564,7 +1564,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa else if( rValue.getValueType() == ::getCppuType((const double*)0) ) { sTmp.append( *(static_cast< const double* >( rValue.getValue() )) ); - sTmp.append( sal_Unicode('s')); + sTmp.append( 's'); } else if( rValue.getValueType() == ::getCppuType((const Timing*)0) ) { @@ -1582,7 +1582,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa if( pEvent->Source.hasValue() ) { convertSource( sTmp, pEvent->Source ); - sTmp.append( (sal_Unicode)'.' ); + sTmp.append( '.' ); } SvXMLUnitConverter::convertEnum( sTmp2, (sal_uInt16)pEvent->Trigger, getAnimationsEnumMap(Animations_EnumMap_EventTrigger) ); @@ -1595,7 +1595,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa convertTiming( sTmp2, pEvent->Offset ); if( !sTmp.isEmpty() ) - sTmp.append( (sal_Unicode)'+' ); + sTmp.append( '+' ); sTmp.append( sTmp2.makeStringAndClear() ); } diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 826c09a1271a..9c55aa18521e 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -98,7 +98,7 @@ bool XMLOpacityPropertyHdl::importXML( bool bRet = false; sal_Int32 nValue = 0; - if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 ) + if( rStrImpValue.indexOf( '%' ) != -1 ) { if (::sax::Converter::convertPercent( nValue, rStrImpValue )) bRet = true; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index fcd4ca1c6024..21e35740a30c 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1825,7 +1825,7 @@ void SdXMLExport::_ExportContent() if( !aBookmarkURL.isEmpty() ) { - sal_Int32 nIndex = aBookmarkURL.lastIndexOf( (sal_Unicode)'#' ); + sal_Int32 nIndex = aBookmarkURL.lastIndexOf( '#' ); if( nIndex != -1 ) { OUString aFileName( aBookmarkURL.copy( 0, nIndex ) ); @@ -2117,7 +2117,7 @@ void SdXMLExport::exportPresentationSettings() continue; if( !sTmp.isEmpty() ) - sTmp.append( sal_Unicode( ',' ) ); + sTmp.append( ',' ); sTmp.append( xPageName->getName() ); } @@ -2624,7 +2624,7 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag if( !sId.isEmpty() ) { if( !sNavOrder.isEmpty() ) - sNavOrder.append( (sal_Unicode)' ' ); + sNavOrder.append( ' ' ); sNavOrder.append( sId ); } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index fef66ec28ec1..82adf525a2a1 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1662,7 +1662,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x eClickAction == presentation::ClickAction_DOCUMENT ) { if( eClickAction == presentation::ClickAction_BOOKMARK ) - msBuffer.append( sal_Unicode('#') ); + msBuffer.append( '#' ); msBuffer.append( aStrBookmark ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) ); @@ -3637,7 +3637,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter ) { if ( !rStrBuffer.isEmpty() ) - rStrBuffer.append( (sal_Unicode)' ' ); + rStrBuffer.append( ' ' ); if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE ) { double fNumber = 0.0; @@ -3659,7 +3659,7 @@ void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing: case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : { - rStrBuffer.append( (sal_Unicode)'$' ); + rStrBuffer.append( '$' ); rStrBuffer.append( OUString::number( nValue ) ); } break; @@ -3699,7 +3699,7 @@ void ImpExportEquations( SvXMLExport& rExport, const uno::Sequence< OUString >& sal_Int32 i; for ( i = 0; i < rEquations.getLength(); i++ ) { - OUString aStr(static_cast<sal_Unicode>('f')); + OUString aStr('f'); aStr += OUString::number( i ); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStr ); @@ -3707,11 +3707,11 @@ void ImpExportEquations( SvXMLExport& rExport, const uno::Sequence< OUString >& sal_Int32 nIndex = 0; do { - nIndex = aStr.indexOf( (sal_Unicode)'?', nIndex ); + nIndex = aStr.indexOf( '?', nIndex ); if ( nIndex != -1 ) { OUString aNew( aStr.copy( 0, nIndex + 1 ) ); - aNew += OUString(static_cast<sal_Unicode>('f')); + aNew += OUString('f'); aNew += aStr.copy( nIndex + 1, ( aStr.getLength() - nIndex ) - 1 ); aStr = aNew; nIndex++; @@ -3921,47 +3921,47 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, aSegment = rSegments[ j ]; if ( !aStrBuffer.isEmpty() ) - aStrBuffer.append( (sal_Unicode)' ' ); + aStrBuffer.append( ' ' ); sal_Int32 nParameter = 0; switch( aSegment.Command ) { case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : - aStrBuffer.append( (sal_Unicode)'Z' ); break; + aStrBuffer.append( 'Z' ); break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : - aStrBuffer.append( (sal_Unicode)'N' ); break; + aStrBuffer.append( 'N' ); break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : - aStrBuffer.append( (sal_Unicode)'F' ); break; + aStrBuffer.append( 'F' ); break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : - aStrBuffer.append( (sal_Unicode)'S' ); break; + aStrBuffer.append( 'S' ); break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO : - aStrBuffer.append( (sal_Unicode)'M' ); nParameter = 1; break; + aStrBuffer.append( 'M' ); nParameter = 1; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO : - aStrBuffer.append( (sal_Unicode)'L' ); nParameter = 1; break; + aStrBuffer.append( 'L' ); nParameter = 1; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : - aStrBuffer.append( (sal_Unicode)'C' ); nParameter = 3; break; + aStrBuffer.append( 'C' ); nParameter = 3; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : - aStrBuffer.append( (sal_Unicode)'T' ); nParameter = 3; break; + aStrBuffer.append( 'T' ); nParameter = 3; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : - aStrBuffer.append( (sal_Unicode)'U' ); nParameter = 3; break; + aStrBuffer.append( 'U' ); nParameter = 3; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : - aStrBuffer.append( (sal_Unicode)'A' ); nParameter = 4; break; + aStrBuffer.append( 'A' ); nParameter = 4; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC : - aStrBuffer.append( (sal_Unicode)'B' ); nParameter = 4; break; + aStrBuffer.append( 'B' ); nParameter = 4; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : - aStrBuffer.append( (sal_Unicode)'W' ); nParameter = 4; break; + aStrBuffer.append( 'W' ); nParameter = 4; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : - aStrBuffer.append( (sal_Unicode)'V' ); nParameter = 4; break; + aStrBuffer.append( 'V' ); nParameter = 4; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : - aStrBuffer.append( (sal_Unicode)'X' ); nParameter = 1; break; + aStrBuffer.append( 'X' ); nParameter = 1; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : - aStrBuffer.append( (sal_Unicode)'Y' ); nParameter = 1; break; + aStrBuffer.append( 'Y' ); nParameter = 1; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO : - aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break; + aStrBuffer.append( 'Q' ); nParameter = 2; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO : if ( bExtended ) { - aStrBuffer.append( (sal_Unicode)'G' ); + aStrBuffer.append( 'G' ); nParameter = 2; } else { aStrBuffer.setLength( aStrBuffer.getLength() - 1); @@ -3971,25 +3971,25 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN : if ( bExtended ) - aStrBuffer.append( (sal_Unicode)'H' ); + aStrBuffer.append( 'H' ); else bNeedExtended = true; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS : if ( bExtended ) - aStrBuffer.append( (sal_Unicode)'I' ); + aStrBuffer.append( 'I' ); else bNeedExtended = true; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN : if ( bExtended ) - aStrBuffer.append( (sal_Unicode)'J' ); + aStrBuffer.append( 'J' ); else bNeedExtended = true; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS : if ( bExtended ) - aStrBuffer.append( (sal_Unicode)'K' ); + aStrBuffer.append( 'K' ); else bNeedExtended = true; break; @@ -4137,7 +4137,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean false, util::MeasureUnit::PERCENT, util::MeasureUnit::PERCENT); - aStrBuffer.append( (sal_Unicode)'%' ); + aStrBuffer.append( '%' ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_BRIGHTNESS, aStr ); } @@ -4170,7 +4170,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean false, util::MeasureUnit::PERCENT, util::MeasureUnit::PERCENT); - aStrBuffer.append( (sal_Unicode)'%' ); + aStrBuffer.append( '%' ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_DIFFUSION, aStr ); } @@ -4218,7 +4218,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean false, util::MeasureUnit::PERCENT, util::MeasureUnit::PERCENT); - aStrBuffer.append( (sal_Unicode)'%' ); + aStrBuffer.append( '%' ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_FIRST_LIGHT_LEVEL, aStr ); } @@ -4235,7 +4235,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean false, util::MeasureUnit::PERCENT, util::MeasureUnit::PERCENT); - aStrBuffer.append( (sal_Unicode)'%' ); + aStrBuffer.append( '%' ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SECOND_LIGHT_LEVEL, aStr ); } @@ -4334,7 +4334,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean false, util::MeasureUnit::PERCENT, util::MeasureUnit::PERCENT); - aStrBuffer.append( (sal_Unicode)'%' ); + aStrBuffer.append( '%' ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SHININESS, aStr ); } @@ -4363,7 +4363,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean false, util::MeasureUnit::PERCENT, util::MeasureUnit::PERCENT); - aStrBuffer.append( (sal_Unicode)'%' ); + aStrBuffer.append( '%' ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SPECULARITY, aStr ); } @@ -4648,7 +4648,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean for ( i = 0; i < nAdjustmentValues; i++ ) { if ( i ) - aStrBuffer.append( (sal_Unicode)' ' ); + aStrBuffer.append( ' ' ); const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue& rAdj = aAdjustmentValues[ i ]; if ( rAdj.State == beans::PropertyState_DIRECT_VALUE ) diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index dbc5cdbe9c4d..ecdbdd21b36b 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -59,28 +59,28 @@ void Imp_CalcVectorValues(::basegfx::B2DVector& aVec1, ::basegfx::B2DVector& aVe void Imp_SkipSpaces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) { while(rPos < nLen - && sal_Unicode(' ') == rStr[rPos]) + && ' ' == rStr[rPos]) rPos++; } void Imp_SkipSpacesAndOpeningBraces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) { while(rPos < nLen - && (sal_Unicode(' ') == rStr[rPos] || sal_Unicode('(') == rStr[rPos])) + && (' ' == rStr[rPos] || '(' == rStr[rPos])) rPos++; } void Imp_SkipSpacesAndCommas(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) { while(rPos < nLen - && (sal_Unicode(' ') == rStr[rPos] || sal_Unicode(',') == rStr[rPos])) + && (' ' == rStr[rPos] || ',' == rStr[rPos])) rPos++; } void Imp_SkipSpacesAndClosingBraces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) { while(rPos < nLen - && (sal_Unicode(' ') == rStr[rPos] || sal_Unicode(')') == rStr[rPos])) + && (' ' == rStr[rPos] || ')' == rStr[rPos])) rPos++; } @@ -90,9 +90,9 @@ bool Imp_IsOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAl { sal_Unicode aChar(rStr[nPos]); - if((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) - || (bSignAllowed && sal_Unicode('+') == aChar) - || (bSignAllowed && sal_Unicode('-') == aChar) + if(('0' <= aChar && '9' >= aChar) + || (bSignAllowed && '+' == aChar) + || (bSignAllowed && '-' == aChar) ) return true; return false; @@ -102,9 +102,9 @@ bool Imp_IsOnUnitChar(const OUString& rStr, const sal_Int32 nPos) { sal_Unicode aChar(rStr[nPos]); - if((sal_Unicode('a') <= aChar && sal_Unicode('z') >= aChar) - || (sal_Unicode('A') <= aChar && sal_Unicode('Z') >= aChar) - || sal_Unicode('%') == aChar + if(('a' <= aChar && 'z' >= aChar) + || ('A' <= aChar && 'Z' >= aChar) + || '%' == aChar ) return true; return false; @@ -140,7 +140,7 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue) const sal_Int32 aLen(rStr.getLength()); if(aLen) if(Imp_IsOnNumberChar(rStr, aLen - 1, false) && nValue >= 0) - rStr += OUString(static_cast<sal_Unicode>(' ')); + rStr += OUString(' '); Imp_PutNumberChar(rStr, nValue); } @@ -150,31 +150,31 @@ void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32) { sal_Unicode aChar(rStr[rPos]); - if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar) + if('+' == aChar || '-' == aChar) { ++rPos; aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; } - while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) - || sal_Unicode('.') == aChar) + while(('0' <= aChar && '9' >= aChar) + || '.' == aChar) { ++rPos; aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; } - if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar) + if('e' == aChar || 'E' == aChar) { ++rPos; aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; - if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar) + if('+' == aChar || '-' == aChar) { ++rPos; aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; } - while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) + while('0' <= aChar && '9' >= aChar) { ++rPos; aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; @@ -188,35 +188,35 @@ double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32 sal_Unicode aChar(rStr[rPos]); OUStringBuffer sNumberString; - if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar) + if('+' == aChar || '-' == aChar) { sNumberString.append(rStr[rPos]); ++rPos; aChar = rPos >= nLen ? 0 : rStr[rPos]; } - while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) - || sal_Unicode('.') == aChar) + while(('0' <= aChar && '9' >= aChar) + || '.' == aChar) { sNumberString.append(rStr[rPos]); ++rPos; aChar = rPos >= nLen ? 0 : rStr[rPos]; } - if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar) + if('e' == aChar || 'E' == aChar) { sNumberString.append(rStr[rPos]); ++rPos; aChar = rPos >= nLen ? 0 : rStr[rPos]; - if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar) + if('+' == aChar || '-' == aChar) { sNumberString.append(rStr[rPos]); ++rPos; aChar = rPos >= nLen ? 0 : rStr[rPos]; } - while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) + while('0' <= aChar && '9' >= aChar) { sNumberString.append(rStr[rPos]); ++rPos; diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 3c32828cb9d4..f60580f770ff 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -160,7 +160,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r { rtl_math_ConversionStatus eStatus; double fAttrDouble = ::rtl::math::stringToDouble( rValue, - (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL ); + '.', ',', &eStatus, NULL ); if ( eStatus == rtl_math_ConversionStatus_Ok ) { beans::PropertyValue aProp; @@ -218,13 +218,13 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter sal_Bool bMustBePositiveWholeNumbered = sal_False; rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL; - if ( rParaString[ nIndex ] == (sal_Unicode)'$' ) + if ( rParaString[ nIndex ] == '$' ) { rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; bMustBePositiveWholeNumbered = sal_True; nIndex++; } - else if ( rParaString[ nIndex ] == (sal_Unicode)'?' ) + else if ( rParaString[ nIndex ] == '?' ) { nIndex++; bNumberRequired = sal_False; @@ -237,7 +237,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter nIndex += aEquationName.getLength(); } } - else if ( rParaString[ nIndex ] > (sal_Unicode)'9' ) + else if ( rParaString[ nIndex ] > '9' ) { bNumberRequired = sal_False; if ( rParaString.matchIgnoreAsciiCaseAsciiL( "left", 4, nIndex ) ) @@ -420,8 +420,8 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if ( bValid ) { // skipping white spaces and commas (#i121507#) - const sal_Unicode aSpace(sal_Unicode(' ')); - const sal_Unicode aCommata(sal_Unicode(',')); + const sal_Unicode aSpace(' '); + const sal_Unicode aCommata(','); while(nIndex < rParaString.getLength()) { @@ -990,7 +990,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax nIndex += aUnitStr.getLength(); // skipping white spaces - while( ( nIndex < rValue.getLength() ) && rValue[ nIndex ] == (sal_Unicode)' ' ) + while( ( nIndex < rValue.getLength() ) && rValue[ nIndex ] == ' ' ) nIndex++; if ( GetNextParameter( rFraction, nIndex, rValue ) ) diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 331e9d21ed5c..e8d1b99f1357 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -641,7 +641,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) aStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_SD_PRESENTATION_ID, aStyleName ); - sal_Int32 nPos = aStyleName.lastIndexOf( sal_Unicode('-') ); + sal_Int32 nPos = aStyleName.lastIndexOf( '-' ); if( -1 != nPos ) { OUString aFamily( aStyleName.copy( 0, nPos ) ); diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index 6d95202e3f35..affe7823a804 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -227,7 +227,7 @@ SvXMLImportContext * SdXMLShowsContext::CreateChildContext( sal_uInt16 p_nPrefix Reference< XIndexContainer > xShow( mpImpl->mxShowFactory->createInstance(), UNO_QUERY ); if( xShow.is() ) { - SvXMLTokenEnumerator aPageNames( aPages, sal_Unicode(',') ); + SvXMLTokenEnumerator aPageNames( aPages, ',' ); OUString sPageName; Any aAny; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index accdfb79f452..b8ce62cfbabd 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1219,7 +1219,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co { uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW ); OUString sPrefix(rMaster.GetDisplayName()); - sPrefix += OUString(static_cast<sal_Unicode>('-')); + sPrefix += OUString('-'); ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); } catch (const uno::Exception&) @@ -1329,7 +1329,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc if( nPrefLen ) { - sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( sal_Unicode('-') ) + 1; + sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( '-' ) + 1; if( (nPrefLen != nStylePrefLen) || (aStyleName.compareTo( rPrefix, nPrefLen ) != 0) ) continue; @@ -1425,7 +1425,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc OUString aStyleName(pStyle->GetDisplayName()); if( nPrefLen ) { - sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( sal_Unicode('-') ) + 1; + sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( '-' ) + 1; if( (nPrefLen != nStylePrefLen) || (aStyleName.compareTo( rPrefix, nPrefLen ) != 0) ) continue; @@ -1439,7 +1439,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); if( nPrefLen ) { - sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( sal_Unicode('-') ) + 1; + sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( '-' ) + 1; if( (nPrefLen != nStylePrefLen) || (sParentStyleDisplayName.compareTo( rPrefix, nPrefLen ) != 0) ) continue; diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 387ac6fe7a5b..b75cf0f6fcb3 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -45,7 +45,7 @@ using namespace ::xmloff::token; static void lcl_AddTwoDigits( OUStringBuffer& rStr, sal_Int32 nVal ) { if ( nVal < 10 ) - rStr.append( sal_Unicode('0') ); + rStr.append( '0' ); rStr.append( nVal ); } @@ -56,15 +56,15 @@ SvXMLMetaExport::GetISODateTimeString( const util::DateTime& rDateTime ) OUStringBuffer sTmp; sTmp.append( (sal_Int32) rDateTime.Year ); - sTmp.append( sal_Unicode('-') ); + sTmp.append( '-' ); lcl_AddTwoDigits( sTmp, rDateTime.Month ); - sTmp.append( sal_Unicode('-') ); + sTmp.append( '-' ); lcl_AddTwoDigits( sTmp, rDateTime.Day ); - sTmp.append( sal_Unicode('T') ); + sTmp.append( 'T' ); lcl_AddTwoDigits( sTmp, rDateTime.Hours ); - sTmp.append( sal_Unicode(':') ); + sTmp.append( ':' ); lcl_AddTwoDigits( sTmp, rDateTime.Minutes ); - sTmp.append( sal_Unicode(':') ); + sTmp.append( ':' ); lcl_AddTwoDigits( sTmp, rDateTime.Seconds ); return sTmp.makeStringAndClear(); diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index 4548d0949b41..5127c1b6147f 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -80,7 +80,7 @@ void XMLStarBasicExportHandler::Export( { OUStringBuffer sTmp( sLocation.getLength() + sName.getLength() + 1 ); sTmp = sLocation; - sTmp.append( sal_Unicode( ':' ) ); + sTmp.append( ':' ); sTmp.append( sName ); rExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, sTmp.makeStringAndClear()); diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 108f11ce7fd9..6743026482dd 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -141,7 +141,7 @@ sal_Bool XMLDashStyleImport::importXML( case XML_TOK_DASH_DOTS1LEN: { - if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // it's a percentage + if( rStrValue.indexOf( '%' ) != -1 ) // it's a percentage { bIsRel = true; ::sax::Converter::convertPercent(aLineDash.DotLen, rStrValue); @@ -160,7 +160,7 @@ sal_Bool XMLDashStyleImport::importXML( case XML_TOK_DASH_DOTS2LEN: { - if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // it's a percentage + if( rStrValue.indexOf( '%' ) != -1 ) // it's a percentage { bIsRel = true; ::sax::Converter::convertPercent(aLineDash.DashLen, rStrValue); @@ -175,7 +175,7 @@ sal_Bool XMLDashStyleImport::importXML( case XML_TOK_DASH_DISTANCE: { - if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // it's a percentage + if( rStrValue.indexOf( '%' ) != -1 ) // it's a percentage { bIsRel = true; ::sax::Converter::convertPercent(aLineDash.Distance, rStrValue); diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index d3f204fbf3a9..814243d9ba7b 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -209,7 +209,7 @@ void XMLBackgroundImageContext::ProcessAttrs( { bOK = sal_False; } - else if( -1 != aToken.indexOf( sal_Unicode('%') ) ) + else if( -1 != aToken.indexOf( '%' ) ) { sal_Int32 nPrc = 50; if (::sax::Converter::convertPercent( nPrc, aToken )) diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index 4aaa340cab79..25dba04d75c3 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -92,7 +92,7 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL, if( !aOut.isEmpty() ) { - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); switch( ePos ) { diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx index b611c5d25763..51b4084dbf93 100644 --- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx @@ -40,7 +40,7 @@ bool XMLBitmapLogicalSizePropertyHandler::importXML( Any& rValue, const SvXMLUnitConverter& ) const { - rValue = ::cppu::bool2any( rStrImpValue.indexOf( sal_Unicode('%') ) == -1 ); + rValue = ::cppu::bool2any( rStrImpValue.indexOf( '%' ) == -1 ); return true; } diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx index 0855c8a78a37..ed6f30091d88 100644 --- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx @@ -82,7 +82,7 @@ bool XMLBitmapRepeatOffsetPropertyHandler::exportXML( if( rValue >>= nValue ) { ::sax::Converter::convertPercent( aOut, nValue ); - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); aOut.append( mbX ? msHorizontal : msVertical ); rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx index 7e9ebb569c6c..69656fe6d9a4 100644 --- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx @@ -45,7 +45,7 @@ bool XMLFillBitmapSizePropertyHandler::importXML( sal_Int32 nValue; bool bRet; - if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 ) + if( rStrImpValue.indexOf( '%' ) != -1 ) { bRet = ::sax::Converter::convertPercent( nValue, rStrImpValue ); nValue *= -1; diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 16ff2b2095e4..d979e9df4c7e 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -174,7 +174,7 @@ OUString XMLFontAutoStylePool::Add( } if( sName.isEmpty() ) - sName = OUString( sal_Unicode( 'F' ) ); + sName = OUString( 'F' ); if( m_aNames.find(sName) != m_aNames.end() ) { diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 1fb975405367..c237d827986c 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -34,7 +34,7 @@ bool XMLIsPercentagePropertyHandler::importXML( Any& rValue, const SvXMLUnitConverter& ) const { - rValue <<= (sal_Bool)(rStrImpValue.indexOf( sal_Unicode('%') ) != -1); + rValue <<= (sal_Bool)(rStrImpValue.indexOf( '%' ) != -1); return true; } diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx index 081639b79252..6d04ebeddf78 100644 --- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx +++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx @@ -46,7 +46,7 @@ bool XMLPercentOrMeasurePropertyHandler::importXML( Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - if( (rStrImpValue.indexOf( sal_Unicode('%') ) != -1) != mbPercent ) + if( (rStrImpValue.indexOf( '%' ) != -1) != mbPercent ) return false; sal_Int32 nValue; diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index fe48bf3d9ff6..a50542beedaf 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -66,7 +66,7 @@ bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno { bRet = false; } - else if( -1 != aToken.indexOf( sal_Unicode('%') ) ) + else if( -1 != aToken.indexOf( '%' ) ) { sal_Int32 nPrc = 50; if (::sax::Converter::convertPercent( nPrc, aToken )) @@ -181,7 +181,7 @@ bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno if( bRet ) { - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); switch( eLocation ) { diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index b211cef5fd2d..36c4deab9ce6 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -168,9 +168,9 @@ bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu return false; rUnitConverter.convertMeasureToXML( aOut, aBorderLine.InnerLineWidth ); - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, aBorderLine.LineDistance ); - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, aBorderLine.OuterLineWidth ); rStrExpValue = aOut.makeStringAndClear(); @@ -304,7 +304,7 @@ bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, co ::sax::Converter::convertMeasure( aOut, nWidth, util::MeasureUnit::MM_100TH, util::MeasureUnit::POINT); - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); XMLTokenEnum eStyleToken = XML_SOLID; switch ( aBorderLine.LineStyle ) @@ -345,7 +345,7 @@ bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, co } aOut.append( GetXMLToken( eStyleToken ) ); - aOut.append( sal_Unicode( ' ' ) ); + aOut.append( ' ' ); ::sax::Converter::convertColor( aOut, aBorderLine.Color ); } diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index ab6bc3ccabe1..9e03f58b2902 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -40,7 +40,7 @@ XMLCharHeightHdl::~XMLCharHeightHdl() bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - if( rStrImpValue.indexOf( sal_Unicode('%') ) == -1 ) + if( rStrImpValue.indexOf( '%' ) == -1 ) { double fSize; sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString( @@ -67,8 +67,8 @@ bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue fSize = ::std::max<float>(fSize, 1.0f); // fdo#49876: 0pt is invalid ::sax::Converter::convertDouble(aOut, (double)fSize, true, util::MeasureUnit::POINT, util::MeasureUnit::POINT); - aOut.append( sal_Unicode('p')); - aOut.append( sal_Unicode('t')); + aOut.append( 'p'); + aOut.append( 't'); } rStrExpValue = aOut.makeStringAndClear(); @@ -86,7 +86,7 @@ XMLCharHeightPropHdl::~XMLCharHeightPropHdl() bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 ) + if( rStrImpValue.indexOf( '%' ) != -1 ) { sal_Int32 nPrc = 100; if (::sax::Converter::convertPercent( nPrc, rStrImpValue )) diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index 860774a66993..f1e3a8ce3a52 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -150,7 +150,7 @@ bool XMLEscapementHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::A if( rValue >>= nValue ) { if( !rStrExpValue.isEmpty() ) - aOut.append( sal_Unicode(' ')); + aOut.append( ' '); ::sax::Converter::convertPercent( aOut, nValue ); } diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index b61803a04afb..5421f36a4696 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -73,16 +73,16 @@ bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno::Any sal_Int32 nLast = (-1 == nPos ? rStrImpValue.getLength() - 1 : nPos - 1); // skip trailing blanks - while( nLast > nFirst && sal_Unicode(' ') == rStrImpValue[nLast] ) + while( nLast > nFirst && ' ' == rStrImpValue[nLast] ) nLast--; // skip leading blanks - while(nFirst <= nLast && sal_Unicode(' ') == rStrImpValue[nFirst]) + while(nFirst <= nLast && ' ' == rStrImpValue[nFirst]) nFirst++; // remove quotes sal_Unicode c = nFirst > nLast ? 0 : rStrImpValue[nFirst]; - if( nFirst < nLast && (sal_Unicode('\'') == c || sal_Unicode('\"') == c) && rStrImpValue[nLast] == c ) + if( nFirst < nLast && ('\'' == c || '\"' == c) && rStrImpValue[nLast] == c ) { nFirst++; nLast--; @@ -122,7 +122,7 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any do { sal_Int32 nFirst = nPos; - nPos = aStrFamilyName.indexOf( sal_Unicode(';'), nPos ); + nPos = aStrFamilyName.indexOf( ';', nPos ); sal_Int32 nLast = (-1 == nPos ? aStrFamilyName.getLength() : nPos); // Set position to the character behind the ';', so we won't @@ -141,19 +141,19 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any nLast--; // skip trailing blanks - while( nLast > nFirst && sal_Unicode(' ') == aStrFamilyName[nLast] ) + while( nLast > nFirst && ' ' == aStrFamilyName[nLast] ) nLast--; // skip leading blanks - while( nFirst <= nLast && sal_Unicode(' ') == aStrFamilyName[nFirst] ) + while( nFirst <= nLast && ' ' == aStrFamilyName[nFirst] ) nFirst++; if( nFirst <= nLast ) { if( !sValue.isEmpty() ) { - sValue.append( sal_Unicode( ',' ) ); - sValue.append( sal_Unicode( ' ' )); + sValue.append( ',' ); + sValue.append( ' ' ); } sal_Int32 nLen = nLast-nFirst+1; OUString sFamily( aStrFamilyName.copy( nFirst, nLen ) ); @@ -161,17 +161,17 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any for( sal_Int32 i=0; i < nLen; i++ ) { sal_Unicode c = sFamily[i]; - if( sal_Unicode(' ') == c || sal_Unicode(',') == c ) + if( ' ' == c || ',' == c ) { bQuote = true; break; } } if( bQuote ) - sValue.append( sal_Unicode('\'') ); + sValue.append( '\'' ); sValue.append( sFamily ); if( bQuote ) - sValue.append( sal_Unicode('\'') ); + sValue.append( '\'' ); } } while( -1L != nPos ); diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index d6efc21ddfd2..b190d3802020 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -44,7 +44,7 @@ bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue style::LineSpacing aLSp; sal_Int32 nTemp = 0; - if( -1 != rStrImpValue.indexOf( sal_Unicode( '%' ) ) ) + if( -1 != rStrImpValue.indexOf( '%' ) ) { aLSp.Mode = style::LineSpacingMode::PROP; if (!::sax::Converter::convertPercent( nTemp, rStrImpValue )) diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index ff63bd11e0f8..348fd132d773 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -151,9 +151,9 @@ bool XMLShadowPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue ::sax::Converter::convertColor( aOut, aShadow.Color ); - aOut.append( sal_Unicode(' ') ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, nX ); - aOut.append( sal_Unicode(' ') ); + aOut.append( ' ' ); rUnitConverter.convertMeasureToXML( aOut, nY ); rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index c67d1127f166..05bdf815225b 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -928,7 +928,7 @@ void SvXMLExportPropertyMapper::_exportXML( // extract namespace prefix from attribute name if it exists OUString sPrefix; const sal_Int32 nColonPos = - pAttribName->indexOf( sal_Unicode(':') ); + pAttribName->indexOf( ':' ); if( nColonPos != -1 ) sPrefix = pAttribName->copy( 0, nColonPos ); diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 3df644016351..79e712fa3054 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -299,7 +299,7 @@ void SvXMLImportPropertyMapper::importXML( if( XML_NAMESPACE_NONE != nPrefix ) { sName.append( aPrefix ); - sName.append( sal_Unicode(':') ); + sName.append( ':' ); aData.Namespace = aNamespace; } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 6c44888fd0bb..c87f754d3743 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -813,7 +813,7 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm // (one occurrence is enough even if there are several percent characters in the string) OUString aString( rContent.getStr() ); - sal_Int32 nPos = aString.indexOf( (sal_Unicode) '%' ); + sal_Int32 nPos = aString.indexOf( '%' ); if ( nPos >= 0 ) { if ( nPos + 1 < nLength ) @@ -825,8 +825,8 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm else { // quote text behind percent character - rContent.insert( nPos + 1, (sal_Unicode) '"' ); - rContent.append( (sal_Unicode) '"' ); + rContent.insert( nPos + 1, '"' ); + rContent.append( '"' ); } } if ( nPos > 0 ) @@ -838,8 +838,8 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm else { // quote text before percent character - rContent.insert( nPos, (sal_Unicode) '"' ); - rContent.insert( 0, (sal_Unicode) '"' ); + rContent.insert( nPos, '"' ); + rContent.insert( 0, '"' ); } } bQuote = sal_False; @@ -850,7 +850,7 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm if ( bQuote ) { // #i55469# quotes in the string itself have to be escaped - bool bEscape = ( rContent.indexOf( (sal_Unicode) '"' ) >= 0 ); + bool bEscape = ( rContent.indexOf( '"' ) >= 0 ); if ( bEscape ) { // A quote is turned into "\"" - a quote to end quoted text, an escaped quote, @@ -860,7 +860,7 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm sal_Int32 nPos = 0; while ( nPos < rContent.getLength() ) { - if ( rContent[nPos] == (sal_Unicode) '"' ) + if ( rContent[nPos] == '"' ) { rContent.insert( nPos, aInsert ); nPos += aInsert.getLength(); @@ -870,23 +870,23 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm } // quote string literals - rContent.insert( 0, (sal_Unicode) '"' ); - rContent.append( (sal_Unicode) '"' ); + rContent.insert( 0, '"' ); + rContent.append( '"' ); // remove redundant double quotes at start or end if ( bEscape ) { if ( rContent.getLength() > 2 && - rContent[0] == (sal_Unicode) '"' && - rContent[1] == (sal_Unicode) '"' ) + rContent[0] == '"' && + rContent[1] == '"' ) { rContent.remove(0, 2); } sal_Int32 nLen = rContent.getLength(); if ( nLen > 2 && - rContent[nLen - 1] == (sal_Unicode) '"' && - rContent[nLen - 2] == (sal_Unicode) '"' ) + rContent[nLen - 1] == '"' && + rContent[nLen - 2] == '"' ) { rContent.truncate(nLen - 2); } @@ -1085,12 +1085,12 @@ void SvXMLNumFmtElementContext::EndElement() break; case XML_TOK_STYLE_TEXT_CONTENT: - rParent.AddToCode( (sal_Unicode)'@'); + rParent.AddToCode( '@'); break; case XML_TOK_STYLE_FILL_CHARACTER: if ( !aContent.isEmpty() ) { - rParent.AddToCode( (sal_Unicode)'*' ); + rParent.AddToCode( '*' ); rParent.AddToCode( aContent[0] ); } break; @@ -1178,7 +1178,7 @@ void SvXMLNumFmtElementContext::EndElement() rParent.AddToCode(rParent.GetLocaleData().getNumDecimalSep()); for (sal_Int32 i=0; i<aNumInfo.nDecimals; i++) { - rParent.AddToCode( (sal_Unicode)'0'); + rParent.AddToCode( '0'); } } break; @@ -1190,7 +1190,7 @@ void SvXMLNumFmtElementContext::EndElement() // add integer part only if min-integer-digits attribute is there aNumInfo.nDecimals = 0; rParent.AddNumber( aNumInfo ); // number without decimals - rParent.AddToCode( (sal_Unicode)' ' ); + rParent.AddToCode( ' ' ); } //! build string and add at once @@ -1198,9 +1198,9 @@ void SvXMLNumFmtElementContext::EndElement() sal_Int32 i; for (i=0; i<aNumInfo.nNumerDigits; i++) { - rParent.AddToCode( (sal_Unicode)'?' ); + rParent.AddToCode( '?' ); } - rParent.AddToCode( (sal_Unicode)'/' ); + rParent.AddToCode( '/' ); if ( aNumInfo.nFracDenominator > 0 ) { rParent.AddToCode( OUString::number( aNumInfo.nFracDenominator ) ); @@ -1209,7 +1209,7 @@ void SvXMLNumFmtElementContext::EndElement() { for (i=0; i<aNumInfo.nDenomDigits; i++) { - rParent.AddToCode( (sal_Unicode)'?'); + rParent.AddToCode( '?'); } } } @@ -1222,7 +1222,7 @@ void SvXMLNumFmtElementContext::EndElement() rParent.AddToCode( OUString("E+") ); for (sal_Int32 i=0; i<aNumInfo.nExpDigits; i++) { - rParent.AddToCode( (sal_Unicode)'0' ); + rParent.AddToCode( '0' ); } } break; @@ -1396,7 +1396,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, // language code in upper hex: aFormatCode.append(OUString::number(eLang, 16).toAsciiUpperCase()); } - aFormatCode.append( sal_Unicode(']') ); + aFormatCode.append( ']' ); } } } @@ -1594,7 +1594,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) // and no color definition (detected by the '[' at the start) if ( nType == XML_TOK_STYLES_NUMBER_STYLE && !bHasExtraText && - aMyConditions.empty() && sFormat.toChar() != (sal_Unicode)'[' ) + aMyConditions.empty() && sFormat.toChar() != '[' ) nIndex = pFormatter->GetStandardIndex( nFormatLang ); } if ( bAutoInt ) // automatic integer digits @@ -1602,7 +1602,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) //! only if two decimal places was set? if ( nType == XML_TOK_STYLES_NUMBER_STYLE && !bHasExtraText && - aMyConditions.empty() && sFormat.toChar() != (sal_Unicode)'[' ) + aMyConditions.empty() && sFormat.toChar() != '[' ) nIndex = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, nFormatLang ); } @@ -1787,7 +1787,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) // #i43959# For scientific numbers, "#" in the integer part forces a digit, // so it has to be removed if nLeading is 0 (".00E+0", not "#.00E+0"). - aNumStr.stripStart((sal_Unicode)'#'); + aNumStr.stripStart('#'); } if ( nEmbeddedCount ) @@ -1813,7 +1813,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) sal_Int32 nAddCount = nLastFormatPos + 1 - nZeroPos; for(sal_Int32 index = 0; index < nAddCount; ++index) { - aNumStr.insert(0, (sal_Unicode)'#'); + aNumStr.insert(0, '#'); } nZeroPos = nZeroPos + nAddCount; } @@ -1929,7 +1929,7 @@ void SvXMLNumFormatContext::AddCurrency( const OUString& rContent, LanguageType aFormatCode.append("-" + OUString::number(sal_Int32(nLang), 16).toAsciiUpperCase()); } - aFormatCode.append( (sal_Unicode) ']' ); // end of "new" currency symbol + aFormatCode.append( ']' ); // end of "new" currency symbol } } @@ -2084,7 +2084,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) if ( pFormat ) aConditions.append( OUString( pFormat->GetFormatstring() ) ); - aConditions.append( (sal_Unicode) ';' ); + aConditions.append( ';' ); } } @@ -2112,8 +2112,8 @@ void SvXMLNumFormatContext::AddColor( sal_uInt32 const nColor ) if ( !aColName.isEmpty() ) { - aColName.insert( 0, (sal_Unicode) '[' ); - aColName.append( (sal_Unicode) ']' ); + aColName.insert( 0, '[' ); + aColName.append( ']' ); aFormatCode.insert( 0, aColName.makeStringAndClear() ); } } @@ -2127,7 +2127,7 @@ void SvXMLNumFormatContext::UpdateCalendar( const OUString& rNewCalendar ) { aFormatCode.appendAscii( "[~" ); // intro for calendar code aFormatCode.append( sCalendar ); - aFormatCode.append( (sal_Unicode) ']' ); // end of "new" currency symbolcalendar code + aFormatCode.append( ']' ); // end of "new" currency symbolcalendar code } } } diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 07596e71d8c7..5141f74ba8f4 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -86,8 +86,8 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl( { aTabStop.Position = 0; aTabStop.Alignment = style::TabAlign_LEFT; - aTabStop.DecimalChar = sal_Unicode( ',' ); - aTabStop.FillChar = sal_Unicode( ' ' ); + aTabStop.DecimalChar = ','; + aTabStop.FillChar = ' '; sal_Unicode cTextFillChar = 0; SvXMLTokenMap aTokenMap( aTabsAttributesAttrTokenMap ); diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index cf1eef1a7428..90553d6ac276 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3201,7 +3201,7 @@ void XMLDdeFieldImportContext::EndElement() OUStringBuffer sBuf; sBuf.appendAscii(sAPI_fieldmaster_prefix); sBuf.appendAscii(sAPI_dde); - sBuf.append(sal_Unicode('.')); + sBuf.append('.'); sBuf.append(sName); OUString sMasterName = sBuf.makeStringAndClear(); diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index e86cb91bf914..553276a19be8 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -393,7 +393,7 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext( sPropertyNumberFormat(sAPI_number_format), sPropertySequenceValue(sAPI_sequence_value), - sNumFormat(OUString(sal_Unicode('1'))), + sNumFormat(OUString('1')), sNumFormatSync(GetXMLToken(XML_FALSE)), bRefNameOK(sal_False) { diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index a24933af53f8..f793ce973f46 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -208,7 +208,7 @@ void XMLEventOOoTransformerContext::StartElement( aLocation = GetXMLToken( XML_DOCUMENT ); OUStringBuffer sTmp( aLocation.getLength() + aMacroName.getLength() + 1 ); sTmp = aLocation; - sTmp.append( sal_Unicode( ':' ) ); + sTmp.append( ':' ); sTmp.append( aMacroName ); pMutableAttrList->SetValueByIndex( nMacroName, sTmp.makeStringAndClear() ); diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 6b719604ba3a..a505ed9e21c3 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -44,10 +44,10 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType( sal_Int32 nLen = rValue.getLength(); // skip white space - while( nPos < nLen && sal_Unicode(' ') == rValue[nPos] ) + while( nPos < nLen && ' ' == rValue[nPos] ) nPos++; - if( nPos < nLen && sal_Unicode('-') == rValue[nPos] ) + if( nPos < nLen && '-' == rValue[nPos] ) { bNeg = sal_True; nPos++; @@ -56,17 +56,17 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType( // get number sal_Bool bOverflow = sal_False; while( nPos < nLen && - sal_Unicode('0') <= rValue[nPos] && - sal_Unicode('9') >= rValue[nPos] ) + '0' <= rValue[nPos] && + '9' >= rValue[nPos] ) { nVal *= 10; - nVal += (rValue[nPos] - sal_Unicode('0')); + nVal += (rValue[nPos] - '0'); bOverflow |= (nVal > (bNeg ? 2147483648UL : 2147483647UL)); nPos++; } // skip white space - while( nPos < nLen && sal_Unicode(' ') == rValue[nPos] ) + while( nPos < nLen && ' ' == rValue[nPos] ) nPos++; if( nPos == nLen ) diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 92f2fa90dd80..5069ec0ea58c 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -454,7 +454,7 @@ void XMLPropertiesTContext_Impl::StartElement( case XML_ATACTION_CAPTION_ESCAPE_OASIS: { OUString aAttrValue( rAttrValue ); - if( aAttrValue.indexOf( sal_Unicode('%') ) != -1 ) + if( aAttrValue.indexOf( '%' ) != -1 ) { sal_Int32 nValue = 0; ::sax::Converter::convertPercent(nValue, rAttrValue); @@ -538,7 +538,7 @@ void XMLPropertiesTContext_Impl::StartElement( case XML_ATACTION_OPACITY_FIX: { sal_Int32 nValue; - if( rAttrValue.indexOf( sal_Unicode('%') ) != -1 ) + if( rAttrValue.indexOf( '%' ) != -1 ) { ::sax::Converter::convertPercent(nValue, rAttrValue); } diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 3eea35f11090..24202039ce31 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -1079,7 +1079,7 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const } else { - aBuffer.append( static_cast< sal_Unicode >( '_' ) ); + aBuffer.append( '_' ); if( c > 0x0fff ) aBuffer.append( static_cast< sal_Unicode >( aHexTab[ (c >> 12) & 0x0f ] ) ); @@ -1091,7 +1091,7 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const aHexTab[ (c >> 4) & 0x0f ] ) ); aBuffer.append( static_cast< sal_Unicode >( aHexTab[ c & 0x0f ] ) ); - aBuffer.append( static_cast< sal_Unicode >( '_' ) ); + aBuffer.append( '_' ); bEncoded = sal_True; } } @@ -1173,10 +1173,10 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) sal_Int32 nLen = rValue.getLength(); // skip white space - while( nPos < nLen && sal_Unicode(' ') == rValue[nPos] ) + while( nPos < nLen && ' ' == rValue[nPos] ) nPos++; - if( nPos < nLen && sal_Unicode('-') == rValue[nPos] ) + if( nPos < nLen && '-' == rValue[nPos] ) { bNeg = sal_True; nPos++; @@ -1184,35 +1184,35 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) // get number while( nPos < nLen && - sal_Unicode('0') <= rValue[nPos] && - sal_Unicode('9') >= rValue[nPos] ) + '0' <= rValue[nPos] && + '9' >= rValue[nPos] ) { // TODO: check overflow! nVal *= 10; - nVal += (rValue[nPos] - sal_Unicode('0')); + nVal += (rValue[nPos] - '0'); nPos++; } - if( nPos < nLen && sal_Unicode('.') == rValue[nPos] ) + if( nPos < nLen && '.' == rValue[nPos] ) { nPos++; double nDiv = 1.; while( nPos < nLen && - sal_Unicode('0') <= rValue[nPos] && - sal_Unicode('9') >= rValue[nPos] ) + '0' <= rValue[nPos] && + '9' >= rValue[nPos] ) { // TODO: check overflow! nDiv *= 10; - nVal += ( static_cast<double>(rValue[nPos] - sal_Unicode('0')) / nDiv ); + nVal += ( static_cast<double>(rValue[nPos] - '0') / nDiv ); nPos++; } } // skip white space - while( nPos < nLen && sal_Unicode(' ') == rValue[nPos] ) + while( nPos < nLen && ' ' == rValue[nPos] ) nPos++; - if( nPos < nLen && sal_Unicode('%') == rValue[nPos] ) + if( nPos < nLen && '%' == rValue[nPos] ) { if( bNeg ) nVal = -nVal; @@ -1374,7 +1374,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, if( bPackage && bSupportPackage ) { - OUString sTmp( OUString( sal_Unicode( '#' ) ) ); + OUString sTmp( OUString( '#' ) ); if( rURI.startsWith( "./" ) ) rURI = rURI.copy( 2 ); sTmp += rURI; @@ -1401,9 +1401,9 @@ sal_Bool XMLTransformerBase::RenameAttributeValue( bool XMLTransformerBase::ConvertRNGDateTimeToISO( OUString& rDateTime ) { if( !rDateTime.isEmpty() && - rDateTime.indexOf( sal_Unicode('.')) != -1 ) + rDateTime.indexOf( '.' ) != -1 ) { - rDateTime = rDateTime.replace( sal_Unicode('.'), sal_Unicode(',')); + rDateTime = rDateTime.replace( '.', ','); return true; } diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index c7c200bc5815..78aecb4c128e 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -182,8 +182,8 @@ Any xforms_date( const OUString& rValue ) Any aAny; // parse ISO date - sal_Int32 nPos1 = rValue.indexOf( sal_Unicode('-') ); - sal_Int32 nPos2 = rValue.indexOf( sal_Unicode('-'), nPos1 + 1 ); + sal_Int32 nPos1 = rValue.indexOf( '-' ); + sal_Int32 nPos2 = rValue.indexOf( '-', nPos1 + 1 ); if( nPos1 > 0 && nPos2 > 0 ) { util::Date aDate; diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index 540d016e0635..c76fae21deab 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -117,7 +117,7 @@ SvXMLImportContext* TokenContext::CreateChildContext( static bool lcl_IsWhiteSpace( sal_Unicode c ) { - return c == sal_Unicode( ' ' ) + return c == ' ' || c == sal_Unicode( 0x09 ) || c == sal_Unicode( 0x0A ) || c == sal_Unicode( 0x0D ); |