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

convert OUString::match to OUString::endsWith

Convert code like:
    rTxt.match( "---", rTxt.getLength()-3 )
to:
   rTxt.endsWith( "---" )

Change-Id: Iada74c5e714f7234f25b326526843a36255d5599
üst e80b9f34
......@@ -1767,7 +1767,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const OUString& rClass )
// match interface name with passed class name
OSL_TRACE("Checking if object implements %s", OUStringToOString( aClassName, RTL_TEXTENCODING_UTF8 ).getStr() );
if ( (aClassName.getLength() <= aInterfaceName.getLength()) &&
aInterfaceName.matchIgnoreAsciiCase( aClassName, aInterfaceName.getLength() - aClassName.getLength() ) )
aInterfaceName.endsWithIgnoreAsciiCase( aClassName ) )
{
result = true;
break;
......
......@@ -1322,8 +1322,7 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
// since LibO 4.1, '-' is a word separator
// fdo#67742 avoid "--" to be replaced by "–" if next is "-"
if( rTxt.getLength() >= 3 &&
rTxt.match( OUString("---"), rTxt.getLength()-3 ) )
if( rTxt.endsWith( "---" ) )
break;
bool bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos,
*this, pPara );
......
......@@ -598,7 +598,7 @@ namespace pcr
case TypeClass_STRING:
{
// some special handling for URL properties
bool bIsURLProperty = ( _rPropertyName.getLength() >= 3 ) && _rPropertyName.matchAsciiL( "URL", 3, _rPropertyName.getLength() - 3 );
bool bIsURLProperty = _rPropertyName.endsWithAsciiL( "URL", 3 );
if ( bIsURLProperty )
{
aDescriptor.Control = _rxControlFactory->createPropertyControl(
......
......@@ -54,9 +54,7 @@ OUString makeMacroURL( const OUString& sMacroName )
OUString extractMacroName( const OUString& rMacroUrl )
{
if( (rMacroUrl.getLength() > sUrlPart0.getLength() + sUrlPart1.getLength()) &&
rMacroUrl.match( sUrlPart0 ) &&
rMacroUrl.match( sUrlPart1, rMacroUrl.getLength() - sUrlPart1.getLength() ) )
if( rMacroUrl.startsWith( sUrlPart0 ) && rMacroUrl.endsWith( sUrlPart1 ) )
{
return rMacroUrl.copy( sUrlPart0.getLength(),
rMacroUrl.getLength() - sUrlPart0.getLength() - sUrlPart1.getLength() );
......
......@@ -355,7 +355,7 @@ void InputStream::updateBuffer() throw (IOException, RuntimeException)
if( aElement.match( maOpeningCData ) )
{
// search the end tag ']]>'
while( ((aElement.getLength() < maClosingCData.getLength()) || !aElement.match( maClosingCData, aElement.getLength() - maClosingCData.getLength() )) && !mxTextStrm->isEOF() )
while( ((aElement.getLength() < maClosingCData.getLength()) || !aElement.endsWith( maClosingCData )) && !mxTextStrm->isEOF() )
aElement += readToElementEnd();
// copy the entire CDATA part
aBuffer.append( aElement );
......
......@@ -704,8 +704,8 @@ OUString XclTools::GetXclMacroName( const OUString& rSbMacroUrl )
{
sal_Int32 nSbMacroUrlLen = rSbMacroUrl.getLength();
sal_Int32 nMacroNameLen = nSbMacroUrlLen - maSbMacroPrefix.getLength() - maSbMacroSuffix.getLength();
if( (nMacroNameLen > 0) && rSbMacroUrl.matchIgnoreAsciiCase( maSbMacroPrefix, 0 ) &&
rSbMacroUrl.matchIgnoreAsciiCase( maSbMacroSuffix, nSbMacroUrlLen - maSbMacroSuffix.getLength() ) )
if( (nMacroNameLen > 0) && rSbMacroUrl.startsWithIgnoreAsciiCase( maSbMacroPrefix ) &&
rSbMacroUrl.endsWithIgnoreAsciiCase( maSbMacroSuffix ) )
{
sal_Int32 nPrjDot = rSbMacroUrl.indexOf( '.', maSbMacroPrefix.getLength() ) + 1;
return rSbMacroUrl.copy( nPrjDot, nSbMacroUrlLen - nPrjDot - maSbMacroSuffix.getLength() );
......
......@@ -240,7 +240,7 @@ void ColorConfig_Impl::Load(const OUString& rScheme)
if(nIndex >= aColors.getLength())
break;
//test for visibility property
if(pColorNames[nIndex].match(m_sIsVisible, pColorNames[nIndex].getLength() - m_sIsVisible.getLength()))
if(pColorNames[nIndex].endsWith(m_sIsVisible))
m_aConfigValues[i / 2].bIsVisible = Any2Bool(pColors[nIndex++]);
}
// fdo#71511: check if we are running in a11y autodetect
......@@ -280,7 +280,7 @@ void ColorConfig_Impl::Commit()
if(nIndex >= aColorNames.getLength())
break;
//test for visibility property
if(pColorNames[nIndex].match(m_sIsVisible, pColorNames[nIndex].getLength() - m_sIsVisible.getLength()))
if(pColorNames[nIndex].endsWith(m_sIsVisible))
{
pPropValues[nIndex].Name = pColorNames[nIndex];
pPropValues[nIndex].Value.setValue(&m_aConfigValues[i/2].bIsVisible, rBoolType);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment