diff options
| -rw-r--r-- | svtools/source/control/vclxaccessibleheaderbar.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/provider.cxx | 15 | ||||
| -rw-r--r-- | svtools/source/java/javacontext.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/uno/addrtempuno.cxx | 6 |
5 files changed, 14 insertions, 17 deletions
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 94415b4f1420..19a1e55540a8 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -85,7 +85,7 @@ void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHel ::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() throw (RuntimeException, std::exception) { - return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleHeaderBar" ); + return OUString( "com.sun.star.comp.toolkit.AccessibleHeaderBar" ); } @@ -93,7 +93,7 @@ void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHel Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleHeaderBar" ); + aNames[0] = "com.sun.star.awt.AccessibleHeaderBar"; return aNames; } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 25735e843387..f5a4292a3afd 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -126,7 +126,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; - if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:memorygraphic" ) ) + if( rResourceURL.getToken( 0, '/', nIndex ) == "private:memorygraphic" ) { sal_Int64 nGraphicAddress = rResourceURL.getToken( 0, '/', nIndex ).toInt64(); @@ -149,7 +149,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; - if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:graphicrepository" ) ) + if( rResourceURL.getToken( 0, '/', nIndex ) == "private:graphicrepository" ) { OUString sPathName( rResourceURL.copy( nIndex ) ); BitmapEx aBitmap; @@ -170,7 +170,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; - if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:standardimage" ) ) + if( rResourceURL.getToken( 0, '/', nIndex ) == "private:standardimage" ) { OUString sImageName( rResourceURL.copy( nIndex ) ); if ( sImageName == "info" ) @@ -234,7 +234,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; - if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:resource" ) ) + if( rResourceURL.getToken( 0, '/', nIndex ) == "private:resource" ) { OString aResMgrName(OUStringToOString( rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US)); @@ -250,8 +250,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O { BitmapEx aBmpEx; - if( aResourceType.equalsAscii( "bitmap" ) || - aResourceType.equalsAscii( "bitmapex" ) ) + if( aResourceType == "bitmap" || aResourceType == "bitmapex" ) { aResId.SetRT( RSC_BITMAP ); @@ -260,7 +259,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O aBmpEx = BitmapEx( aResId ); } } - else if( aResourceType.equalsAscii( "image" ) ) + else if( aResourceType == "image" ) { aResId.SetRT( RSC_IMAGE ); @@ -270,7 +269,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O aBmpEx = aImage.GetBitmapEx(); } } - else if( aResourceType.equalsAscii( "imagelist" ) ) + else if( aResourceType == "imagelist" ) { aResId.SetRT( RSC_IMAGELIST ); diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index 66c85d56edb1..759570d3f3bd 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -65,7 +65,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeEx { Any retVal; - if ( Name.equalsAscii( JAVA_INTERACTION_HANDLER_NAME )) + if ( Name == JAVA_INTERACTION_HANDLER_NAME ) { { osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex()); diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 4d4da1d50610..14d5c741c57e 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1167,9 +1167,7 @@ int HTMLParser::_GetNextToken() nCLineNr = GetLineNr(); nCLinePos = GetLinePos(); } - bDone = aToken.getLength() >= 2 && - aToken.copy(aToken.getLength()-2,2). - equalsAscii( "--" ); + bDone = aToken.endsWith( "--" ); if( !bDone ) aToken += OUString(nNextCh); } diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 3c9772945e02..f1a0760bb292 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -177,7 +177,7 @@ namespace { PropertyValue aVal; if (_rValue >>= aVal) { - if (aVal.Name.equalsAscii("DataSource")) + if (aVal.Name == "DataSource") { #if OSL_DEBUG_LEVEL > 0 bool bSuccess = @@ -187,7 +187,7 @@ namespace { return; } - if (aVal.Name.equalsAscii("DataSourceName")) + if (aVal.Name == "DataSourceName") { #if OSL_DEBUG_LEVEL > 0 bool bSuccess = @@ -197,7 +197,7 @@ namespace { return; } - if (aVal.Name.equalsAscii("Command")) + if (aVal.Name == "Command") { #if OSL_DEBUG_LEVEL > 0 bool bSuccess = |