diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-14 08:16:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-14 08:17:32 +0200 |
| commit | d366c9b20ec86f3fe521812a0c22def3bfd1f05e (patch) | |
| tree | 4bd09438c8cd8f0dbcd0881fc923d56a0a721fc5 | |
| parent | d2fa59e4025050c9b668ecff379d668f0db52639 (diff) | |
remove unnecessary sal_Unicode casts in various places
Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
102 files changed, 478 insertions, 486 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 8f6b0670b1ea..4ef8b4ed0d91 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -396,7 +396,7 @@ lcl_CreateStream(uno::Reference<embed::XStorage> const& xStorage, { OUString basename; OUString suffix; - sal_Int32 const nIndex(rFilename.lastIndexOf(sal_Unicode('.'))); + sal_Int32 const nIndex(rFilename.lastIndexOf('.')); if (0 < nIndex) { basename = rFilename.copy(0, nIndex); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 98a9f62bf642..b175f219e5bd 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -800,7 +800,7 @@ bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent ) OUString aQuery(rId.toString()); OUStringBuffer aNameBuf( rName ); aNameBuf.append('\''); - aNameBuf.insert(sal_Int32(0), sal_Unicode('\'')); + aNameBuf.insert(0, '\''); aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear()); QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery ); return ( aQueryBox.Execute() == RET_YES ); diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 46675643ae81..62e70144a3aa 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -674,11 +674,11 @@ namespace basegfx if(a) { - aResult.append(sal_Unicode(' ')); + aResult.append(' '); } ::basegfx::internal::lcl_putNumberChar(aResult, aPoint.getX()); - aResult.append(sal_Unicode(',')); + aResult.append(','); ::basegfx::internal::lcl_putNumberChar(aResult, aPoint.getY()); } diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx index bc5cfb240745..211f8991d490 100644 --- a/basegfx/source/tools/stringconversiontools.cxx +++ b/basegfx/source/tools/stringconversiontools.cxx @@ -29,7 +29,7 @@ namespace basegfx const sal_Int32 nLen) { while( io_rPos < nLen && - sal_Unicode(' ') == rStr[io_rPos] ) + ' ' == rStr[io_rPos] ) { ++io_rPos; } @@ -40,7 +40,7 @@ namespace basegfx const sal_Int32 nLen) { while(io_rPos < nLen - && (sal_Unicode(' ') == rStr[io_rPos] || sal_Unicode(',') == rStr[io_rPos])) + && (' ' == rStr[io_rPos] || ',' == rStr[io_rPos])) { ++io_rPos; } @@ -54,35 +54,35 @@ namespace basegfx OUStringBuffer sNumberString; bool separator_seen=false; - if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar) + if('+' == aChar || '-' == aChar) { sNumberString.append(rStr[io_rPos]); aChar = rStr[++io_rPos]; } - while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) - || (!separator_seen && sal_Unicode('.') == aChar)) + while(('0' <= aChar && '9' >= aChar) + || (!separator_seen && '.' == aChar)) { - if (sal_Unicode('.') == aChar) separator_seen = true; + if ('.' == aChar) separator_seen = true; sNumberString.append(rStr[io_rPos]); io_rPos++; aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; } - if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar) + if('e' == aChar || 'E' == aChar) { sNumberString.append(rStr[io_rPos]); io_rPos++; aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; - if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar) + if('+' == aChar || '-' == aChar) { sNumberString.append(rStr[io_rPos]); io_rPos++; aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; } - while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) + while('0' <= aChar && '9' >= aChar) { sNumberString.append(rStr[io_rPos]); io_rPos++; @@ -94,8 +94,8 @@ namespace basegfx { rtl_math_ConversionStatus eStatus; o_fRetval = ::rtl::math::stringToDouble( sNumberString.makeStringAndClear(), - (sal_Unicode)('.'), - (sal_Unicode)(','), + '.', + ',', &eStatus, NULL ); return ( eStatus == rtl_math_ConversionStatus_Ok ); @@ -124,12 +124,12 @@ namespace basegfx { sal_Unicode aChar( rStr[io_rPos] ); - if(sal_Unicode('0') == aChar) + if('0' == aChar) { o_nRetval = 0; ++io_rPos; } - else if (sal_Unicode('1') == aChar) + else if ('1' == aChar) { o_nRetval = 1; ++io_rPos; @@ -156,7 +156,7 @@ namespace basegfx if( lcl_isOnNumberChar(rStr[aLen - 1], false) && fValue >= 0.0 ) { - rStr.append( sal_Unicode(' ') ); + rStr.append( ' ' ); } } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 9811383e64d5..667d7ab244ef 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -1736,11 +1736,11 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const OUString& rClass ) sal_Int32 nClassNameDot = rClass.lastIndexOf( '.' ); if( nClassNameDot >= 0 ) { - aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( sal_Unicode( 'X' ) ) + rClass.copy( nClassNameDot + 1 ); + aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( 'X' ) + rClass.copy( nClassNameDot + 1 ); } else { - aClassName += OUString( sal_Unicode( 'X' ) ) + rClass; + aClassName += OUString( 'X' ) + rClass; } } else // assume extended type declaration support for basic ( can't get here diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 571eeb757230..aac9e3399d26 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -92,10 +92,10 @@ static OUString ImpCurrencyToString( const sal_Int64 &rVal ) // 0 0.0000 0 // 0.1 0.1000 0.1 - aBuf[nInsertIndex--] = (sal_Unicode)'0'; + aBuf[nInsertIndex--] = '0'; } if ( isNeg ) - aBuf[nInsertIndex] = (sal_Unicode)'-'; + aBuf[nInsertIndex] = '-'; aAbsStr = aBuf.makeStringAndClear(); return aAbsStr; @@ -107,8 +107,8 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr ) sal_Int32 nFractDigit = 4; - sal_Unicode cDeciPnt = sal_Unicode('.'); - sal_Unicode c1000Sep = sal_Unicode(','); + sal_Unicode cDeciPnt = '.'; + sal_Unicode c1000Sep = ','; #ifdef MAYBEFUTURE sal_Unicode cLocaleDeciPnt, cLocale1000Sep; @@ -202,7 +202,7 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr ) SbxBase::SetError( SbxERR_CONVERSION ); while( nFractDigit ) { - sNormalisedNumString.append( sal_Unicode('0') ); + sNormalisedNumString.append( '0' ); nFractDigit--; } diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 31fc3421d3e5..cb69b0c09859 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -907,7 +907,7 @@ OUString Bridge::getName() throw (css::uno::RuntimeException) { OUString Bridge::getDescription() throw (css::uno::RuntimeException) { OUStringBuffer b(name_); - b.append(sal_Unicode(':')); + b.append(':'); b.append(connection_->getDescription()); return b.makeStringAndClear(); } diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 1bff4c3a129a..8b6b4a7368e9 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -272,7 +272,7 @@ OUString lcl_getDataSequenceLabel( const Reference< chart2::data::XDataSequence { aBuf.append( aSeq[i] ); if( i < nMax ) - aBuf.append( sal_Unicode( ' ' )); + aBuf.append( ' '); } aResult = aBuf.makeStringAndClear(); } @@ -291,13 +291,13 @@ OUString lcl_getDataSequenceLabel( const Reference< chart2::data::XDataSequence { aBuf.append( aVal ); if( i < nMax ) - aBuf.append( sal_Unicode( ' ' )); + aBuf.append( ' '); } else if( aSeq[ i ] >>= fNum ) { aBuf.append( fNum ); if( i < nMax ) - aBuf.append( sal_Unicode( ' ' )); + aBuf.append( ' '); } } aResult = aBuf.makeStringAndClear(); diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index b6da8e8e8720..a5052c938e4f 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -602,13 +602,13 @@ OUString ObjectIdentifier::createPieSegmentDragParameterString( , const awt::Point& rMaximumPosition ) { OUStringBuffer aRet( OUString::number( nOffsetPercent ) ); - aRet.append( sal_Unicode( ',' )); + aRet.append( ','); aRet.append( OUString::number( rMinimumPosition.X ) ); - aRet.append( sal_Unicode( ',' )); + aRet.append( ','); aRet.append( OUString::number( rMinimumPosition.Y ) ); - aRet.append( sal_Unicode( ',' )); + aRet.append( ','); aRet.append( OUString::number( rMaximumPosition.X ) ); - aRet.append( sal_Unicode( ',' )); + aRet.append( ','); aRet.append( OUString::number( rMaximumPosition.Y ) ); return aRet.makeStringAndClear(); } diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 31b42d8b2f1e..d22138c3640e 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -138,7 +138,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation( if( m_fIntercept == 0.0 ) { - aBuf.append( sal_Unicode( '0' )); + aBuf.append( '0'); } else if( m_fSlope == 0.0 ) { @@ -149,7 +149,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation( if( ! rtl::math::approxEqual( m_fIntercept, 1.0 ) ) { aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fIntercept )); - aBuf.append( sal_Unicode( ' ' )); + aBuf.append( ' '); } if( m_fSlope != 0.0 ) { diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 2093be4c65b1..acbc9e55a2fc 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -112,7 +112,7 @@ private: ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false ); - //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( sal_Unicode( '\n' ))); + //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( '\n' )); // override other defaults ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE ); diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 99d9e4267835..724e01c75670 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -81,13 +81,13 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence( { OUStringBuffer aRole( "error-bars-"); if( bYError ) - aRole.append( sal_Unicode( 'y' )); + aRole.append( 'y'); else - aRole.append( sal_Unicode( 'x' )); + aRole.append( 'x'); OUString aPlainRole = aRole.makeStringAndClear(); aRole.append( aPlainRole ); - aRole.append( sal_Unicode( '-' )); + aRole.append( '-' ); if( bPositiveValue ) aRole = aRole.appendAscii( "positive" ); diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 227b3e0c2b46..b66a2c7c64e5 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -77,9 +77,9 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStr return; sal_Int32 nCol = rCell.nColumn; - output->append( (sal_Unicode)'.' ); + output->append( '.' ); if( ! rCell.bRelativeColumn ) - output->append( (sal_Unicode)'$' ); + output->append( '$' ); // get A, B, C, ..., AA, AB, ... representation of column number if( nCol < 26 ) @@ -98,7 +98,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStr // write row number as number if( ! rCell.bRelativeRow ) - output->append( (sal_Unicode)'$' ); + output->append( '$' ); output->append( rCell.nRow + (sal_Int32)1 ); } diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index c3629da6f1b3..92cb7de36f22 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -2190,7 +2190,7 @@ OUString ShapeFactory::getStackedString( const OUString& rString, bool bStacked 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/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index fa32488c58ca..bc8f09c5f98f 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -67,7 +67,7 @@ void normalize( *name = relative; } else { OUStringBuffer buf(path); - buf.append(sal_Unicode('/')); + buf.append('/'); buf.append(relative.copy(0, i)); *normalizedPath = buf.makeStringAndClear(); *name = relative.copy(i + 1); diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 2b047dffd757..280f053c7f36 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -550,7 +550,7 @@ OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) { } OUString rel(getRelativePathRepresentation()); if (!path.isEmpty() && !rel.isEmpty()) { - path.append(sal_Unicode('/')); + path.append('/'); } path.append(rel); return path.makeStringAndClear(); @@ -572,7 +572,7 @@ OUString Access::composeHierarchicalName( } OUStringBuffer path(getRelativePathRepresentation()); if (!path.isEmpty()) { - path.append(sal_Unicode('/')); + path.append('/'); } path.append(aRelativeName); return path.makeStringAndClear(); @@ -1845,7 +1845,7 @@ void Access::initBroadcasterAndChanges( if (allChanges != 0) { OUStringBuffer path(getRelativePathRepresentation()); if (!path.isEmpty()) { - path.append(sal_Unicode('/')); + path.append('/'); } path.append(Data::createSegment("*", i->first)); allChanges->push_back( @@ -1904,7 +1904,7 @@ void Access::initBroadcasterAndChanges( OUStringBuffer path( getRelativePathRepresentation()); if (!path.isEmpty()) { - path.append(sal_Unicode('/')); + path.append('/'); } path.append(i->first); allChanges->push_back( @@ -1941,7 +1941,7 @@ void Access::initBroadcasterAndChanges( OUStringBuffer path( getRelativePathRepresentation()); if (!path.isEmpty()) { - path.append(sal_Unicode('/')); + path.append('/'); } path.append(Data::createSegment("*", i->first)); allChanges->push_back( diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index dec5c46e7b64..9e80d1bb6f5b 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -114,7 +114,7 @@ OUString ChildAccess::getRelativePathRepresentation() { if (parent.is()) { path.append(parent->getRelativePathRepresentation()); if (!path.isEmpty()) { - path.append(sal_Unicode('/')); + path.append('/'); } } path.append(Data::createSegment(node_->getTemplateName(), name_)); diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx index dfca76435a8b..8d986997fce9 100644 --- a/configmgr/source/data.cxx +++ b/configmgr/source/data.cxx @@ -57,13 +57,13 @@ bool decode( sal_Unicode c = encoded[begin++]; if (c == '&') { if (encoded.match("amp;", begin)) { - buf.append(sal_Unicode('&')); + buf.append('&'); begin += RTL_CONSTASCII_LENGTH("amp;"); } else if (encoded.match("quot;", begin)) { - buf.append(sal_Unicode('"')); + buf.append('"'); begin += RTL_CONSTASCII_LENGTH("quot;"); } else if (encoded.match("apos;", begin)) { - buf.append(sal_Unicode('\'')); + buf.append('\''); begin += RTL_CONSTASCII_LENGTH("apos;"); } else { return false; @@ -159,7 +159,7 @@ OUString Data::fullTemplateName( css::uno::Reference< css::uno::XInterface >()); } OUStringBuffer buf(component); - buf.append(sal_Unicode(':')); + buf.append(':'); buf.append(name); return buf.makeStringAndClear(); } @@ -232,7 +232,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation( return p; } if (canonicRepresentation != 0) { - canonic.append(sal_Unicode('/')); + canonic.append('/'); canonic.append(createSegment(templateName, seg)); } if (path != 0) { diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 7d074dffd70c..e8a4a2ddd4a4 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -111,8 +111,8 @@ namespace dbtools { if ( !io_appendTo.isEmpty() ) { - io_appendTo.insert( 0, sal_Unicode( '(' ) ); - io_appendTo.insert( 1, sal_Unicode( ' ' ) ); + io_appendTo.insert( 0, '(' ); + io_appendTo.insert( 1, ' ' ); io_appendTo.appendAscii( " ) AND " ); } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 0b333965bad3..e818d3e87c28 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -2296,10 +2296,10 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL // Rule name as rule _inout_rBuffer.appendAscii( "RULE_ID: " ); _inout_rBuffer.append( (sal_Int32)getRuleID() ); - _inout_rBuffer.append( sal_Unicode( '(' ) ); + _inout_rBuffer.append( '(' ); _inout_rBuffer.append( OSQLParser::RuleIDToStr( getRuleID() ) ); - _inout_rBuffer.append( sal_Unicode( ')' ) ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( ')' ); + _inout_rBuffer.append( '\n' ); // Get the first sub tree for ( OSQLParseNodes::const_iterator i = m_aChildren.begin(); @@ -2317,53 +2317,53 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL case SQL_NODE_KEYWORD: _inout_rBuffer.appendAscii( "SQL_KEYWORD: " ); _inout_rBuffer.append( OStringToOUString( OSQLParser::TokenIDToStr( getTokenID() ), RTL_TEXTENCODING_UTF8 ) ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_COMPARISON: _inout_rBuffer.appendAscii( "SQL_COMPARISON: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_NAME: _inout_rBuffer.appendAscii( "SQL_NAME: " ); - _inout_rBuffer.append( sal_Unicode( '"' ) ); + _inout_rBuffer.append( '"' ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '"' ) ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '"' ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_STRING: _inout_rBuffer.appendAscii( "SQL_STRING: " ); - _inout_rBuffer.append( sal_Unicode( '\'' ) ); + _inout_rBuffer.append( '\'' ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\'' ) ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\'' ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_INTNUM: _inout_rBuffer.appendAscii( "SQL_INTNUM: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_APPROXNUM: _inout_rBuffer.appendAscii( "SQL_APPROXNUM: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_PUNCTUATION: _inout_rBuffer.appendAscii( "SQL_PUNCTUATION: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_AMMSC: _inout_rBuffer.appendAscii( "SQL_AMMSC: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_EQUAL: @@ -2373,24 +2373,24 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL case SQL_NODE_GREATEQ: case SQL_NODE_NOTEQUAL: _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_ACCESS_DATE: _inout_rBuffer.appendAscii( "SQL_ACCESS_DATE: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_DATE: _inout_rBuffer.appendAscii( "SQL_DATE: " ); _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; case SQL_NODE_CONCAT: _inout_rBuffer.appendAscii( "||" ); - _inout_rBuffer.append( sal_Unicode( '\n' ) ); + _inout_rBuffer.append( '\n' ); break; default: diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index f8f31533184a..3b3c6a5c08b9 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -836,7 +836,7 @@ void MigrationImpl::copyConfig() { i->first, RTL_TEXTENCODING_UTF8).getStr()); goto next; } - buf.append(sal_Unicode('/')); + buf.append('/'); buf.append(enc); } while (n >= 0); buf.appendAscii(".xcu"); diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx index 4722bb16d278..ab2f814f4b12 100644 --- a/editeng/qa/lookuptree/lookuptree_test.cxx +++ b/editeng/qa/lookuptree/lookuptree_test.cxx @@ -182,9 +182,9 @@ void LookupTreeTest::testLookupTree() a->gotoNode( "ne" ); CPPUNIT_ASSERT_EQUAL( OUString("u"), a->suggestAutoCompletion() ); - a->advance( sal_Unicode('u') ); - a->advance( sal_Unicode('e') ); - a->advance( sal_Unicode('r') ); + a->advance( 'u' ); + a->advance( 'e' ); + a->advance( 'r' ); a->insert(); CPPUNIT_ASSERT ( a->suggestAutoCompletion().isEmpty() ); @@ -201,7 +201,7 @@ void LookupTreeTest::testLookupTree() OUString aQueryString = OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); a->insert( aQueryString ); a->returnToRoot(); - a->advance( sal_Unicode('H') ); + a->advance( 'H' ); OUString aAutocompletedString = a->suggestAutoCompletion(); OUString aExpectedString = OStringToOUString( "\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 7106ee45c858..b945521e8cff 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -178,7 +178,7 @@ void EditHTMLParser::NextToken( int nToken ) { // Each token represents a single line. maStyleSource.append(aToken); - maStyleSource.append(sal_Unicode('\n')); + maStyleSource.append('\n'); } break; case HTML_TEXTTOKEN: diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 5e1e37f71665..1f23708e6219 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -222,7 +222,7 @@ void SvxBulletItem::SetDefaults_Impl() nStart = 1; nStyle = BS_123; nJustify = BJ_HLEFT | BJ_VCENTER; - cSymbol = sal_Unicode(' '); + cSymbol = ' '; nScale = 75; } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 1394c072ab14..8eb506a90a49 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -165,7 +165,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe if (!aPresentation.isEmpty()) aContent = aPresentation; - sal_Int32 nPos = aContent.lastIndexOf(sal_Unicode(' '), 0); + sal_Int32 nPos = aContent.lastIndexOf(' ', 0); if (nPos > 0) { aFirstName = aContent.copy(0, nPos); @@ -1255,7 +1255,7 @@ OUString SvxDateTimeField::GetFormatted( OUStringBuffer aBuf(aRet); if (!aRet.isEmpty()) - aBuf.append(sal_Unicode(' ')); + aBuf.append(' '); aBuf.append( SvxExtTimeField::GetFormatted(rTime, eTimeFormat, rFormatter, eLanguage)); diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 40f0420a6746..cd379cf06202 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -28,7 +28,7 @@ #include <editeng/svxfont.hxx> #include <editeng/escapementitem.hxx> -const sal_Unicode CH_BLANK = sal_Unicode(' '); // ' ' Space character +const sal_Unicode CH_BLANK = ' '; // ' ' Space character SvxFont::SvxFont() diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index d63487b33aae..8cd6de2fa38e 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -132,7 +132,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal return sal_False; pData = (AttributeData*)aAny.getValue(); - sal_Int32 pos = aName.indexOf( sal_Unicode(':') ); + sal_Int32 pos = aName.indexOf( ':' ); if( pos != -1 ) { const OUString aPrefix( aName.copy( 0, pos )); diff --git a/editeng/source/lookuptree/LatinLookupTree.cxx b/editeng/source/lookuptree/LatinLookupTree.cxx index 0762044ef0f7..cdc0a0b376a6 100644 --- a/editeng/source/lookuptree/LatinLookupTree.cxx +++ b/editeng/source/lookuptree/LatinLookupTree.cxx @@ -146,8 +146,8 @@ void LatinLookupTree::clear() bool LatinLookupTree::isSeparatedlyHandled(const sal_Unicode cKey) const { return - ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') ) - || ( cKey >= sal_Unicode('A') && cKey <= sal_Unicode('Z') ); + ( cKey >= 'a' && cKey <= 'z' ) + || ( cKey >= 'A' && cKey <= 'Z' ); } Node*& LatinLookupTree::getChildRef(const sal_Unicode cKey, bool bCreatePlaceholder) @@ -155,11 +155,11 @@ Node*& LatinLookupTree::getChildRef(const sal_Unicode cKey, bool bCreatePlacehol int pos = -1; // determine position in array if possible - if ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') ) + if ( cKey >= 'a' && cKey <= 'z' ) { pos = cKey - our_nLowerCaseA; } - else if ( cKey >= sal_Unicode('A') && cKey <= sal_Unicode('Z') ) + else if ( cKey >= 'A' && cKey <= 'Z' ) { pos = cKey - our_nUpperCaseA + 26; } diff --git a/editeng/source/lookuptree/LatinTreeNode.cxx b/editeng/source/lookuptree/LatinTreeNode.cxx index b68e039d1349..a7f10aa5dd5a 100644 --- a/editeng/source/lookuptree/LatinTreeNode.cxx +++ b/editeng/source/lookuptree/LatinTreeNode.cxx @@ -36,13 +36,13 @@ LatinTreeNode::~LatinTreeNode() bool LatinTreeNode::isSeparatedlyHandled(const sal_Unicode cKey) const { - return ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') ); + return ( cKey >= 'a' && cKey <= 'z' ); } Node*& LatinTreeNode::getChildRef(const sal_Unicode cKey, bool bCreatePlaceholder) { // determine position in array if possible - if ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') ) + if ( cKey >= 'a' && cKey <= 'z' ) { return m_pLeaves[cKey - LatinLookupTree::our_nLowerCaseA]; } diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx index 4fbc19430bdb..9314069793ac 100644 --- a/editeng/source/lookuptree/Trie.cxx +++ b/editeng/source/lookuptree/Trie.cxx @@ -68,8 +68,8 @@ void TrieNode::markWord() void TrieNode::addNewChild(TrieNode* pChild) { - if (pChild->mCharacter >= sal_Unicode('a') && - pChild->mCharacter <= sal_Unicode('z')) + if (pChild->mCharacter >= 'a' && + pChild->mCharacter <= 'z') { mLatinArray[pChild->mCharacter - sal_Unicode('a')] = pChild; } @@ -81,8 +81,8 @@ void TrieNode::addNewChild(TrieNode* pChild) TrieNode* TrieNode::findChild(sal_Unicode aInputCharacter) { - if (aInputCharacter >= sal_Unicode('a') && - aInputCharacter <= sal_Unicode('z')) + if (aInputCharacter >= 'a' && + aInputCharacter <= 'z') { return mLatinArray[aInputCharacter - sal_Unicode('a')]; } diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index e00a38668c60..0e3d19b553e7 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -121,7 +121,7 @@ namespace logging rtl::OUStringBuffer aBuff; aBuff.append( sDate ); - aBuff.append( sal_Unicode( '.' ) ); + aBuff.append( '.' ); aBuff.append( sTime ); rtl::OUString sDateTime = aBuff.makeStringAndClear(); diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 8d826f8d384d..6b157f9701c8 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -228,7 +228,7 @@ namespace pcr { OUStringBuffer aPropertyName; aPropertyName.append( _rListenerClassName ); - aPropertyName.append( (sal_Unicode)';' ); + aPropertyName.append( ';' ); aPropertyName.append( _rMethodName.getStr() ); return aPropertyName.makeStringAndClear(); } @@ -727,7 +727,7 @@ namespace pcr aComposeBuffer.append( sLanguage ); } - aComposeBuffer.append( sal_Unicode( ')' ) ); + aComposeBuffer.append( ')' ); } sScript = aComposeBuffer.makeStringAndClear(); diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 2274ad5b3f33..9e842cec0d01 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -334,7 +334,7 @@ UpdateInformationProvider::UpdateInformationProvider( xConfigurationProvider, "org.openoffice.Setup/Product", "ooName")); - buf.append(sal_Unicode(' ')); + buf.append(' '); buf.append( getConfigurationItem( xConfigurationProvider, diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 96f342336800..d9f12c5cc5a9 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -838,7 +838,7 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet, } } OUString sFieldId( sOOOElemField ); - sFieldId += OUString( sal_Unicode('_') ); + sFieldId += OUString( '_' ); if( !bFound ) { aFieldSet.push_back( new TextFieldType( aField ) ); @@ -920,7 +920,7 @@ sal_Bool SVGFilter::implGenerateMetaData() Reference< XMasterPageTarget > xMasterPageTarget( xDrawPage, UNO_QUERY ); Reference< XDrawPage > xMasterPage( xMasterPageTarget->getMasterPage(), UNO_QUERY ); OUString aSlideId( aId ); - aSlideId += OUString( sal_Unicode('_') ); + aSlideId += OUString( '_' ); aSlideId += OUString::number( i ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aSlideId ); diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index cd4a3931a0b6..b1c59164028f 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -400,15 +400,15 @@ struct AnnotatingVisitor const sal_uInt8 nRed ( toByteColor(rColor.r) ); const sal_uInt8 nGreen( toByteColor(rColor.g) ); const sal_uInt8 nBlue ( toByteColor(rColor.b) ); - aBuf.append( sal_Unicode('#') ); + aBuf.append( '#' ); if( nRed < 0x10 ) - aBuf.append( sal_Unicode('0') ); + aBuf.append( '0' ); aBuf.append( sal_Int32(nRed), 16 ); if( nGreen < 0x10 ) - aBuf.append( sal_Unicode('0') ); + aBuf.append( '0' ); aBuf.append( sal_Int32(nGreen), 16 ); if( nBlue < 0x10 ) - aBuf.append( sal_Unicode('0') ); + aBuf.append( '0' ); aBuf.append( sal_Int32(nBlue), 16 ); // TODO(F3): respect alpha transparency (polygons etc.) diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 4754ddc5299f..dca58231f665 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -285,7 +285,7 @@ static Sequence< OUString > createExtensionsSequence( const OUString& rExtension int i; for( i = 0; i < nLength; i++, pString++ ) { - if( *pString == sal_Unicode( ';' ) ) + if( *pString == ';' ) nExtensions++; } } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index dbb9235a2575..250d54ffd373 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -516,13 +516,13 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro Encode( aValue ); aResult.append(aName); - aResult.append(sal_Unicode('=')); + aResult.append('='); aResult.append(aValue); if (pSuccObj < aSuccObjList.end() - 1) { if ( _bURLEncoded ) - aResult.append(sal_Unicode('&')); + aResult.append('&'); else aResult.appendAscii("\r\n"); } @@ -602,7 +602,7 @@ namespace sal_Int32 nCurLen = _rOut.getLength(); _rOut.append( _nNumber ); while ( _rOut.getLength() - nCurLen < nDigits ) - _rOut.insert( nCurLen, (sal_Unicode)'0' ); + _rOut.insert( nCurLen, '0' ); } } @@ -794,9 +794,9 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc ::Date aDate( nInt32Val ); OUStringBuffer aBuffer; appendDigits( aDate.GetMonth(), 2, aBuffer ); - aBuffer.append( (sal_Unicode)'-' ); + aBuffer.append( '-' ); appendDigits( aDate.GetDay(), 2, aBuffer ); - aBuffer.append( (sal_Unicode)'-' ); + aBuffer.append( '-' ); appendDigits( aDate.GetYear(), 4, aBuffer ); aText = aBuffer.makeStringAndClear(); } @@ -817,9 +817,9 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc ::Time aTime(nInt32Val); OUStringBuffer aBuffer; appendDigits( aTime.GetHour(), 2, aBuffer ); - aBuffer.append( (sal_Unicode)'-' ); + aBuffer.append( '-' ); appendDigits( aTime.GetMin(), 2, aBuffer ); - aBuffer.append( (sal_Unicode)'-' ); + aBuffer.append( '-' ); appendDigits( aTime.GetSec(), 2, aBuffer ); aText = aBuffer.makeStringAndClear(); } @@ -971,7 +971,7 @@ void ODatabaseForm::Encode( OUString& rString ) const nCharCode = rString[nCurPos]; // Handle chars, which are not an alphanumeric character and character codes > 127 - if( (!isalnum(nCharCode) && nCharCode != (sal_Unicode)' ') || nCharCode > 127 ) + if( (!isalnum(nCharCode) && nCharCode != ' ') || nCharCode > 127 ) { switch( nCharCode ) { diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index 4bdfe219c994..47e1a5711207 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -235,7 +235,7 @@ namespace { rtl_math_ConversionStatus eStatus; double f = rtl::math::stringToDouble( - rString, sal_Unicode('.'), sal_Unicode(','), &eStatus, NULL ); + rString, '.', ',', &eStatus, NULL ); return ( eStatus == rtl_math_ConversionStatus_Ok ) ? makeAny( f ) : Any(); } @@ -243,11 +243,11 @@ namespace void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits ) { if ( ( _nMinDigits >= 4 ) && ( _nValue < 1000 ) ) - _rBuffer.append( (sal_Unicode)'0' ); + _rBuffer.append( '0' ); if ( ( _nMinDigits >= 3 ) && ( _nValue < 100 ) ) - _rBuffer.append( (sal_Unicode)'0' ); + _rBuffer.append( '0' ); if ( ( _nMinDigits >= 2 ) && ( _nValue < 10 ) ) - _rBuffer.append( (sal_Unicode)'0' ); + _rBuffer.append( '0' ); _rBuffer.append( _nValue ); } diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index a4f522ef50b8..f2fdb793d40a 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -421,7 +421,7 @@ namespace xforms rtl_math_ConversionStatus eStatus; sal_Int32 nEnd; double f = ::rtl::math::stringToDouble( - rValue, sal_Unicode('.'), sal_Unicode(0), &eStatus, &nEnd ); + rValue, '.', sal_Unicode(0), &eStatus, &nEnd ); // error checking... bool bReturn = false; @@ -691,13 +691,13 @@ namespace xforms sal_Int32 nTotalDigits = 0; sal_Int32 nFractionDigits = 0; const sal_Unicode* pValue = rValue.getStr(); - for( ; pValue[n] != sal_Unicode('.') && n < nLength; n++ ) - if( pValue[n] >= sal_Unicode('0') - && pValue[n] <= sal_Unicode('9')) + for( ; pValue[n] != '.' && n < nLength; n++ ) + if( pValue[n] >= '0' + && pValue[n] <= '9') nTotalDigits++; for( ; n < nLength; n++ ) - if( pValue[n] >= sal_Unicode('0') - && pValue[n] <= sal_Unicode('9')) + if( pValue[n] >= '0' + && pValue[n] <= '9') nFractionDigits++; nTotalDigits += nFractionDigits; diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 281638e5a28e..5a1124e74989 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -152,9 +152,9 @@ static void lcl_OutPosition( OUStringBuffer& rBuffer, // output position (if necessary) if( nFound > 1 ) { - rBuffer.insert( 0, sal_Unicode(']') ); + rBuffer.insert( 0, ']' ); rBuffer.insert( 0, nPosition ); - rBuffer.insert( 0, sal_Unicode('[') ); + rBuffer.insert( 0, '[' ); } } @@ -165,7 +165,7 @@ static void lcl_OutName( OUStringBuffer& rBuffer, OUString sPrefix = xNode->getPrefix(); if( !sPrefix.isEmpty() ) { - rBuffer.insert( 0, sal_Unicode(':') ); + rBuffer.insert( 0, ':' ); rBuffer.insert( 0, sPrefix ); } } @@ -220,7 +220,7 @@ OUString Model::getDefaultBindingExpressionForNode( { // insert a '/' for every step except the first if( !aBuffer.isEmpty() ) - aBuffer.insert( 0, sal_Unicode('/') ); + aBuffer.insert( 0, '/' ); switch( xCurrent->getNodeType() ) { @@ -236,7 +236,7 @@ OUString Model::getDefaultBindingExpressionForNode( case NodeType_ATTRIBUTE_NODE: lcl_OutName( aBuffer, xCurrent ); - aBuffer.insert( 0, sal_Unicode('@') ); + aBuffer.insert( 0, '@' ); break; case NodeType_DOCUMENT_NODE: @@ -250,7 +250,7 @@ OUString Model::getDefaultBindingExpressionForNode( xCurrent.set( NULL ); aBuffer.makeStringAndClear(); // we'll remove the slash below - aBuffer.insert( 0, sal_Unicode('/') ); + aBuffer.insert( 0, '/' ); break; } } @@ -307,12 +307,12 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode, case NodeType_ATTRIBUTE_NODE: lcl_OutName( aBuffer, xNode ); - aBuffer.insert( 0, sal_Unicode('@') ); + aBuffer.insert( 0, '@' ); break; case NodeType_DOCUMENT_NODE: if( xNode == getDefaultInstance() ) - aBuffer.append( sal_Unicode('/') ); + aBuffer.append( '/' ); else lcl_OutInstance( aBuffer, xNode, this ); break; @@ -846,7 +846,7 @@ static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) && !sLine.startsWith( "<?xml" ) ) { aBuffer.append( sLine ); - aBuffer.append( sal_Unicode('\n') ); + aBuffer.append( '\n' ); } } sResult = aBuffer.makeStringAndClear(); @@ -929,7 +929,7 @@ OUString Model::getResultForExpression( { aExpression.evaluate( *aIter ); aBuffer.append( lcl_serializeForDisplay(aExpression.getXPath()) ); - aBuffer.append( sal_Unicode('\n') ); + aBuffer.append( '\n' ); } } return aBuffer.makeStringAndClear(); diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index d0990423eb86..c42ee0609f67 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1724,7 +1724,7 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer ) rBuffer.ensureCapacity( pArr->GetLen() * 5 ); if ( pArr->IsRecalcModeForced() ) - rBuffer.append( sal_Unicode('=')); + rBuffer.append( '='); FormulaToken* t = pArr->First(); while( t ) t = CreateStringFromToken( rBuffer, t, true ); @@ -1761,7 +1761,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F bSpaces = ( !t || t->GetOpCode() != ocOpen ); } if( bSpaces ) - rBuffer.append( sal_Unicode(' ')); + rBuffer.append( ' '); if( eOp == ocSpaces ) { @@ -1784,7 +1784,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F sal_uInt8 n = t->GetByte(); for ( sal_uInt8 j=0; j<n; ++j ) { - rBuffer.append( sal_Unicode(' ')); + rBuffer.append( ' '); } } } @@ -1864,7 +1864,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F } } if( bSpaces ) - rBuffer.append( sal_Unicode(' ')); + rBuffer.append( ' '); if ( bAllowArrAdvance ) { if( bNext ) @@ -1901,7 +1901,7 @@ void FormulaCompiler::AppendBoolean( OUStringBuffer& rBuffer, bool bVal ) void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const OUString & rStr ) { - rBuffer.append( sal_Unicode('"')); + rBuffer.append( '"'); if ( lcl_UnicodeStrChr( rStr.getStr(), '"' ) == NULL ) rBuffer.append( rStr ); else @@ -1909,7 +1909,7 @@ void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const OUString & rS OUString aStr = rStr.replaceAll( "\"", "\"\"" ); rBuffer.append(aStr); } - rBuffer.append( sal_Unicode('"')); + rBuffer.append( '"'); } void FormulaCompiler::UpdateSeparatorsNative( diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 379df0dba84e..f35ca3b25fc4 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -177,7 +177,7 @@ namespace { const sal_Unicode* p0 = rFile.getStr(); const sal_Unicode* p1 = p0 + rFile.getLength() - 1; - while ( p1 >= p0 && *p1 != sal_Unicode( '.' ) ) + while ( p1 >= p0 && *p1 != '.' ) p1--; if ( p1 >= p0 ) // remove old extension diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index b9c27a8d13d8..971f8c60883e 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -85,12 +85,12 @@ namespace OUStringBuffer aPath; for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { - aPath.append( sal_Unicode( '/' )); + aPath.append( '/'); aPath.append( _rParser.getName( nIndex, false, INetURLObject::NO_DECODE )); } if ( nCount > 0 ) - aPath.append( sal_Unicode( '/' )); // final slash! + aPath.append( '/' ); // final slash! _rURL.Path = aPath.makeStringAndClear(); _rURL.Name = _rParser.getName( INetURLObject::LAST_SEGMENT, false, INetURLObject::NO_DECODE ); @@ -128,7 +128,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti return sal_False; } // Try to extract the protocol - sal_Int32 nURLIndex = aURL.Complete.indexOf( sal_Unicode( ':' )); + sal_Int32 nURLIndex = aURL.Complete.indexOf( ':' ); OUString aProtocol; if ( nURLIndex > 1 ) { @@ -200,7 +200,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL if ( INetURLObject::CompareProtocolScheme( sSmartProtocol ) == INET_PROT_NOT_VALID ) { // Try to extract the protocol - sal_Int32 nIndex = aURL.Complete.indexOf( sal_Unicode( ':' )); + sal_Int32 nIndex = aURL.Complete.indexOf( ':' ); OUString aProtocol; if ( nIndex > 1 ) { @@ -244,12 +244,12 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException // Concat the name if it is provided, just support a final slash if ( !aURL.Name.isEmpty() ) { - sal_Int32 nIndex = aURL.Path.lastIndexOf( sal_Unicode('/') ); + sal_Int32 nIndex = aURL.Path.lastIndexOf( '/' ); if ( nIndex == ( aURL.Path.getLength() -1 )) aCompletePath.append( aURL.Name ); else { - aCompletePath.append( sal_Unicode( '/' ) ); + aCompletePath.append( '/' ); aCompletePath.append( aURL.Name ); } } diff --git a/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx index 03bdd4ea7afc..f3fa9c6abd99 100644 --- a/i18npool/source/indexentry/genindex_data.cxx +++ b/i18npool/source/indexentry/genindex_data.cxx @@ -49,7 +49,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) sal_Int32 i, j, k; sal_Int32 address[MAX_ADDRESS]; for (i=0; i<MAX_ADDRESS; i++) address[i]=-1; - OUString sep=OUString(sal_Unicode('|')); + OUString sep=OUString('|'); OUString result=sep; sal_Int32 max=0; diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index cb54e22b730a..8edd4b29f557 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -180,7 +180,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm for (i = 0; i < len && key_count < MAX_KEYS; i++) { sal_Unicode curr = keyStr[i]; - sal_Unicode close = sal_Unicode(')'); + sal_Unicode close = ')'; if (unicode::isWhiteSpace(curr)) continue; @@ -196,10 +196,10 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm throw RuntimeException(); break; case sal_Unicode('['): - for (i++; i < len && keyStr[i] != sal_Unicode(']'); i++) { + for (i++; i < len && keyStr[i] != ']'; i++) { if (unicode::isWhiteSpace(keyStr[i])) { continue; - } else if (keyStr[i] == sal_Unicode('_')) { + } else if (keyStr[i] == '_') { for (curr=keyStr[i-1]+1; curr <= keyStr[i+1]; curr++) skipping_chars+=OUString(curr); i+=2; @@ -209,7 +209,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm } break; case sal_Unicode('{'): - close = sal_Unicode('}'); + close = '}'; case sal_Unicode('('): if (key_count > 0) { sal_Int16 end = i+1; @@ -217,7 +217,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm if (end >= len) // no found throw RuntimeException(); - if (close == sal_Unicode(')')) + if (close == ')') keys[key_count-1].desc = keyStr.copy(i+1, end-i-1); else { mkeys[mkey_count++]=key_count; diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index ff4ce9784fdd..2e1043ac49e0 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -713,7 +713,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const // Ensure only one default per usage and type. if (bDefault) { - OUString aKey( aUsage + OUString( sal_Unicode(',')) + aType); + OUString aKey( aUsage + OUString( ',') + aType); if (!aDefaultsSet.insert( aKey).second) { OUString aStr( "Duplicated default for usage=\""); diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index b621737675d3..a8a6d3fda780 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -294,8 +294,8 @@ static const struct { #endif -static const sal_Unicode cUnder = sal_Unicode('_'); -static const sal_Unicode cHyphen = sal_Unicode('-'); +static const sal_Unicode cUnder = '_'; +static const sal_Unicode cHyphen = '-'; static const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable); diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx index 77a676fff356..fbd6b0eb74f2 100644 --- a/i18npool/source/textconversion/genconv_dict.cxx +++ b/i18npool/source/textconversion/genconv_dict.cxx @@ -193,7 +193,7 @@ void make_stc_char(FILE *sfp, FILE *cfp) OUString Ostr((const sal_Char *)Cstr, strlen(Cstr) - 1, RTL_TEXTENCODING_UTF8); const sal_Unicode *Ustr = Ostr.getStr(); sal_Int32 len = Ostr.getLength(); - if (Ustr[1] == sal_Unicode('v')) + if (Ustr[1] == 'v') SChinese2VChineseData[Ustr[0]] = Ustr[2]; else { SChinese2TChineseData[Ustr[0]] = Ustr[2]; @@ -363,9 +363,9 @@ void make_stc_word(FILE *sfp, FILE *cfp) return; } sal_Int32 sep=-1, eq=-1, gt=-1, lt=-1; - if (((sep = eq = Ostr.indexOf(sal_Unicode('='))) > 0) || - ((sep = gt = Ostr.indexOf(sal_Unicode('>'))) > 0) || - ((sep = lt = Ostr.indexOf(sal_Unicode('<'))) > 0)) { + if (((sep = eq = Ostr.indexOf('=')) > 0) || + ((sep = gt = Ostr.indexOf('>')) > 0) || + ((sep = lt = Ostr.indexOf('<')) > 0)) { if (eq > 0 || gt > 0) { STC_WordEntry_S2T[count_S2T].address = sal::static_int_cast<sal_uInt16>( char_total ); diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index c9428f13286a..63cda19406f2 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -674,7 +674,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const if (hyphens[i]&1 && (!rep || !rep[i])) { pPos[nHyphCount] = i; - hyphenatedWordBuffer.append(sal_Unicode('=')); + hyphenatedWordBuffer.append('='); nHyphCount++; } } diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 8c4e04f63a05..c0ef851f46a2 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -139,7 +139,7 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy OUString sPath = aFileStatus.getFileURL(); if (sPath.endsWith(aSystemSuffix)) { - sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1; + sal_Int32 nStartIndex = sPath.lastIndexOf('/') + 1; if (!sPath.match(aSystemPrefix, nStartIndex)) continue; OUString sChunk = sPath.copy(nStartIndex + aSystemPrefix.getLength(), diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx index ea5a6e7eba1f..a87fb165e5c9 100644 --- a/lotuswordpro/source/filter/lwptools.cxx +++ b/lotuswordpro/source/filter/lwptools.cxx @@ -162,7 +162,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, flag = sal_False; if(sublen) { - unibuf[sublen] = sal_Unicode('\0'); + unibuf[sublen] = '\0'; strBuf.append( OUString(unibuf) ); sublen = 0; } @@ -173,7 +173,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, } if(sublen>=1023 || readLen==strlen) { - unibuf[sublen] = sal_Unicode('\0'); + unibuf[sublen] = '\0'; strBuf.append( OUString(unibuf) ); sublen = 0; } diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index ede0a638d26f..8816cb28f225 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -660,7 +660,7 @@ OUString OConnection::getMysqlVariable(const char *varname) OUStringBuffer aStatement; aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" ); aStatement.appendAscii( varname ); - aStatement.append( sal_Unicode( '\'' ) ); + aStatement.append( '\'' ); try { XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement()); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index 0d0c2732d210..036984290125 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -440,7 +440,7 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) buf.append( sal_Int32( meta->getColumnCount() ) ); buf.appendAscii( ", got " ); buf.append( sal_Int32( columnIndex ) ); - buf.append( sal_Unicode( '.' ) ); + buf.append( '.' ); throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() ); } } diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index 1ac7294125e0..379d73c418c7 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -268,7 +268,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) ::std::list< OUString > aFiles; ::std::list< OUString >::iterator file; OUStringBuffer aDir( *dir ); - aDir.append( sal_Unicode( '/' ) ); + aDir.append( '/' ); aDir.appendAscii( PRINTER_PPDDIR ); OUString aPPDDir( aDir.makeStringAndClear() ); FindFiles( aPPDDir, aFiles, OUString( "PS;PPD;PS.GZ;PPD.GZ" ), true ); diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index 36d6cae7157a..ae9605e2ddcc 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -1051,7 +1051,7 @@ OUString ORegKey::getFullPath(OUString const & path) const { } } else { if (path[0] != '/') { - b.append(sal_Unicode('/')); + b.append('/'); } b.append(path); } diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 7f106937abff..6e91557511f1 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -53,7 +53,7 @@ OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,cons OUStringBuffer sQName; // ...if it's in our map, make the prefix sQName.append ( xmloff::token::GetXMLToken(_eNamespace) ); - sQName.append ( sal_Unicode(':') ); + sQName.append ( ':' ); sQName.append ( xmloff::token::GetXMLToken(_eAttribute) ); return sQName.makeStringAndClear(); } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 418557e0f45e..ddad2e36e02f 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -170,7 +170,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const { OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); - const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') ); + const sal_Int32 nColonPos = sAttrName.indexOf( ':' ); if( -1L == nColonPos ) sLocalName = sAttrName; else @@ -221,7 +221,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const { OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); - const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') ); + const sal_Int32 nColonPos = sAttrName.indexOf( ':' ); if( -1L == nColonPos ) sLocalName = sAttrName; else @@ -266,7 +266,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const { OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); - const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') ); + const sal_Int32 nColonPos = sAttrName.indexOf( ':' ); if( -1L == nColonPos ) sLocalName = sAttrName; else diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 19ce7b86bd4b..0b8ed51dcb06 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -38,15 +38,15 @@ sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::ETo switch(_eToken) { case eOk: - return sal_Unicode('('); + return '('; case eClose: - return sal_Unicode(')'); + return ')'; case eSep: - return sal_Unicode(';'); + return ';'; case eArrayOpen: - return sal_Unicode('{'); + return '{'; case eArrayClose: - return sal_Unicode('}'); + return '}'; } return 0; } diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 6d1694d5c85a..dab4d9942433 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -241,7 +241,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) { #if !defined(ANDROID) && !defined(IOS) // No use searching PATH on Android or iOS /* see @ osl_getExecutableFile(). */ - if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), sal_Unicode('/')) == -1) + if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), '/') == -1) { const rtl::OUString PATH ("PATH"); diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index c0ccaaae5225..13b936e844a4 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -55,7 +55,7 @@ public: sal_Int32 end; double res = rtl::math::stringToDouble( rtl::OUString(" +1.E01foo"), - sal_Unicode('.'), sal_Unicode(','), &status, &end); + '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(" +1.E01")), end); CPPUNIT_ASSERT_EQUAL(10.0, res); @@ -66,7 +66,7 @@ public: sal_Int32 end; double res = rtl::math::stringToDouble( rtl::OUString(" +Efoo"), - sal_Unicode('.'), sal_Unicode(','), &status, &end); + '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end); CPPUNIT_ASSERT_EQUAL(0.0, res); @@ -77,13 +77,13 @@ public: sal_Int32 end; double res = rtl::math::stringToDouble( rtl::OUString("1e"), - sal_Unicode('.'), sal_Unicode(','), &status, &end); + '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH("1")), end); CPPUNIT_ASSERT_EQUAL(1.0, res); res = rtl::math::stringToDouble( rtl::OUString("0e"), - sal_Unicode('.'), sal_Unicode(','), &status, &end); + '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH("1")), end); CPPUNIT_ASSERT_EQUAL(0.0, res); diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index a4169b3b66b9..3826a2b6fdda 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -889,7 +889,7 @@ void rtl_bootstrap_encode( rtl_uString const * value, rtl_uString ** encoded ) for (sal_Int32 i = 0; i < value->length; ++i) { sal_Unicode c = value->buffer[i]; if (c == '$' || c == '\\') { - b.append(sal_Unicode('\\')); + b.append('\\'); } b.append(c); } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index ddade744ddaf..5d64a10b5f7f 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -759,7 +759,7 @@ OUString lclGetErrorMessage( XML_Error xmlE, const OUString& sSystemId, sal_Int3 default:; } - OUStringBuffer aBuffer( sal_Unicode( '[' ) ); + OUStringBuffer aBuffer( '[' ); aBuffer.append( sSystemId ); aBuffer.append( " line " ); aBuffer.append( nLine ); diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 6d8f80f2a412..a2b3dd0af9fd 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -64,10 +64,10 @@ bool Converter::convertMeasure( sal_Int32& rValue, sal_Int32 const nLen = rString.getLength(); // skip white space - while( (nPos < nLen) && (rString[nPos] <= sal_Unicode(' ')) ) + while( (nPos < nLen) && (rString[nPos] <= ' ') ) nPos++; - if( nPos < nLen && sal_Unicode('-') == rString[nPos] ) + if( nPos < nLen && '-' == rString[nPos] ) { bNeg = true; nPos++; @@ -75,32 +75,32 @@ bool Converter::convertMeasure( sal_Int32& rValue, // get number while( nPos < nLen && - sal_Unicode('0') <= rString[nPos] && - sal_Unicode('9') >= rString[nPos] ) + '0' <= rString[nPos] && + '9' >= rString[nPos] ) { // TODO: check overflow! nVal *= 10; - nVal += (rString[nPos] - sal_Unicode('0')); + nVal += (rString[nPos] - '0'); nPos++; } double nDiv = 1.; - if( nPos < nLen && sal_Unicode('.') == rString[nPos] ) + if( nPos < nLen && '.' == rString[nPos] ) { nPos++; while( nPos < nLen && - sal_Unicode('0') <= rString[nPos] && - sal_Unicode('9') >= rString[nPos] ) + '0' <= rString[nPos] && + '9' >= rString[nPos] ) { // TODO: check overflow! nDiv *= 10; - nVal += ( ((double)(rString[nPos] - sal_Unicode('0'))) / nDiv ); + nVal += ( ((double)(rString[nPos] - '0')) / nDiv ); nPos++; } } // skip white space - while( (nPos < nLen) && (rString[nPos] <= sal_Unicode(' ')) ) + while( (nPos < nLen) && (rString[nPos] <= ' ') ) nPos++; if( nPos < nLen ) @@ -108,16 +108,16 @@ bool Converter::convertMeasure( sal_Int32& rValue, if( MeasureUnit::PERCENT == nTargetUnit ) { - if( sal_Unicode('%') != rString[nPos] ) + if( '%' != rString[nPos] ) return false; } else if( MeasureUnit::PIXEL == nTargetUnit ) { if( nPos + 1 >= nLen || - (sal_Unicode('p') != rString[nPos] && - sal_Unicode('P') != rString[nPos])|| - (sal_Unicode('x') != rString[nPos+1] && - sal_Unicode('X') != rString[nPos+1]) ) + ('p' != rString[nPos] && + 'P' != rString[nPos])|| + ('x' != rString[nPos+1] && + 'X' != rString[nPos+1]) ) return false; } else @@ -269,7 +269,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, "MeasureUnit::PERCENT only maps to MeasureUnit::PERCENT!" ); rBuffer.append( nMeasure ); - rBuffer.append( sal_Unicode('%' ) ); + rBuffer.append( '%' ); return; } @@ -277,7 +277,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, if( nMeasure < 0 ) { nMeasure = -nMeasure; - rBuffer.append( sal_Unicode('-') ); + rBuffer.append( '-' ); } // The new length is (nVal * nMul)/(nDiv*nFac*10) @@ -402,7 +402,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, rBuffer.append( static_cast<sal_Int64>(nValue / nFac) ); if (nFac > 1 && (nValue % nFac) != 0) { - rBuffer.append( sal_Unicode('.') ); + rBuffer.append( '.' ); while (nFac > 1 && (nValue % nFac) != 0) { nFac /= 10; @@ -450,7 +450,7 @@ bool Converter::convertPercent( sal_Int32& rPercent, const OUString& rString ) void Converter::convertPercent( OUStringBuffer& rBuffer, sal_Int32 nValue ) { rBuffer.append( nValue ); - rBuffer.append( sal_Unicode('%' ) ); + rBuffer.append( '%' ); } /** convert string to pixel measure */ @@ -463,8 +463,8 @@ bool Converter::convertMeasurePx( sal_Int32& rPixel, const OUString& rString ) void Converter::convertMeasurePx( OUStringBuffer& rBuffer, sal_Int32 nValue ) { rBuffer.append( nValue ); - rBuffer.append( sal_Unicode('p' ) ); - rBuffer.append( sal_Unicode('x' ) ); + rBuffer.append( 'p' ); + rBuffer.append( 'x' ); } int lcl_gethex( int nChar ) @@ -501,7 +501,7 @@ static const sal_Char aHexTab[] = "0123456789abcdef"; /** convert color to string */ void Converter::convertColor( OUStringBuffer& rBuffer, sal_Int32 nColor ) { - rBuffer.append( sal_Unicode( '#' ) ); + rBuffer.append( '#' ); sal_uInt8 nCol = (sal_uInt8)(nColor >> 16); rBuffer.append( sal_Unicode( aHexTab[ nCol >> 4 ] ) ); @@ -547,10 +547,10 @@ bool Converter::convertNumber64( sal_Int64& rValue, sal_Int32 const nLen = rString.getLength(); // skip white space - while( (nPos < nLen) && (rString[nPos] <= sal_Unicode(' ')) ) + while( (nPos < nLen) && (rString[nPos] <= ' ') ) nPos++; - if( nPos < nLen && sal_Unicode('-') == rString[nPos] ) + if( nPos < nLen && '-' == rString[nPos] ) { bNeg = true; nPos++; @@ -558,8 +558,8 @@ bool Converter::convertNumber64( sal_Int64& rValue, // get number while( nPos < nLen && - sal_Unicode('0') <= rString[nPos] && - sal_Unicode('9') >= rString[nPos] ) + '0' <= rString[nPos] && + '9' >= rString[nPos] ) { // TODO: check overflow! rValue *= 10; @@ -590,7 +590,7 @@ void Converter::convertDouble( OUStringBuffer& rBuffer, OSL_ENSURE( nTargetUnit == MeasureUnit::PERCENT, "MeasureUnit::PERCENT only maps to MeasureUnit::PERCENT!" ); ::rtl::math::doubleToUStringBuffer( rBuffer, fNumber, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true); if(bWriteUnits) - rBuffer.append(sal_Unicode('%')); + rBuffer.append('%'); } else { @@ -615,7 +615,7 @@ bool Converter::convertDouble(double& rValue, const OUString& rString, sal_Int16 nSourceUnit, sal_Int16 nTargetUnit) { rtl_math_ConversionStatus eStatus; - rValue = ::rtl::math::stringToDouble( rString, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL ); + rValue = ::rtl::math::stringToDouble( rString, '.', ',', &eStatus, NULL ); if(eStatus == rtl_math_ConversionStatus_Ok) { @@ -634,7 +634,7 @@ bool Converter::convertDouble(double& rValue, bool Converter::convertDouble(double& rValue, const OUString& rString) { rtl_math_ConversionStatus eStatus; - rValue = ::rtl::math::stringToDouble( rString, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL ); + rValue = ::rtl::math::stringToDouble( rString, '.', ',', &eStatus, NULL ); return ( eStatus == rtl_math_ConversionStatus_Ok ); } @@ -648,7 +648,7 @@ void Converter::convertDuration(OUStringBuffer& rBuffer, // XML Schema, W3C Working Draft 07 April 2000, section 3.2.6.1 if (fValue < 0.0) { - rBuffer.append(sal_Unicode('-')); + rBuffer.append('-'); fValue = - fValue; } @@ -685,15 +685,15 @@ void Converter::convertDuration(OUStringBuffer& rBuffer, } if (fHoursValue < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( fHoursValue)); - rBuffer.append( sal_Unicode('H')); + rBuffer.append( 'H'); if (fMinsValue < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( fMinsValue)); - rBuffer.append( sal_Unicode('M')); + rBuffer.append( 'M'); if (fSecsValue < 10) - rBuffer.append( sal_Unicode('0')); + rBuffer.append( '0'); rBuffer.append( sal_Int32( fSecsValue)); if (fNanoSecsValue > 0.0) { @@ -702,11 +702,11 @@ void Converter::convertDuration(OUStringBuffer& rBuffer, true)); if ( aNS.getLength() > 2 ) { - rBuffer.append( sal_Unicode('.')); + rBuffer.append( '.'); rBuffer.append( aNS.copy( 2 ) ); // strip "0." } } - rBuffer.append( sal_Unicode('S')); + rBuffer.append( 'S'); } /** convert ISO "duration" string to double; negative durations allowed */ @@ -718,13 +718,13 @@ bool Converter::convertDuration(double& rfTime, // negative time duration? bool bIsNegativeDuration = false; - if ( sal_Unicode('-') == (*pStr) ) + if ( '-' == (*pStr) ) { bIsNegativeDuration = true; pStr++; } - if ( *(pStr++) != sal_Unicode('P') ) // duration must start with "P" + if ( *(pStr++) != 'P' ) // duration must start with "P" return false; OUString sDoubleStr; @@ -743,7 +743,7 @@ bool Converter::convertDuration(double& rfTime, sal_Unicode c = *(pStr++); if ( !c ) // end bDone = true; - else if ( sal_Unicode('0') <= c && sal_Unicode('9') >= c ) + else if ( '0' <= c && '9' >= c ) { if ( nTemp >= SAL_MAX_INT32 / 10 ) bSuccess = false; @@ -762,24 +762,24 @@ bool Converter::convertDuration(double& rfTime, } else if ( bTimePart ) { - if ( c == sal_Unicode('H') ) + if ( c == 'H' ) { nHours = nTemp; nTemp = 0; } - else if ( c == sal_Unicode('M') ) + else if ( c == 'M' ) { nMins = nTemp; nTemp = 0; } - else if ( (c == sal_Unicode(',')) || (c == sal_Unicode('.')) ) + else if ( (c == ',') || (c == '.') ) { nSecs = nTemp; nTemp = 0; bIsFraction = true; sDoubleStr = "0."; } - else if ( c == sal_Unicode('S') ) + else if ( c == 'S' ) { if ( !bIsFraction ) { @@ -793,14 +793,14 @@ bool Converter::convertDuration(double& rfTime, } else { - if ( c == sal_Unicode('T') ) // "T" starts time part + if ( c == 'T' ) // "T" starts time part bTimePart = true; - else if ( c == sal_Unicode('D') ) + else if ( c == 'D' ) { nDays = nTemp; nTemp = 0; } - else if ( c == sal_Unicode('Y') || c == sal_Unicode('M') ) + else if ( c == 'Y' || c == 'M' ) { //! how many days is a year or month? @@ -843,42 +843,42 @@ void Converter::convertDuration(OUStringBuffer& rBuffer, { if (rDuration.Negative) { - rBuffer.append(sal_Unicode('-')); + rBuffer.append('-'); } - rBuffer.append(sal_Unicode('P')); + rBuffer.append('P'); const bool bHaveDate(rDuration.Years != 0 || rDuration.Months != 0 || rDuration.Days != 0); if (rDuration.Years) { rBuffer.append(static_cast<sal_Int32>(rDuration.Years)); - rBuffer.append(sal_Unicode('Y')); + rBuffer.append('Y'); } if (rDuration.Months) { rBuffer.append(static_cast<sal_Int32>(rDuration.Months)); - rBuffer.append(sal_Unicode('M')); + rBuffer.append('M'); } if (rDuration.Days) { rBuffer.append(static_cast<sal_Int32>(rDuration.Days)); - rBuffer.append(sal_Unicode('D')); + rBuffer.append('D'); } if ( rDuration.Hours != 0 || rDuration.Minutes != 0 || rDuration.Seconds != 0 || rDuration.NanoSeconds != 0 ) { - rBuffer.append(sal_Unicode('T')); // time separator + rBuffer.append('T'); // time separator if (rDuration.Hours) { rBuffer.append(static_cast<sal_Int32>(rDuration.Hours)); - rBuffer.append(sal_Unicode('H')); + rBuffer.append('H'); } if (rDuration.Minutes) { rBuffer.append(static_cast<sal_Int32>(rDuration.Minutes)); - rBuffer.append(sal_Unicode('M')); + rBuffer.append('M'); } if (rDuration.Seconds != 0 || rDuration.NanoSeconds != 0) { @@ -894,14 +894,14 @@ void Converter::convertDuration(OUStringBuffer& rBuffer, ostr << rDuration.NanoSeconds; rBuffer.append(OUString::createFromAscii(ostr.str().c_str())); } - rBuffer.append(sal_Unicode('S')); + rBuffer.append('S'); } } else if (!bHaveDate) { // zero duration: XMLSchema-2 says there must be at least one component - rBuffer.append(sal_Unicode('0')); - rBuffer.append(sal_Unicode('D')); + rBuffer.append('0'); + rBuffer.append('D'); } } @@ -918,7 +918,7 @@ readUnsignedNumber(const OUString & rString, while (nPos < rString.getLength()) { const sal_Unicode c = rString[nPos]; - if ((sal_Unicode('0') <= c) && (c <= sal_Unicode('9'))) + if (('0' <= c) && (c <= '9')) { nTemp *= 10; nTemp += (c - sal_Unicode('0')); @@ -958,7 +958,7 @@ readUnsignedNumberMaxDigits(int maxDigits, while (nPos < rString.getLength()) { const sal_Unicode c = rString[nPos]; - if ((sal_Unicode('0') <= c) && (c <= sal_Unicode('9'))) + if (('0' <= c) && (c <= '9')) { if (maxDigits > 0) { @@ -993,7 +993,7 @@ static bool readDurationT(const OUString & rString, sal_Int32 & io_rnPos) { if ((io_rnPos < rString.getLength()) && - (rString[io_rnPos] == sal_Unicode('T'))) + (rString[io_rnPos] == 'T')) { ++io_rnPos; return true; @@ -1039,14 +1039,14 @@ bool Converter::convertDuration(util::Duration& rDuration, sal_Int32 nPos(0); bool bIsNegativeDuration(false); - if (!string.isEmpty() && (sal_Unicode('-') == string[0])) + if (!string.isEmpty() && ('-' == string[0])) { bIsNegativeDuration = true; ++nPos; } if ((nPos < string.getLength()) - && (string[nPos] != sal_Unicode('P'))) // duration must start with "P" + && (string[nPos] != 'P')) // duration must start with "P" { return false; } @@ -1071,19 +1071,19 @@ bool Converter::convertDuration(util::Duration& rDuration, if (!bTimePart && bSuccess) { bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart, - nYears, sal_Unicode('Y')); + nYears, 'Y'); } if (!bTimePart && bSuccess) { bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart, - nMonths, sal_Unicode('M')); + nMonths, 'M'); } if (!bTimePart && bSuccess) { bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart, - nDays, sal_Unicode('D')); + nDays, 'D'); } if (bTimePart) @@ -1096,20 +1096,20 @@ bool Converter::convertDuration(util::Duration& rDuration, if (bSuccess) { bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart, - nHours, sal_Unicode('H')); + nHours, 'H'); } if (bSuccess) { bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart, - nMinutes, sal_Unicode('M')); + nMinutes, 'M'); } // eeek! seconds are icky. if ((nPos < string.getLength()) && bSuccess) { - if (string[nPos] == sal_Unicode('.') || - string[nPos] == sal_Unicode(',')) + if (string[nPos] == '.' || + string[nPos] == ',') { ++nPos; if (-1 != nTemp) @@ -1126,7 +1126,7 @@ bool Converter::convertDuration(util::Duration& rDuration, OSL_ENSURE(nDigits > 0, "bad code monkey: negative digits"); nNanoSeconds=static_cast<double>(nTemp)*(1000000000.0/pow(10.0,nDigits)); nTemp=-1; - if (sal_Unicode('S') == string[nPos]) + if ('S' == string[nPos]) { ++nPos; } @@ -1146,7 +1146,7 @@ bool Converter::convertDuration(util::Duration& rDuration, bSuccess = false; } } - else if (sal_Unicode('S') == string[nPos]) + else if ('S' == string[nPos]) { ++nPos; if (-1 != nTemp) @@ -1193,17 +1193,17 @@ lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset) { if (0 == nOffset) { - i_rBuffer.append(sal_Unicode('Z')); + i_rBuffer.append('Z'); } else { if (0 < nOffset) { - i_rBuffer.append(sal_Unicode('+')); + i_rBuffer.append('+'); } else { - i_rBuffer.append(sal_Unicode('-')); + i_rBuffer.append('-'); } const sal_Int32 nHours (abs(nOffset) / 60); const sal_Int32 nMinutes(abs(nOffset) % 60); @@ -1452,7 +1452,7 @@ bool Converter::parseDateOrDateTime( sal_Int32 nPos(0); if (string.getLength() > nPos) { - if (sal_Unicode('-') == string[nPos]) + if ('-' == string[nPos]) { isNegative = true; ++nPos; @@ -1468,7 +1468,7 @@ bool Converter::parseDateOrDateTime( bSuccess &= (0 < nYear); bSuccess &= (nPos < string.getLength()); // not last token } - if (bSuccess && (sal_Unicode('-') != string[nPos])) // separator + if (bSuccess && ('-' != string[nPos])) // separator { bSuccess = false; } @@ -1484,7 +1484,7 @@ bool Converter::parseDateOrDateTime( bSuccess &= (0 < nMonth) && (nMonth <= 12); bSuccess &= (nPos < string.getLength()); // not last token } - if (bSuccess && (sal_Unicode('-') != string[nPos])) // separator + if (bSuccess && ('-' != string[nPos])) // separator { bSuccess = false; } @@ -1503,7 +1503,7 @@ bool Converter::parseDateOrDateTime( bool bHaveTime(false); if (bSuccess && (nPos < string.getLength())) { - if (sal_Unicode('T') == string[nPos]) // time separator + if ('T' == string[nPos]) // time separator { bHaveTime = true; ++nPos; @@ -1521,7 +1521,7 @@ bool Converter::parseDateOrDateTime( bSuccess &= (0 <= nHours) && (nHours <= 24); bSuccess &= (nPos < string.getLength()); // not last token } - if (bSuccess && (sal_Unicode(':') != string[nPos])) // separator + if (bSuccess && (':' != string[nPos])) // separator { bSuccess = false; } @@ -1536,7 +1536,7 @@ bool Converter::parseDateOrDateTime( bSuccess &= (0 <= nMinutes) && (nMinutes < 60); bSuccess &= (nPos < string.getLength()); // not last token } - if (bSuccess && (sal_Unicode(':') != string[nPos])) // separator + if (bSuccess && (':' != string[nPos])) // separator { bSuccess = false; } @@ -1551,7 +1551,7 @@ bool Converter::parseDateOrDateTime( bSuccess &= (0 <= nSeconds) && (nSeconds < 60); } if (bSuccess && (nPos < string.getLength()) && - (sal_Unicode('.') == string[nPos] || sal_Unicode(',') == string[nPos])) // fraction separator + ('.' == string[nPos] || ',' == string[nPos])) // fraction separator { ++nPos; const sal_Int32 nStart(nPos); @@ -1583,19 +1583,19 @@ bool Converter::parseDateOrDateTime( if (bSuccess && (nPos < string.getLength())) { const sal_Unicode c(string[nPos]); - if (sal_Unicode('+') == c) + if ('+' == c) { bHaveTimezone = true; bHaveTimezonePlus = true; ++nPos; } - else if (sal_Unicode('-') == c) + else if ('-' == c) { bHaveTimezone = true; bHaveTimezoneMinus = true; ++nPos; } - else if (sal_Unicode('Z') == c) + else if ('Z' == c) { bHaveTimezone = true; ++nPos; @@ -1613,7 +1613,7 @@ bool Converter::parseDateOrDateTime( string, nPos, nTimezoneHours, 2, true); bSuccess &= (0 <= nTimezoneHours) && (nTimezoneHours <= 14); bSuccess &= (nPos < string.getLength()); // not last token - if (bSuccess && (sal_Unicode(':') != string[nPos])) // separator + if (bSuccess && (':' != string[nPos])) // separator { bSuccess = false; } @@ -2281,26 +2281,26 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau sal_Int16 nRetUnit = nDefaultUnit; // skip white space - while( nPos < nLen && sal_Unicode(' ') == rString[nPos] ) + while( nPos < nLen && ' ' == rString[nPos] ) nPos++; // skip negative - if( nPos < nLen && sal_Unicode('-') == rString[nPos] ) + if( nPos < nLen && '-' == rString[nPos] ) nPos++; // skip number - while( nPos < nLen && sal_Unicode('0') <= rString[nPos] && sal_Unicode('9') >= rString[nPos] ) + while( nPos < nLen && '0' <= rString[nPos] && '9' >= rString[nPos] ) nPos++; - if( nPos < nLen && sal_Unicode('.') == rString[nPos] ) + if( nPos < nLen && '.' == rString[nPos] ) { nPos++; - while( nPos < nLen && sal_Unicode('0') <= rString[nPos] && sal_Unicode('9') >= rString[nPos] ) + while( nPos < nLen && '0' <= rString[nPos] && '9' >= rString[nPos] ) nPos++; } // skip white space - while( nPos < nLen && sal_Unicode(' ') == rString[nPos] ) + while( nPos < nLen && ' ' == rString[nPos] ) nPos++; if( nPos < nLen ) @@ -2315,8 +2315,8 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau case sal_Unicode('c'): case sal_Unicode('C'): { - if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('m') - || rString[nPos+1] == sal_Unicode('M'))) + if(nPos+1 < nLen && (rString[nPos+1] == 'm' + || rString[nPos+1] == 'M')) nRetUnit = MeasureUnit::CM; break; } @@ -2329,27 +2329,27 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau case sal_Unicode('i'): case sal_Unicode('I'): { - if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('n') - || rString[nPos+1] == sal_Unicode('n'))) + if(nPos+1 < nLen && (rString[nPos+1] == 'n' + || rString[nPos+1] == 'n')) nRetUnit = MeasureUnit::INCH; break; } case sal_Unicode('m'): case sal_Unicode('M'): { - if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('m') - || rString[nPos+1] == sal_Unicode('M'))) + if(nPos+1 < nLen && (rString[nPos+1] == 'm' + || rString[nPos+1] == 'M')) nRetUnit = MeasureUnit::MM; break; } case sal_Unicode('p'): case sal_Unicode('P'): { - if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('t') - || rString[nPos+1] == sal_Unicode('T'))) + if(nPos+1 < nLen && (rString[nPos+1] == 't' + || rString[nPos+1] == 'T')) nRetUnit = MeasureUnit::POINT; - if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('c') - || rString[nPos+1] == sal_Unicode('C'))) + if(nPos+1 < nLen && (rString[nPos+1] == 'c' + || rString[nPos+1] == 'C')) nRetUnit = MeasureUnit::TWIP; break; } diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 7ee5715c34e6..a2dcb380fef8 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -588,7 +588,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected ) VirtualDevice aVDev; OUString sAuthor( getInitials( mxAnnotation->getAuthor() ) ); - sAuthor += OUString( sal_Unicode( ' ' ) ); + sAuthor += OUString( ' ' ); sAuthor += OUString::number( mnIndex ); aVDev.SetFont( mrFont ); diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 40145feaf3d3..e7b18944fa43 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -40,7 +40,7 @@ namespace sd { -#define TOKEN (sal_Unicode(';')) +#define TOKEN ';' CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pInView) diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 285ac6bf0edf..330951f722e6 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -247,9 +247,9 @@ OUString SAL_CALL // Get the prefix that ends with the second "/". const OUString& rsResourceURL (maResourceURLs[0]); - sal_Int32 nPrefixEnd (rsResourceURL.indexOf(sal_Unicode('/'), 0)); + sal_Int32 nPrefixEnd (rsResourceURL.indexOf('/', 0)); if (nPrefixEnd >= 0) - nPrefixEnd = rsResourceURL.indexOf(sal_Unicode('/'), nPrefixEnd+1) + 1; + nPrefixEnd = rsResourceURL.indexOf('/', nPrefixEnd+1) + 1; else nPrefixEnd = 0; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 7d6c44b1ed22..b974ceb8671d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1576,7 +1576,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: { OUString aBookmark( pEvent->maStrBookmark ); - sal_Int32 nPos = aBookmark.indexOf( sal_Unicode('#') ); + sal_Int32 nPos = aBookmark.indexOf( '#' ); if( nPos >= 0 ) { OUString aURL( aBookmark.copy( 0, nPos+1 ) ); @@ -1688,7 +1688,7 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim { OUString aBookmark( aHyperLink ); - sal_Int32 nPos = aBookmark.indexOf( sal_Unicode('#') ); + sal_Int32 nPos = aBookmark.indexOf( '#' ); if( nPos >= 0 ) { OUString aURL( aBookmark.copy( 0, nPos+1 ) ); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 8ff7ff2866da..0843cae29785 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -753,7 +753,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : else { aString = pInfo->GetBookmark() ; - sal_Int32 nPos = aString.lastIndexOf( sal_Unicode('#') ); + sal_Int32 nPos = aString.lastIndexOf( '#' ); if( nPos >= 0 ) { OUString aURL( aString.copy( 0, nPos+1 ) ); @@ -1351,7 +1351,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno } else if( eClickAction == presentation::ClickAction_DOCUMENT ) { - sal_Int32 nPos = aStrBookmark.lastIndexOf( sal_Unicode('#') ); + sal_Int32 nPos = aStrBookmark.lastIndexOf( '#' ); if( nPos >= 0 ) { OUString aURL( aStrBookmark.copy( 0, nPos+1 ) ); @@ -1432,11 +1432,11 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno OUStringBuffer sBuffer; sBuffer.append( aMacroName ); - sBuffer.append( sal_Unicode('.') ); + sBuffer.append( '.' ); sBuffer.append( aModulName ); - sBuffer.append( sal_Unicode('.') ); + sBuffer.append( '.' ); sBuffer.append( aLibName ); - sBuffer.append( sal_Unicode('.') ); + sBuffer.append( '.' ); if ( aStrLibrary == "StarOffice" ) { @@ -1547,9 +1547,9 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) OUStringBuffer sBuffer; sBuffer.append( aLibName ); - sBuffer.append( sal_Unicode('.') ); + sBuffer.append( '.' ); sBuffer.append( aModulName ); - sBuffer.append( sal_Unicode('.') ); + sBuffer.append( '.' ); sBuffer.append( aMacroName ); aAny <<= OUString( sBuffer.makeStringAndClear() ); @@ -1606,7 +1606,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) case presentation::ClickAction_PROGRAM: { OUString aString( pInfo->GetBookmark()); - sal_Int32 nPos = aString.lastIndexOf( sal_Unicode('#') ); + sal_Int32 nPos = aString.lastIndexOf( '#' ); if( nPos >= 0 ) { OUString aURL( aString.copy( 0, nPos+1 ) ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 185daab2a77d..9ad34730d968 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1516,7 +1516,7 @@ OUString SdGenericDrawPage::getBookmarkURL() const { const OUString aBookmarkName( SdDrawPage::getPageApiNameFromUiName( static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetBookmarkName() ) ); aRet.append( aFileName ); - aRet.append( (sal_Unicode)'#' ); + aRet.append( '#' ); aRet.append( aBookmarkName ); } } @@ -1529,7 +1529,7 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) { if( SvxFmDrawPage::mpPage ) { - sal_Int32 nIndex = rURL.indexOf( (sal_Unicode)'#' ); + sal_Int32 nIndex = rURL.indexOf( '#' ); if( nIndex != -1 ) { const OUString aFileName( rURL.copy( 0, nIndex ) ); @@ -2198,7 +2198,7 @@ OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ) sal_Int32 nChar; for( nChar = 0; nChar < nChars; nChar++, pString++ ) { - if((*pString < sal_Unicode('0')) || (*pString > sal_Unicode('9'))) + if((*pString < '0') || (*pString > '9')) { // found a non number character, so this is not the default // name for this page @@ -2211,7 +2211,7 @@ OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ) { OUStringBuffer sBuffer; sBuffer.append( SD_RESSTR(STR_PAGE) ); - sBuffer.append( sal_Unicode( ' ' ) ); + sBuffer.append( ' ' ); sBuffer.append( aNumber ); return sBuffer.makeStringAndClear(); } diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 0f30d4148c46..1c3ff4d7adc4 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -400,17 +400,17 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) switch( rHelpLine.GetKind() ) { case SDRHELPLINE_POINT: - aLines.append( (sal_Unicode)'P' ); + aLines.append( 'P' ); aLines.append( (sal_Int32)rPos.X() ); - aLines.append( (sal_Unicode)',' ); + aLines.append( ',' ); aLines.append( (sal_Int32)rPos.Y() ); break; case SDRHELPLINE_VERTICAL: - aLines.append( (sal_Unicode)'V' ); + aLines.append( 'V' ); aLines.append( (sal_Int32)rPos.X() ); break; case SDRHELPLINE_HORIZONTAL: - aLines.append( (sal_Unicode)'H' ); + aLines.append( 'H' ); aLines.append( (sal_Int32)rPos.Y() ); break; default: @@ -537,7 +537,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& pStr++; - while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') ) + while( (*pStr >= '0' && *pStr <= '9') || (*pStr == '+') || (*pStr == '-') ) { sBuffer.append( *pStr++ ); } @@ -557,7 +557,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& if( *pStr++ != ',' ) return; - while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') ) + while( (*pStr >= '0' && *pStr <= '9') || (*pStr == '+') || (*pStr == '-') ) { sBuffer.append( *pStr++ ); } diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 7665be4d1e7d..09c35e5de51e 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -699,7 +699,7 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString& break; } - OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) ); + OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( '/' )+1 ) ); bool bEntered = false; do diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx index eaa6304274c2..7a4201460baf 100644 --- a/sdext/source/pdfimport/misc/pdfihelper.cxx +++ b/sdext/source/pdfimport/misc/pdfihelper.cxx @@ -32,15 +32,15 @@ OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) const sal_uInt8 nRed ( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Red * 255.0 ) ) ); const sal_uInt8 nGreen( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Green * 255.0 ) ) ); const sal_uInt8 nBlue ( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Blue * 255.0 ) ) ); - aBuf.append( sal_Unicode('#') ); + aBuf.append( '#' ); if( nRed < 10 ) - aBuf.append( sal_Unicode('0') ); + aBuf.append( '0' ); aBuf.append( sal_Int32(nRed), 16 ); if( nGreen < 10 ) - aBuf.append( sal_Unicode('0') ); + aBuf.append( '0' ); aBuf.append( sal_Int32(nGreen), 16 ); if( nBlue < 10 ) - aBuf.append( sal_Unicode('0') ); + aBuf.append( '0' ); aBuf.append( sal_Int32(nBlue), 16 ); // TODO(F3): respect alpha transparency (polygons etc.) diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 1b3cfadd43a9..e3b013502f0d 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -230,17 +230,17 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem, if( fRotate != 0.0 ) { if( !aBuf.isEmpty() ) - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.appendAscii( "rotate( " ); aBuf.append( -fRotate ); aBuf.appendAscii( " )" ); } if( !aBuf.isEmpty() ) - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.appendAscii( "translate( " ); aBuf.append( convertPixelToUnitString( rel_x ) ); - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.append( convertPixelToUnitString( rel_y ) ); aBuf.appendAscii( " )" ); @@ -332,7 +332,7 @@ void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >:: OUStringBuffer aBuf( 64 ); aBuf.appendAscii( "0 0 " ); aBuf.append( convPx2mmPrec2(elem.w)*100.0 ); - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.append( convPx2mmPrec2(elem.h)*100.0 ); aProps[ "svg:viewBox" ] = aBuf.makeStringAndClear(); aProps[ "svg:d" ] = basegfx::tools::exportToSvgD( elem.PolyPoly, true, true, false ); diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 6b4681e33ddc..ac5450b98074 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -170,7 +170,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, if( fRotate != 0.0 ) { if( !aBuf.isEmpty() ) - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.appendAscii( "rotate( " ); aBuf.append( -fRotate ); aBuf.appendAscii( " )" ); @@ -179,10 +179,10 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, if( ! rElem.isCharacter ) { if( !aBuf.isEmpty() ) - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.appendAscii( "translate( " ); aBuf.append( convertPixelToUnitString( rel_x ) ); - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.append( convertPixelToUnitString( rel_y ) ); aBuf.appendAscii( " )" ); } @@ -272,7 +272,7 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* > OUStringBuffer aBuf( 64 ); aBuf.appendAscii( "0 0 " ); aBuf.append( convPx2mmPrec2(elem.w)*100.0 ); - aBuf.append( sal_Unicode(' ') ); + aBuf.append( ' ' ); aBuf.append( convPx2mmPrec2(elem.h)*100.0 ); aProps[ "svg:viewBox" ] = aBuf.makeStringAndClear(); aProps[ "svg:d" ] = basegfx::tools::exportToSvgD( elem.PolyPoly, true, true, false ); @@ -751,9 +751,9 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) && ! rCurGC.isRotatedOrSkewed() && ! rNextGC.isRotatedOrSkewed() && ! pNext->Text.isEmpty() - && pNext->Text[0] != sal_Unicode(' ') + && pNext->Text[0] != ' ' && ! pCur->Text.isEmpty() - && pCur->Text[pCur->Text.getLength() - 1] != sal_Unicode(' ') + && pCur->Text[pCur->Text.getLength() - 1] != ' ' ) { // check for new line in paragraph @@ -774,7 +774,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) // append a space unless there is a non breaking hyphen else if( aLastCode != 0x2011 ) { - pCur->Text.append( sal_Unicode( ' ' ) ); + pCur->Text.append( ' ' ); } } else // we're continuing the same line @@ -783,7 +783,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) // check for a small horizontal offset if( pCur->x + pCur->w + pNext->h*0.15 < pNext->x ) { - pCur->Text.append( sal_Unicode(' ') ); + pCur->Text.append( ' ' ); } } } diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 84eed9b31733..c02cd9a3cb4b 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -494,7 +494,7 @@ void Parser::parseFontFamilyName( FontAttributes& rResult ) const sal_Unicode* pCopy = rResult.familyName.getStr(); sal_Int32 nLen = rResult.familyName.getLength(); // parse out truetype subsets (e.g. BAAAAA+Thorndale) - if( nLen > 8 && pCopy[6] == sal_Unicode('+') ) + if( nLen > 8 && pCopy[6] == '+' ) { pCopy += 7; nLen -= 7; @@ -1028,7 +1028,7 @@ bool xpdf_ImportFromFile( const OUString& rURL, "getSystemPathFromFileURL(" << rURL << ") failed"); return false; } - OUString aDocName( rURL.copy( rURL.lastIndexOf( sal_Unicode('/') )+1 ) ); + OUString aDocName( rURL.copy( rURL.lastIndexOf( '/' )+1 ) ); // check for encryption, if necessary get password OUString aPwd( rPwd ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 93f0c3206376..bcef1d2c7a7f 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -598,7 +598,7 @@ namespace sfx2 { #define INSERT_DATA( j ) \ if ( aAnchorList[j].getLength() > 0 ) \ { \ - aData.append( aRefList[j] ).append( sal_Unicode('#') ).append( aAnchorList[j] ); \ + aData.append( aRefList[j] ).append( '#' ).append( aAnchorList[j] ); \ aIndexCB.SetEntryData( nPos, NEW_ENTRY( aData.makeStringAndClear(), insert ) ); \ } \ else \ @@ -613,7 +613,7 @@ void IndexTabPage_Impl::InitializeIndex() // By now more than 256 equal entries are not allowed sal_Unicode append[256]; for( int k = 0; k < 256; ++k ) - append[k] = sal_Unicode( ' ' ); + append[k] = ' '; sfx2::KeywordInfo aInfo; aIndexCB.SetUpdateMode( sal_False ); @@ -664,7 +664,7 @@ void IndexTabPage_Impl::InitializeIndex() DBG_ASSERT( aRefList.getLength() == aAnchorList.getLength(),"reference list and title list of different length" ); - insert = ( ( ndx = aKeywordPair.indexOf( sal_Unicode( ';' ) ) ) == -1 ? sal_False : sal_True ); + insert = ( ( ndx = aKeywordPair.indexOf( ';' ) ) == -1 ? sal_False : sal_True ); if ( insert ) { @@ -695,9 +695,9 @@ void IndexTabPage_Impl::InitializeIndex() { aData .append( aKeywordPair ) - .append( sal_Unicode(' ') ) - .append( sal_Unicode('-') ) - .append( sal_Unicode(' ') ) + .append( ' ' ) + .append( '-' ) + .append( ' ' ) .append( aTitleList[j] ); aTempString = aData.makeStringAndClear(); diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index ba7313ad25e0..f278dab7df79 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -66,7 +66,7 @@ bool SmIsMathAlpha(const OUString &rText) const sal_Unicode *pChar = aMathAlpha; while (*pChar && *pChar != cChar) pChar++; - return *pChar != sal_Unicode('\0'); + return *pChar != '\0'; } } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 48cc768db4b3..2326574a20b6 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -348,7 +348,7 @@ void UrlReference::setParameter(OUString const & key, OUString const & value) if (!bExistent) { newPath.append(sal_Unicode(m_base.m_path.indexOf('?') < 0 ? '?' : '&')); newPath.append(encodeNameOrParamFragment(key)); - newPath.append(sal_Unicode('=')); + newPath.append('='); } newPath.append(encodeNameOrParamFragment(value)); if (bExistent) { diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 988bd5c09269..2fae35cda205 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -30,12 +30,12 @@ static OUString parseString(const OUString & rCmd, sal_Int32 * pIndex) { OUString result; - if(rCmd[*pIndex] == sal_Unicode('\"')) { + if(rCmd[*pIndex] == '\"') { (*pIndex) ++; sal_Int32 begin = *pIndex; - while(*pIndex < rCmd.getLength() && rCmd[(*pIndex) ++] != sal_Unicode('\"')) ; + while(*pIndex < rCmd.getLength() && rCmd[(*pIndex) ++] != '\"') ; result = rCmd.copy(begin, *pIndex - begin - 1); } @@ -49,7 +49,7 @@ static OUString parseWord(const OUString & rCmd, sal_Int32 * pIndex) while(*pIndex < rCmd.getLength() && !isspace(sal::static_int_cast<int>(rCmd[*pIndex])) - && rCmd[*pIndex] != sal_Unicode('=')) + && rCmd[*pIndex] != '=') (*pIndex) ++; return rCmd.copy(begin, *pIndex - begin); @@ -83,16 +83,16 @@ bool SvCommandList::AppendCommands { eatSpace(rCmd, &index); - OUString name = (rCmd[index] == sal_Unicode('\"')) ? parseString(rCmd, &index) : parseWord(rCmd, &index); + OUString name = (rCmd[index] == '\"') ? parseString(rCmd, &index) : parseWord(rCmd, &index); eatSpace(rCmd, &index); OUString value; - if(index < rCmd.getLength() && rCmd[index] == sal_Unicode('=')) + if(index < rCmd.getLength() && rCmd[index] == '=') { index ++; eatSpace(rCmd, &index); - value = (rCmd[index] == sal_Unicode('\"')) ? parseString(rCmd, &index) : parseWord(rCmd, &index); + value = (rCmd[index] == '\"') ? parseString(rCmd, &index) : parseWord(rCmd, &index); } aCommandList.push_back( SvCommand(name, value)); diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 48f68b3cd23a..576da5930d1f 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -91,7 +91,7 @@ sal_Int32 SvNumberformat::InsertBlanks( OUStringBuffer& r, sal_Int32 nPos, sal_U } while( n-- ) { - r.insert( nPos++, (sal_Unicode)' '); + r.insert( nPos++, ' '); } } return nPos; @@ -802,14 +802,14 @@ SvNumberformat::SvNumberformat(OUString& rString, fNumber = 0.0; nPos = nPos - nAnzChars; sBuff.remove(nPos, nAnzChars); - sBuff.insert(nPos, (sal_Unicode)'0'); + sBuff.insert(nPos, '0'); nPos++; } } else { fNumber = 0.0; - sBuff.insert(nPos++,(sal_Unicode)'0'); + sBuff.insert(nPos++, '0'); } if (nIndex == 0) { @@ -1487,7 +1487,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, case '<': case '>': case '=': - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); sBuffSymbol.append(cToken); cLetter = cToken; eState = SsGetCon; @@ -1514,7 +1514,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, if ( rString[nPos] == '-' ) { // [$-xxx] locale - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); eSymbolType = BRACKET_SYMBOLTYPE_LOCALE; eState = SsGetPrefix; } @@ -1541,7 +1541,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, if ( lcl_matchKeywordAndGetNumber( aBufStr, nPos-1, aNatNum, nNatNumNum) && 0 <= nNatNumNum && nNatNumNum <= 19 ) { - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); sBuffSymbol.append( aBufStr.copy( --nPos, aNatNum.getLength()+1 )); nPos += aNatNum.getLength()+1; //! SymbolType is negative @@ -1551,7 +1551,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, else if ( lcl_matchKeywordAndGetNumber( aBufStr, nPos-1, aDBNum, nDBNum) && '1' <= nDBNum && nDBNum <= '9' ) { - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); sBuffSymbol.append( aBufStr.copy( --nPos, aDBNum.getLength()+1 )); nPos += aDBNum.getLength()+1; //! SymbolType is negative @@ -1571,7 +1571,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, } else { - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); sBuffSymbol.append(cToken); eSymbolType = BRACKET_SYMBOLTYPE_COLOR; eState = SsGetPrefix; @@ -1611,14 +1611,14 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, } else { - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); sBuffSymbol.append(cToken); eState = SsGetPrefix; } } else { - sBuffSymbol.stripStart((sal_Unicode)'['); + sBuffSymbol.stripStart('['); sBuffSymbol.append(cToken); eSymbolType = BRACKET_SYMBOLTYPE_COLOR; eState = SsGetPrefix; @@ -2165,7 +2165,7 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, OUString& rOutS rOutString = ::rtl::math::doubleToUString( rNumber, rtl_math_StringFormat_F, nPrecision /*2*/, GetFormatter().GetNumDecimalSep()[0], true ); - if (rOutString[0] == (sal_Unicode)'-' && + if (rOutString[0] == '-' && comphelper::string::getTokenCount(rOutString, '0') == rOutString.getLength()) { rOutString = comphelper::string::stripStart(rOutString, '-'); // not -0 @@ -2494,7 +2494,7 @@ bool SvNumberformat::GetOutputString(double fNumber, } // #i112250# With the 10-decimal limit, small numbers are formatted as "0". // Switch to scientific in that case, too: - if (nLen > 11 || ((nLen == 1 && sBuff[0] == (sal_Unicode)'0') && fNumber != 0.0)) + if (nLen > 11 || ((nLen == 1 && sBuff[0] == '0') && fNumber != 0.0)) { sal_uInt16 nStandardPrec = rScan.GetStandardPrec(); nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals @@ -2505,7 +2505,7 @@ bool SvNumberformat::GetOutputString(double fNumber, } if (bSign) { - sBuff.insert(0, (sal_Unicode)'-'); + sBuff.insert(0, '-'); } OutString = sBuff.makeStringAndClear(); return false; @@ -2651,7 +2651,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber, rInfo.nCntPre + rInfo.nCntPost - 1, '.' ); OUStringBuffer ExpStr; short nExpSign = 1; - sal_Int32 nExPos = sStr.indexOf((sal_Unicode)'E'); + sal_Int32 nExPos = sStr.indexOf('E'); if ( nExPos >= 0 ) { @@ -2672,7 +2672,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber, // cut any decimal delimiter sal_Int32 index = 0; - while((index = sStr.indexOf((sal_Unicode)'.', index)) >= 0) + while((index = sStr.indexOf('.', index)) >= 0) { sStr.remove(index, 1); } @@ -2700,7 +2700,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber, bRes |= ImpNumberFill(ExpStr, fNumber, k, j, nIx, NF_SYMBOLTYPE_EXP); - while (nZeros < k && ExpStr[nZeros] == (sal_Unicode)'0') + while (nZeros < k && ExpStr[nZeros] == '0') { ++nZeros; } @@ -2716,11 +2716,11 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber, const OUString& rStr = rInfo.sStrArray[j]; if (nExpSign == -1) { - ExpStr.insert(0, (sal_Unicode)'-'); + ExpStr.insert(0, '-'); } - else if (rStr.getLength() > 1 && rStr[1] == (sal_Unicode)'+') + else if (rStr.getLength() > 1 && rStr[1] == '+') { - ExpStr.insert(0, (sal_Unicode)'+'); + ExpStr.insert(0, '+'); } ExpStr.insert(0, rStr[0]); if ( j ) @@ -2745,7 +2745,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber, } if (bSign) { - sStr.insert(0, (sal_Unicode)'-'); + sStr.insert(0, '-'); } sStr.append(ExpStr); @@ -3003,7 +3003,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber, { if (rInfo.nCntPre > 0 && nFrac == 0) { - sDiv.insert(0, (sal_Unicode)' '); + sDiv.insert(0, ' '); } else { @@ -3052,7 +3052,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber, } if (bSign && !(nFrac == 0 && fNum == 0.0)) { - sBuff.insert(0, (sal_Unicode)'-'); // Not -0 + sBuff.insert(0, '-'); // Not -0 } sBuff.append(sStr); sBuff.append(sFrac); @@ -3122,14 +3122,14 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber, OUStringBuffer sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds, rtl_math_StringFormat_F, int(nCntPost), '.')); - sSecStr.stripStart((sal_Unicode)'0'); - sSecStr.stripStart((sal_Unicode)'.'); + sSecStr.stripStart('0'); + sSecStr.stripStart('.'); if ( bInputLine ) { - sSecStr.stripEnd((sal_Unicode)'0'); + sSecStr.stripEnd('0'); for(sal_Int32 index = sSecStr.getLength(); index < rInfo.nCntPost; ++index) { - sSecStr.append((sal_Unicode)'0'); + sSecStr.append('0'); } impTransliterate(sSecStr, NumFor[nIx].GetNatNum()); nCntPost = sSecStr.getLength(); @@ -3252,11 +3252,11 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber, case NF_KEY_AP: // A/P if (cAmPm == 'a') { - sBuff.append((sal_Unicode)'a'); + sBuff.append('a'); } else { - sBuff.append((sal_Unicode)'p'); + sBuff.append('p'); } break; case NF_KEY_MI: // M @@ -3283,7 +3283,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber, } if (bSign && rInfo.bThousand) { - sBuff.insert(0, (sal_Unicode)'-'); + sBuff.insert(0, '-'); } return bRes; } @@ -3795,7 +3795,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, // can be distinguished from 2 digits display and edited // without suddenly being hit by the 2-digit year magic. OUStringBuffer aBuf; - padToLength(aBuf, 4 - aYear.getLength(), sal_Unicode('0')); + padToLength(aBuf, 4 - aYear.getLength(), '0'); impTransliterate(aBuf, NumFor[nIx].GetNatNum()); aBuf.append(aYear); sBuff.append(aBuf); @@ -3906,14 +3906,14 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, sal_uLong nSeconds = (sal_uLong)floor( fTime ); OUStringBuffer sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds, rtl_math_StringFormat_F, int(nCntPost), '.')); - sSecStr.stripStart((sal_Unicode)'0'); - sSecStr.stripStart((sal_Unicode)'.'); + sSecStr.stripStart('0'); + sSecStr.stripStart('.'); if ( bInputLine ) { - sSecStr.stripEnd((sal_Unicode)'0'); + sSecStr.stripEnd('0'); for(sal_Int32 index = sSecStr.getLength(); index < rInfo.nCntPost; ++index) { - sSecStr.append((sal_Unicode)'0'); + sSecStr.append('0'); } impTransliterate(sSecStr, NumFor[nIx].GetNatNum()); nCntPost = sSecStr.getLength(); @@ -4038,11 +4038,11 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, case NF_KEY_AP: // A/P if (cAmPm == 'a') { - sBuff.append((sal_Unicode)'a'); + sBuff.append('a'); } else { - sBuff.append((sal_Unicode)'p'); + sBuff.append('p'); } break; case NF_KEY_MI: // M @@ -4144,7 +4144,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, // can be distinguished from 2 digits display and edited // without suddenly being hit by the 2-digit year magic. OUStringBuffer aBuf; - padToLength(aBuf, 4 - aYear.getLength(), sal_Unicode('0')); + padToLength(aBuf, 4 - aYear.getLength(), '0'); impTransliterate(aBuf, NumFor[nIx].GetNatNum()); aBuf.append(aYear); sBuff.append(aBuf); @@ -4274,14 +4274,14 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, 15-nPrecExp, '.'); for (long l = 15-nPrecExp; l < (long) rInfo.nCntPost; l++) { - sStr.append((sal_Unicode)'0'); + sStr.append('0'); } } else { sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, rInfo.nCntPost, '.' ); } - sStr.stripStart((sal_Unicode)'0'); // Strip leading zeros + sStr.stripStart('0'); // Strip leading zeros } else if (fNumber == 0.0) // Null { @@ -4291,9 +4291,9 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, else // Integer { sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, 0, '.'); - sStr.stripStart((sal_Unicode)'0'); // Strip leading zeros + sStr.stripStart('0'); // Strip leading zeros } - sal_Int32 nPoint = sStr.indexOf((sal_Unicode)'.' ); + sal_Int32 nPoint = sStr.indexOf('.' ); if ( nPoint >= 0) { const sal_Unicode* p = sStr.getStr() + nPoint; @@ -4357,7 +4357,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, { const sal_Unicode c = *p; k--; - if ( sStr[k] != (sal_Unicode)'0' ) + if ( sStr[k] != '0' ) { bTrailing = false; } @@ -4371,13 +4371,13 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, { if ( bInteger ) { - sStr[ k ] = (sal_Unicode)'-'; + sStr[ k ] = '-'; } bFilled = true; } else if ( c == '?' ) { - sStr[ k ] = (sal_Unicode)' '; + sStr[ k ] = ' '; bFilled = true; } else if ( !bFilled ) // # @@ -4395,7 +4395,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, { OUStringBuffer sNum; ImpGetOutputStandard(fNumber, sNum); - sNum.stripStart((sal_Unicode)'-'); + sNum.stripStart('-'); sStr.insert(k, sNum.makeStringAndClear()); break; } @@ -4419,7 +4419,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, } if (bSign) { - sStr.insert(0, (sal_Unicode)'-'); + sStr.insert(0, '-'); } impTransliterate(sStr, NumFor[nIx].GetNatNum()); return bRes; @@ -4525,7 +4525,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb // a literal ',' character instead that is // inserted unconditionally. Should be changed // on some occasion. - sBuff.insert(k, (sal_Unicode)' '); + sBuff.insert(k, ' '); break; default: sBuff.insert(k, rInfo.sStrArray[j]); @@ -4551,10 +4551,10 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb switch (*p) { case '0': - sBuff.insert(0, (sal_Unicode)'0'); + sBuff.insert(0, '0'); break; case '?': - sBuff.insert(0, (sal_Unicode)' '); + sBuff.insert(0, ' '); break; } } @@ -4573,7 +4573,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb { OUStringBuffer sNum; ImpGetOutputStandard(rNumber, sNum); - sNum.stripStart((sal_Unicode)'-'); + sNum.stripStart('-'); sBuff.insert(k, sNum.makeStringAndClear()); break; } @@ -4681,10 +4681,10 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& sBuff, // number string switch (*p) { case '0': - sBuff.insert(0, (sal_Unicode)'0'); + sBuff.insert(0, '0'); break; case '?': - sBuff.insert(0, (sal_Unicode)' '); + sBuff.insert(0, ' '); break; } } @@ -4698,7 +4698,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& sBuff, // number string { OUStringBuffer sNum; ImpGetOutputStandard(rNumber, sNum); - sNum.stripStart((sal_Unicode)'-'); + sNum.stripStart('-'); sBuff.insert(k, sNum.makeStringAndClear()); } break; @@ -5254,7 +5254,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords, } for ( ; nSub<4 && bDefault[nSub]; ++nSub ) { // append empty subformats - aStr.append( (sal_Unicode)';' ); + aStr.append( ';' ); } return aStr.makeStringAndClear(); } @@ -5292,7 +5292,7 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum, OUStringBuffer aBuf; for(sal_Int32 index = 0; index < nMinDigits - aValStr.getLength(); ++index) { - aBuf.append((sal_Unicode)'0'); + aBuf.append('0'); } aBuf.append(aValStr); aStr = aBuf.makeStringAndClear(); @@ -5362,23 +5362,23 @@ bool SvNumberformat::HasStringNegativeSign( const OUString& rStr ) const sal_Unicode* p = pBeg; do { // Start - if ( *p == (sal_Unicode)'-' ) + if ( *p == '-' ) { return true; } } - while ( *p == (sal_Unicode)' ' && ++p < pEnd ); + while ( *p == ' ' && ++p < pEnd ); p = pEnd - 1; do { // End - if ( *p == (sal_Unicode)'-' ) + if ( *p == '-' ) { return true; } } - while ( *p == (sal_Unicode)' ' && pBeg < --p ); + while ( *p == ' ' && pBeg < --p ); return false; } diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 8d47e2b27079..c59e296c43a6 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -131,7 +131,7 @@ static vector< OUString > getInfoFromInd( OUString aInd ) static sal_Bool shorterUrl( OUString& aURL ) { - sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); + sal_Int32 aInd = aURL.lastIndexOf( '/' ); if( aInd > 0 && aURL.indexOf( "://" ) != aInd-2 ) { aURL = aURL.copy( 0, aInd ); @@ -911,8 +911,7 @@ void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& a if( aIter == m_aContainer.end() ) { - sal_Int32 aInd = aUrl.lastIndexOf( sal_Unicode( '/' ) ); - if( aInd > 0 && aUrl.getLength()-1 == aInd ) + if( aUrl.endsWith("/") ) aUrl = aUrl.copy( 0, aUrl.getLength() - 1 ); else aUrl += "/"; @@ -952,8 +951,7 @@ void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const O if( aIter == m_aContainer.end() ) { - sal_Int32 aInd = aUrl.lastIndexOf( sal_Unicode( '/' ) ); - if( aInd > 0 && aUrl.getLength()-1 == aInd ) + if( aUrl.endsWith("/") ) aUrl = aUrl.copy( 0, aUrl.getLength() - 1 ); else aUrl += "/"; diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 5bd60dcf8537..b727cc4cfd19 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -104,11 +104,11 @@ namespace // TODO: This code is actually copied from svl/source/passwordcontainer.cxx bool removeLastSegment( OUString & aURL ) { - sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); + sal_Int32 aInd = aURL.lastIndexOf( '/' ); if( aInd > 0 ) { - sal_Int32 aPrevInd = aURL.lastIndexOf( sal_Unicode( '/' ), aInd ); + sal_Int32 aPrevInd = aURL.lastIndexOf( '/', aInd ); if ( aURL.indexOf( "://" ) != aPrevInd - 2 || aInd != aURL.getLength() - 1 ) { diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 4beba6c25833..6f25107d621d 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -211,7 +211,7 @@ void SvSimpleTable::Paint( const Rectangle& rRect ) void SvSimpleTable::InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol, HeaderBarItemBits nBits) { - sal_Int32 nEnd = rText.indexOf( sal_Unicode( '\t' ) ); + sal_Int32 nEnd = rText.indexOf( '\t' ); if( nEnd == -1 ) { aHeaderBar.InsertItem(nHeaderItemId++, rText, 0, nBits, nCol); diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 56173663b68c..7cd89ed42f92 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -684,7 +684,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, pPrefix->m_pTranslatedPrefix : pPrefix->m_pPrefix)); aSynAbsURIRef.append(sTemp); - m_aScheme = SubString( 0, sTemp.indexOf(static_cast< sal_Unicode >(':')) ); + m_aScheme = SubString( 0, sTemp.indexOf(':') ); } else { @@ -825,7 +825,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, aSynScheme = OUString::createFromAscii(getSchemeInfo().m_pScheme); } m_aScheme.set(aSynAbsURIRef, aSynScheme, aSynAbsURIRef.getLength()); - aSynAbsURIRef.append(sal_Unicode(':')); + aSynAbsURIRef.append(':'); } sal_Char cEscapePrefix = getEscapePrefix(); @@ -1272,7 +1272,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, { if (bSupportsPassword) { - aSynAbsURIRef.append(sal_Unicode(':')); + aSynAbsURIRef.append(':'); OUStringBuffer aSynAuth; while (p1 < pUserInfoEnd) { @@ -1311,7 +1311,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, } } if (pHostPortBegin) - aSynAbsURIRef.append(sal_Unicode('@')); + aSynAbsURIRef.append('@'); } if (pHostPortBegin) @@ -1365,7 +1365,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, aSynAbsURIRef.getLength()); if (pPort != pHostPortEnd) { - aSynAbsURIRef.append(sal_Unicode(':')); + aSynAbsURIRef.append(':'); m_aPort.set(aSynAbsURIRef, OUString(pPort + 1, pHostPortEnd - (pPort + 1)), aSynAbsURIRef.getLength()); @@ -1390,7 +1390,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, // Parse ?<query> if (getSchemeInfo().m_bQuery && pPos < pEnd && *pPos == '?') { - aSynAbsURIRef.append(sal_Unicode('?')); + aSynAbsURIRef.append('?'); OUStringBuffer aSynQuery; for (++pPos; pPos < pEnd && *pPos != nFragmentDelimiter;) { diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index 992c111748b0..65a13c1dc9a7 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -712,7 +712,7 @@ bool StringRangeEnumerator::setRange( const OUString& i_rNewRange, bool i_bStric bool bSequence = false; while( *pInput ) { - while( *pInput >= sal_Unicode('0') && *pInput <= sal_Unicode('9') ) + while( *pInput >= '0' && *pInput <= '9' ) aNumberBuf.append( *pInput++ ); if( !aNumberBuf.isEmpty() ) { @@ -721,13 +721,13 @@ bool StringRangeEnumerator::setRange( const OUString& i_rNewRange, bool i_bStric bSequence = false; } - if( *pInput == sal_Unicode('-') ) + if( *pInput == '-' ) { bSequence = true; if( aNumbers.empty() ) aNumbers.push_back( mnMin ); } - else if( *pInput == sal_Unicode(',') || *pInput == sal_Unicode(';') ) + else if( *pInput == ',' || *pInput == ';' ) { if( bSequence && !aNumbers.empty() ) aNumbers.push_back( mnMax ); @@ -737,7 +737,7 @@ bool StringRangeEnumerator::setRange( const OUString& i_rNewRange, bool i_bStric aNumbers.clear(); bSequence = false; } - else if( *pInput && *pInput != sal_Unicode(' ') ) + else if( *pInput && *pInput != ' ' ) return false; // parse error if( *pInput ) diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 55a8e7bbfed9..be3f570a3304 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -427,7 +427,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const OUString & rHost, OUStringBuffer aBuffer; if ( ( rHost.indexOf( ':' ) != -1 ) && - ( rHost[ 0 ] != sal_Unicode( '[' ) ) ) + ( rHost[ 0 ] != '[' ) ) { // host is given as numeric IPv6 address aBuffer.appendAscii( "[" ); @@ -440,7 +440,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const OUString & rHost, aBuffer.append( rHost ); } - aBuffer.append( sal_Unicode( ':' ) ); + aBuffer.append( ':' ); aBuffer.append( OUString::number( nPort ) ); const OUString aHostAndPort( aBuffer.makeStringAndClear() ); @@ -496,7 +496,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( OUString aHost; - if ( ( rHost[ 0 ] == sal_Unicode( '[' ) ) && + if ( ( rHost[ 0 ] == '[' ) && ( rHost.getLength() > 1 ) ) { // host is given as numeric IPv6 address. name resolution diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index 28337b95219a..2949f6473eeb 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -377,11 +377,9 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet( { OUString aOldKeyWithSlash = rOldKey; OUString aOldKeyWithoutSlash; - if ( aOldKeyWithSlash.lastIndexOf( - sal_Unicode('/') - != aOldKeyWithSlash.getLength() - 1 ) ) + if ( !aOldKeyWithSlash.endsWith("/") ) { - aOldKeyWithSlash += OUString( sal_Unicode('/') ); + aOldKeyWithSlash += OUString( '/' ); aOldKeyWithoutSlash = rOldKey; } else if ( !rOldKey.isEmpty() ) @@ -464,11 +462,9 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet( { OUString aSrcKeyWithSlash = rSourceKey; OUString aSrcKeyWithoutSlash; - if ( aSrcKeyWithSlash.lastIndexOf( - sal_Unicode('/') - != aSrcKeyWithSlash.getLength() - 1 ) ) + if ( !aSrcKeyWithSlash.endsWith("/") ) { - aSrcKeyWithSlash += OUString( sal_Unicode('/') ); + aSrcKeyWithSlash += OUString( '/' ); aSrcKeyWithoutSlash = rSourceKey; } else if ( !rSourceKey.isEmpty() ) @@ -603,11 +599,9 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet( { OUString aKeyWithSlash = rKey; OUString aKeyWithoutSlash; - if ( aKeyWithSlash.lastIndexOf( - sal_Unicode('/') - != aKeyWithSlash.getLength() - 1 ) ) + if ( !aKeyWithSlash.endsWith("/") ) { - aKeyWithSlash += OUString( (sal_Unicode)'/' ); + aKeyWithSlash += OUString( '/' ); aKeyWithoutSlash = rKey; } else if ( !rKey.isEmpty() ) diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx index 7ff97d403f60..5dabd7f57e44 100644 --- a/unotools/source/config/configpaths.cxx +++ b/unotools/source/config/configpaths.cxx @@ -83,14 +83,14 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, sal_Int32 nPos = _sInPath.getLength()-1; // strip trailing slash - if (nPos > 0 && _sInPath[ nPos ] == sal_Unicode('/')) + if (nPos > 0 && _sInPath[ nPos ] == '/') { OSL_FAIL("Invalid config path: trailing '/' is not allowed"); --nPos; } // check for predicate ['xxx'] or ["yyy"] - if (nPos > 0 && _sInPath[ nPos ] == sal_Unicode(']')) + if (nPos > 0 && _sInPath[ nPos ] == ']') { sal_Unicode chQuote = _sInPath[--nPos]; diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index a2859339d705..ba04027ead45 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -919,7 +919,7 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen // count tokens while( nLength-- ) { - if( *pStr++ == sal_Unicode(';') ) + if( *pStr++ == ';' ) nTokens++; } rSubstVector.clear(); diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index f266b4d637da..806d58e1eb03 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -692,7 +692,7 @@ OUString SvtSysLocaleOptions::CreateCurrencyConfigString( { OUStringBuffer aStr( rAbbrev.getLength() + 1 + aIsoStr.getLength() ); aStr.append( rAbbrev ); - aStr.append( sal_Unicode('-') ); + aStr.append( '-' ); aStr.append( aIsoStr ); return aStr.makeStringAndClear(); } diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index cb6b6e1ac486..4c3f6df9fb4e 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -40,10 +40,10 @@ namespace sal_Int32 nLen = rString.getLength(); // skip white space - while( nPos < nLen && sal_Unicode(' ') == rString[nPos] ) + while( nPos < nLen && ' ' == rString[nPos] ) nPos++; - if( nPos < nLen && sal_Unicode('-') == rString[nPos] ) + if( nPos < nLen && '-' == rString[nPos] ) { bNeg = sal_True; nPos++; @@ -51,8 +51,8 @@ namespace // get number while( nPos < nLen && - sal_Unicode('0') <= rString[nPos] && - sal_Unicode('9') >= rString[nPos] ) + '0' <= rString[nPos] && + '9' >= rString[nPos] ) { // TODO: check overflow! rValue *= 10; @@ -257,7 +257,7 @@ bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime rtl::OUString aDateStr, aTimeStr; starutil::Date aDate; starutil::Time aTime; - sal_Int32 nPos = rString.indexOf( (sal_Unicode) 'T' ); + sal_Int32 nPos = rString.indexOf( 'T' ); if ( nPos >= 0 ) { aDateStr = rString.copy( 0, nPos ); diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 86438df125c6..17dafaa2f114 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -61,7 +61,7 @@ struct TempFile_Impl OUString getParentName( const OUString& aFileName ) { - sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') ); + sal_Int32 lastIndex = aFileName.lastIndexOf( '/' ); OUString aParent = aFileName.copy( 0, lastIndex ); if( aParent.endsWith(":") && aParent.getLength() == 6 ) diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index e41420a2e7a9..06774446792b 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -76,14 +76,14 @@ namespace DOM OUString prefix = pNode->getPrefix(); OUString name = (prefix.isEmpty()) ? pNode->getLocalName() - : prefix + OUString(static_cast<sal_Unicode>(':')) + pNode->getLocalName(); + : prefix + OUString(':') + pNode->getLocalName(); OUString val = pNode->getNodeValue(); pAttrs->AddAttribute(name, type, val); } OUString prefix = getPrefix(); OUString name = (prefix.isEmpty()) ? getLocalName() - : prefix + OUString(static_cast<sal_Unicode>(':')) + getLocalName(); + : prefix + OUString(':') + getLocalName(); Reference< XAttributeList > xAttrList(pAttrs); i_xHandler->startElement(name, xAttrList); // recurse @@ -503,7 +503,7 @@ namespace DOM if (!oldAttr->getNamespaceURI().isEmpty()) { OUStringBuffer qname(oldAttr->getPrefix()); if (!qname.isEmpty()) { - qname.append(sal_Unicode(':')); + qname.append(':'); } qname.append(oldAttr->getName()); aAttr = GetOwnerDocument().createAttributeNS( diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index b17748fc5faa..a23c3bd41cef 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -66,7 +66,7 @@ getContentPart( const OUString& _rRawString ) if ( nContStart != -1 ) { nContStart += sPartId.getLength(); - sal_Int32 nContEnd = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); + sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart ); if ( nContEnd != -1 ) sPart = _rRawString.copy( nContStart, nContEnd - nContStart ); else diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 1f3cd13b35b3..e36101bc0e5a 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -51,7 +51,7 @@ namespace nContStart = nContStart + _rPartId.getLength(); ++nContStart; // now it's start of content, directly after Id - sal_Int32 nContEnd = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); + sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart ); if ( nContEnd != -1 ) s = _rRawString.copy( nContStart, nContEnd - nContStart ); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index a95859c781ae..4725c66b3952 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -234,7 +234,7 @@ sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css getPropertyValue( aProps, ITEM_DESCRIPTOR_LABEL ) >>= sLabel; // handle the hotkey marker '~' (remove in toolbars (?), replace by '&' in menus) OUStringBuffer aBuffer; - sal_Int32 index = sLabel.indexOf( sal_Unicode('~') ); + sal_Int32 index = sLabel.indexOf( '~' ); if( index < 0 ) { aBuffer = sLabel; @@ -243,7 +243,7 @@ sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css { aBuffer.append( sLabel.copy( 0, index ) ); if( bMenu ) - aBuffer.append( sal_Unicode( '&' ) ); + aBuffer.append( '&' ); aBuffer.append( sLabel.copy( index + 1 ) ); } OUString sNewLabel = aBuffer.makeStringAndClear(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 4450a0b4840b..2bbff8193bd5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2127,7 +2127,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::FindOrCreateFieldMaster OUString sFieldMasterService( OUString::createFromAscii(pFieldMasterService) ); OUStringBuffer aFieldMasterName; aFieldMasterName.appendAscii( pFieldMasterService ); - aFieldMasterName.append(sal_Unicode('.')); + aFieldMasterName.append('.'); aFieldMasterName.append(rFieldMasterName); OUString sFieldMasterName = aFieldMasterName.makeStringAndClear(); if(xFieldMasterAccess->hasByName(sFieldMasterName)) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 25353391b273..6169f91ae31e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3947,7 +3947,7 @@ int RTFDocumentImpl::popState() if (std::find(aState.aLevelNumbers.begin(), aState.aLevelNumbers.end(), i+1) != aState.aLevelNumbers.end()) { - aBuf.append(sal_Unicode('%')); + aBuf.append('%'); // '1.1.1' -> '%1.%2.%3', but '1.' (with '2.' prefix omitted) is %2. aBuf.append(sal_Int32(nReplaces++ + aState.nListLevelNum + 1 - aState.aLevelNumbers.size())); } diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index d85e674eb54c..fb16e663e520 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -320,8 +320,8 @@ void Databases::replaceName( OUString& oustring ) const while( true ) { ++idx; - idx1 = oustring.indexOf( sal_Unicode('%'),idx); - idx2 = oustring.indexOf( sal_Unicode('$'),idx); + idx1 = oustring.indexOf( '%', idx); + idx2 = oustring.indexOf( '$', idx); if(idx1 == -1 && idx2 == -1) break; @@ -408,7 +408,7 @@ const std::vector< OUString >& Databases::getModuleList( const OUString& Languag fileName = aStatus.getFileName(); // Check, whether fileName is of the form *.cfg - idx = fileName.lastIndexOf( sal_Unicode( '.' ) ); + idx = fileName.lastIndexOf( '.' ); if( idx == -1 ) continue; @@ -469,7 +469,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin for( sal_Int32 i = 0;i < fileContent.getLength();i++ ) { sal_Unicode ch = str[ i ]; - if( ch == sal_Unicode( '\n' ) || ch == sal_Unicode( '\r' ) ) + if( ch == '\n' || ch == '\r' ) { if( pos ) { @@ -477,7 +477,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin if( current.startsWith("Title") ) { - title = current.copy( current.indexOf(sal_Unicode( '=' ) ) + 1 ); + title = current.copy( current.indexOf( '=' ) + 1 ); } else if( current.startsWith("Start") ) { @@ -679,10 +679,10 @@ namespace chelp { if( m_xCollator.is() ) { - sal_Int32 l1 = l.indexOf( sal_Unicode( ';' ) ); + sal_Int32 l1 = l.indexOf( ';' ); sal_Int32 l3 = ( l1 == -1 ? l.getLength() : l1 ); - sal_Int32 r1 = r.indexOf( sal_Unicode( ';' ) ); + sal_Int32 r1 = r.indexOf( ';' ); sal_Int32 r3 = ( r1 == -1 ? r.getLength() : r1 ); sal_Int32 c1 = m_xCollator->compareSubstring( l,0,l3,r,0,r3 ); @@ -726,7 +726,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: int idx = -1,k; while( ( idx = ids.indexOf( ';',k = ++idx ) ) != -1 ) { - int h = ids.indexOf( sal_Unicode( '#' ),k ); + int h = ids.indexOf( '#', k ); if( h < idx ) { // found an anchor @@ -792,18 +792,18 @@ bool Databases::checkModuleMatchForExtension bool bFoundAtLeastOneModule = false; bool bModuleMatch = false; sal_Int32 nLen = doclist.getLength(); - sal_Int32 nLastFound = doclist.lastIndexOf( sal_Unicode(';') ); + sal_Int32 nLastFound = doclist.lastIndexOf( ';' ); if( nLastFound == -1 ) nLastFound = nLen; const sal_Unicode* pStr = doclist.getStr(); - sal_Int32 nFound = doclist.lastIndexOf( sal_Unicode('_') ); + sal_Int32 nFound = doclist.lastIndexOf( '_' ); while( nFound != -1 ) { // Simple optimization, stop if '_' is followed by "id" if( nLen - nFound > 2 ) { - if( pStr[ nFound + 1 ] == sal_Unicode('i') && - pStr[ nFound + 2 ] == sal_Unicode('d') ) + if( pStr[ nFound + 1 ] == 'i' && + pStr[ nFound + 2 ] == 'd' ) break; } @@ -822,7 +822,7 @@ bool Databases::checkModuleMatchForExtension nLastFound = nFound; if( nLastFound == 0 ) break; - nFound = doclist.lastIndexOf( sal_Unicode('_'), nLastFound - 1 ); + nFound = doclist.lastIndexOf( '_', nLastFound - 1 ); } if( bFoundAtLeastOneModule && !bModuleMatch ) @@ -929,8 +929,8 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const OUString& jar, try { // Extension jar file? Search for ? - sal_Int32 nQuestionMark1 = jar.indexOf( sal_Unicode('?') ); - sal_Int32 nQuestionMark2 = jar.lastIndexOf( sal_Unicode('?') ); + sal_Int32 nQuestionMark1 = jar.indexOf( '?' ); + sal_Int32 nQuestionMark2 = jar.lastIndexOf( '?' ); if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 ) { OUString aExtensionPath = jar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index e4cc68e2229d..e9b3f3e43d4a 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -102,7 +102,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte OUString query = m_aURLParameter.get_query(); while( !query.isEmpty() ) { - idx = query.indexOf( sal_Unicode( ' ' ) ); + idx = query.indexOf( ' ' ); if( idx == -1 ) idx = query.getLength(); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 5130efdbf2c2..99447df2b05e 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -497,7 +497,7 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio { m_aExpr = m_aURL; - sal_Int32 lstIdx = m_aExpr.lastIndexOf( sal_Unicode( '#' ) ); + sal_Int32 lstIdx = m_aExpr.lastIndexOf( '#' ); if( lstIdx != -1 ) m_aExpr = m_aExpr.copy( 0,lstIdx ); @@ -567,7 +567,7 @@ bool URLParameter::name( bool modulePresent ) sal_Int32 length = m_aExpr.getLength(); - if( length != 0 && (m_aExpr.getStr())[0] == sal_Unicode( '/' ) ) + if( length != 0 && (m_aExpr.getStr())[0] == '/' ) { sal_Int32 idx = 1; while( idx < length && (m_aExpr.getStr())[idx] != '?' ) @@ -592,7 +592,7 @@ bool URLParameter::query() if( m_aExpr.isEmpty() ) return true; - else if( (m_aExpr.getStr())[0] == sal_Unicode( '?' ) ) + else if( (m_aExpr.getStr())[0] == '?' ) query_ = m_aExpr.copy( 1 ).trim(); else return false; @@ -604,8 +604,8 @@ bool URLParameter::query() while( !query_.isEmpty() ) { - delimIdx = query_.indexOf( sal_Unicode( '&' ) ); - equalIdx = query_.indexOf( sal_Unicode( '=' ) ); + delimIdx = query_.indexOf( '&' ); + equalIdx = query_.indexOf( '=' ); parameter = query_.copy( 0,equalIdx ).trim(); if( delimIdx == -1 ) { @@ -928,8 +928,8 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, bool bAddExtensionPath = false; OUString aExtensionRegistryPath; - sal_Int32 nQuestionMark1 = aJar.indexOf( sal_Unicode('?') ); - sal_Int32 nQuestionMark2 = aJar.lastIndexOf( sal_Unicode('?') ); + sal_Int32 nQuestionMark1 = aJar.indexOf( '?' ); + sal_Int32 nQuestionMark2 = aJar.lastIndexOf( '?' ); if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 ) { aExtensionPath = aJar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 ); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 1ae39bbe1e92..3e1df8327f87 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -192,7 +192,7 @@ void SAL_CALL ConfigData::replaceName( OUString& oustring ) const bool cap = false; OUStringBuffer aStrBuf( 0 ); - while( ( idx = oustring.indexOf( sal_Unicode('%'),++idx ) ) != -1 ) + while( ( idx = oustring.indexOf( '%', ++idx ) ) != -1 ) { if( oustring.indexOf( prodName,idx ) == idx ) off = PRODUCTNAME; @@ -358,7 +358,7 @@ TVRead::getByHierarchicalName( const OUString& aName ) sal_Int32 idx; OUString name( aName ); - if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 && + if( ( idx = name.indexOf( '/' ) ) != -1 && name.copy( 0,idx ).equalsAscii( "Children" ) ) return Children->getByHierarchicalName( name.copy( 1 + idx ) ); @@ -372,7 +372,7 @@ TVRead::hasByHierarchicalName( const OUString& aName ) sal_Int32 idx; OUString name( aName ); - if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 && + if( ( idx = name.indexOf( '/' ) ) != -1 && name.copy( 0,idx ).equalsAscii( "Children" ) ) return Children->hasByHierarchicalName( name.copy( 1 + idx ) ); @@ -619,7 +619,7 @@ TVChildTarget::getByHierarchicalName( const OUString& aName ) sal_Int32 idx; OUString name( aName ); - if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 ) + if( ( idx = name.indexOf( '/' ) ) != -1 ) { OUString num( name.getStr()+2,idx-4 ); sal_Int32 pref = num.toInt32() - 1; @@ -640,7 +640,7 @@ TVChildTarget::hasByHierarchicalName( const OUString& aName ) sal_Int32 idx; OUString name( aName ); - if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 ) + if( ( idx = name.indexOf( '/' ) ) != -1 ) { OUString num( name.getStr()+2,idx-4 ); sal_Int32 pref = num.toInt32() - 1; @@ -717,7 +717,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) OUString url; osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url ); if( errFile != osl::FileBase::E_None ) return configData; - if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 ) + if( !url.endsWith("/") ) url += "/"; OUString ret; sal_Int32 idx; @@ -762,7 +762,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) { aFileUrl = aFileStatus.getFileURL(); aFileName = aFileStatus.getFileName(); - idx_ = aFileName.lastIndexOf( sal_Unicode( '.' ) ); + idx_ = aFileName.lastIndexOf( '.' ); if( idx_ == -1 ) continue; |