Kaydet (Commit) d366c9b2 authored tarafından Noel Grandin's avatar Noel Grandin

remove unnecessary sal_Unicode casts in various places

Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
üst d2fa59e4
......@@ -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);
......
......@@ -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 );
......
......@@ -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());
}
......
......@@ -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( ' ' );
}
}
......
......@@ -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
......
......@@ -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--;
}
......
......@@ -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();
}
......
......@@ -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();
......
......@@ -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();
}
......
......@@ -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 )
{
......
......@@ -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 );
......
......@@ -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" );
......
......@@ -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 );
}
......
......@@ -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();
......
......@@ -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);
......
......@@ -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(
......
......@@ -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_));
......
......@@ -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) {
......
......@@ -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 " );
}
......
......@@ -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:
......
......@@ -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");
......
......@@ -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 );
......
......@@ -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:
......
......@@ -222,7 +222,7 @@ void SvxBulletItem::SetDefaults_Impl()
nStart = 1;
nStyle = BS_123;
nJustify = BJ_HLEFT | BJ_VCENTER;
cSymbol = sal_Unicode(' ');
cSymbol = ' ';
nScale = 75;
}
......
......@@ -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));
......
......@@ -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()
......
......@@ -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 ));
......
......@@ -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;
}
......
......@@ -36,13 +36,13 @@ LatinTreeNode::~LatinTreeNode()
bool LatinTreeNode::isSeparatedlyHandled(const sal_Unicode cKey) const
{
return ( cKey >= sal_Unicode