Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator

accessibility/source/extended/textwindowaccessibility.cxx

@@ -1248,15 +1248,13 @@ void Document::changeParagraphAttributes(
         // they do not replace the old attributes as required by
         // XAccessibleEditableText.setAttributes:
         for (::sal_Int32 i = 0; i < rAttributeSet.getLength(); ++i)
-            if (rAttributeSet[i].Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("CharColor")))
+            if ( rAttributeSet[i].Name == "CharColor" )
                 m_rEngine.SetAttrib(::TextAttribFontColor(
                                         mapFontColor(rAttributeSet[i].Value)),
                                     nNumber, static_cast< ::sal_uInt16 >(nBegin),
                                     static_cast< ::sal_uInt16 >(nEnd));
                     // XXX  numeric overflow (2x)
-            else if (rAttributeSet[i].Name.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM("CharWeight")))
+            else if ( rAttributeSet[i].Name == "CharWeight" )
                 m_rEngine.SetAttrib(::TextAttribFontWeight(
                                         mapFontWeight(rAttributeSet[i].Value)),
                                     nNumber, static_cast< ::sal_uInt16 >(nBegin),

basctl/source/basicide/baside3.cxx

@@ -838,8 +838,7 @@ sal_Bool DialogWindow::SaveDialog()
                             aExtension = aCompleteName.copy( iDot + 1 );
                         }
 
-                        if( aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "properties" ) ) ||
-                            aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "default" ) ) )
+                        if( aExtension == "properties" || aExtension == "default" )
                         {
                             if( aPureName.indexOf( aDialogName_ ) == 0 )
                             {

basctl/source/basicide/bastype2.cxx

@@ -760,8 +760,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
                     const beans::PropertyValue* pModuleDescr = aModuleDescr.getConstArray();
                     for ( sal_Int32 i = 0; i < nCount; ++i )
                     {
-                        if ( pModuleDescr[ i ].Name.equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryEmptyDocumentURL" ) ) )
+                        if ( pModuleDescr[ i ].Name == "ooSetupFactoryEmptyDocumentURL" )
                         {
                             pModuleDescr[ i ].Value >>= sFactoryURL;
                             break;

basic/source/basmgr/basmgr.cxx

@@ -758,7 +758,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
             {
                 Any aLibAny = xScriptCont->getByName( *pScriptLibName );
 
-                if ( pScriptLibName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Standard")) )
+                if ( *pScriptLibName == "Standard" )
                     xScriptCont->loadLibrary( *pScriptLibName );
 
                 BasMgrContainerListenerImpl::insertLibraryImpl

basic/source/uno/namecont.cxx

@@ -1220,7 +1220,7 @@ void SfxLibraryContainer::implScanExtensions( void )
     bool bPureDialogLib = false;
     while ( !(aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).isEmpty())
     {
-        if( bPureDialogLib && maInfoFileName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "script" ) ) )
+        if( bPureDialogLib && maInfoFileName == "script" )
             continue;
 
         // Extract lib name
@@ -1771,7 +1771,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     if ( bStorage )
     {
         // Don't write if only empty standard lib exists
-        if ( ( nNameCount == 1 ) && ( aNames[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) )
+        if ( ( nNameCount == 1 ) && ( aNames[0] == "Standard" ) )
         {
             Any aLibAny = maNameContainer.getByName( aNames[0] );
             Reference< XNameAccess > xNameAccess;

basic/source/uno/scriptcont.cxx

@@ -326,24 +326,20 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
 
         script::ModuleInfo aModInfo;
         aModInfo.ModuleType = ModuleType::UNKNOWN;
-        if( aMod.aModuleType.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("normal") ))
+        if( aMod.aModuleType == "normal" )
         {
             aModInfo.ModuleType = ModuleType::NORMAL;
         }
-        else if( aMod.aModuleType.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("class") ))
+        else if( aMod.aModuleType == "class" )
         {
             aModInfo.ModuleType = ModuleType::CLASS;
         }
-        else if( aMod.aModuleType.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("form") ))
+        else if( aMod.aModuleType == "form" )
         {
             aModInfo.ModuleType = ModuleType::FORM;
             aModInfo.ModuleObject = mxOwnerDocument;
         }
-        else if( aMod.aModuleType.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("document") ))
+        else if( aMod.aModuleType == "document" )
         {
             aModInfo.ModuleType = ModuleType::DOCUMENT;
 

binaryurp/source/bridge.cxx

@@ -744,8 +744,7 @@ void Bridge::handleCommitChangeRequest(
     assert(ok);
     (void) ok; // avoid warnings
     for (sal_Int32 i = 0; i != s.getLength(); ++i) {
-        if (s[i].Name.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("CurrentContext")))
+        if ( s[i].Name == "CurrentContext" )
         {
             ccMode = true;
         } else {

binaryurp/source/bridgefactory.cxx

@@ -142,8 +142,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
             throw css::bridge::BridgeExistsException(
                 sName, static_cast< cppu::OWeakObject * >(this));
         }
-        if (!(sProtocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("urp")) &&
-              aConnection.is()))
+        if ( sProtocol != "urp" || !aConnection.is() )
         {
             throw css::lang::IllegalArgumentException(
                 rtl::OUString(

binaryurp/source/writer.cxx

@@ -169,8 +169,7 @@ void Writer::execute() {
             if (item.request) {
                 sendRequest(
                     item.tid, item.oid, item.type, item.member, item.arguments,
-                    (!item.oid.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM("UrpProtocolProperties")) &&
+                    (item.oid != "UrpProtocolProperties" &&
                      !item.member.equals(
                          css::uno::TypeDescription(
                              rtl::OUString(

bridges/source/jni_uno/jni_bridge.cxx

@@ -512,10 +512,7 @@ void SAL_CALL uno_ext_getMapping(
 
         try
         {
-            if (from_env_typename.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(UNO_LB_JAVA) ) &&
-                to_env_typename.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+            if ( from_env_typename == UNO_LB_JAVA && to_env_typename == UNO_LB_UNO )
             {
                 Bridge * bridge =
                     new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1
@@ -524,10 +521,7 @@ void SAL_CALL uno_ext_getMapping(
                     &mapping, Bridge_free,
                     pFrom, (uno_Environment *)pTo->pExtEnv, 0 );
             }
-            else if (from_env_typename.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ) &&
-                     to_env_typename.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM(UNO_LB_JAVA) ))
+            else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_JAVA )
             {
                 Bridge * bridge =
                     new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1

bridges/source/jni_uno/jni_info.cxx

@@ -461,8 +461,7 @@ JNI_type_info const * JNI_info::get_type_info(
 JNI_type_info const * JNI_info::get_type_info(
     JNI_context const & jni, OUString const & uno_name ) const
 {
-    if (uno_name.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ))
+    if ( uno_name == "com.sun.star.uno.XInterface" )
     {
         return m_XInterface_type_info;
     }

bridges/source/jni_uno/jni_info.h

@@ -66,8 +66,7 @@ inline bool type_equals(
 inline bool is_XInterface( typelib_TypeDescriptionReference * type )
 {
     return ((typelib_TypeClass_INTERFACE == type->eTypeClass) &&
-            ::rtl::OUString::unacquired( &type->pTypeName ).equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ));
+            ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
 }
 
 //==============================================================================

bridges/source/jni_uno/jni_java2uno.cxx

@@ -425,8 +425,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
 #endif
 
         // special IQueryInterface.queryInterface()
-        if (method_name.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("queryInterface") ))
+        if ( method_name == "queryInterface" )
         {
             // oid
             JLocalAutoRef jo_oid(

bridges/test/java_uno/acquire/testacquire.cxx

@@ -119,8 +119,7 @@ class Interface: public css::uno::XInterface {
 css::uno::Any Interface::queryInterface(css::uno::Type const & type)
     throw (css::uno::RuntimeException)
 {
-    return type.getTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
-                                               "com.sun.star.uno.XInterface"))
+    return type.getTypeName() == "com.sun.star.uno.XInterface"
         ? css::uno::makeAny(css::uno::Reference< css::uno::XInterface >(this))
         : css::uno::Any();
 }
@@ -153,10 +152,8 @@ class Base: public Interface, public test::javauno::acquire::XBase {
 css::uno::Any Base::queryInterface(css::uno::Type const & type)
     throw (css::uno::RuntimeException)
 {
-    return type.getTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
-                                               "test.javauno.acquire.XBase"))
-        ? css::uno::makeAny(
-            css::uno::Reference< test::javauno::acquire::XBase >(this))
+    return type.getTypeName() == "test.javauno.acquire.XBase"
+        ? css::uno::makeAny(css::uno::Reference< test::javauno::acquire::XBase >(this))
         : Interface::queryInterface(type);
 }
 
@@ -182,8 +179,7 @@ class Derived: public Base, public test::javauno::acquire::XDerived {
 css::uno::Any Derived::queryInterface(css::uno::Type const & type)
     throw (css::uno::RuntimeException)
 {
-    return (type.getTypeName().equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("test.javauno.acquire.XDerived")))
+    return ( type.getTypeName() == "test.javauno.acquire.XDerived" )
         ? css::uno::makeAny(
             css::uno::Reference< test::javauno::acquire::XDerived >(this))
         : Interface::queryInterface(type);

canvas/workben/canvasdemo.cxx

@@ -654,9 +654,8 @@ void DemoApp::Main()
     {
         ::rtl::OUString aParam = GetCommandLineParam( i );
 
-        if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) ||
-            aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) )
-                bHelp = true;
+        if( aParam == "--help" || aParam == "-h" )
+            bHelp = true;
     }
 
     if( bHelp )

chart2/source/controller/main/ChartController.cxx

@@ -1042,8 +1042,7 @@ ::queryDispatch( const util::URL& rURL
 {
     if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() )
     {
-        if( !rTargetFrameName.isEmpty() &&
-            rTargetFrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self")))
+        if( !rTargetFrameName.isEmpty() && rTargetFrameName == "_self" )
             return m_aDispatchContainer.getDispatchForURL( rURL );
     }
     return uno::Reference< frame::XDispatch > ();

chart2/source/controller/main/ChartDropTargetHelper.cxx

@@ -118,8 +118,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
             if( aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aBytes ))
             {
                 ::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes ));
-                if( aStrings.size() >= 3 &&
-                    aStrings[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "soffice" )))
+                if( aStrings.size() >= 3 && aStrings[0] == "soffice" )
                 {
                     OUString aDocName( aStrings[1] );
                     OUString aRangeString( aStrings[2] );

chart2/source/controller/main/CommandDispatchContainer.cxx

@@ -97,8 +97,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
     {
         uno::Reference< frame::XModel > xModel( m_xModel );
 
-        if( xModel.is() && (rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" ))
-            || rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Redo" ))) )
+        if( xModel.is() && ( rURL.Path == "Undo" || rURL.Path == "Redo" ) )
         {
             CommandDispatch * pDispatch = new UndoCommandDispatch( m_xContext, xModel );
             xResult.set( pDispatch );
@@ -107,8 +106,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
             m_aCachedDispatches[ C2U(".uno:Redo") ].set( xResult );
             m_aToBeDisposedDispatches.push_back( xResult );
         }
-        else if( xModel.is() && (rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Context" ))
-                 || rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModifiedStatus" ))) )
+        else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == "ModifiedStatus" ) )
         {
             Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), uno::UNO_QUERY );
             CommandDispatch * pDispatch = new StatusBarCommandDispatch( m_xContext, xModel, xSelSupp );

chart2/source/controller/main/ControllerCommandDispatch.cxx

@@ -725,7 +725,7 @@ void ControllerCommandDispatch::fireStatusEvent(
     const OUString & rURL,
     const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ )
 {
-    bool bIsChartSelectorURL = rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ChartElementSelector") );
+    bool bIsChartSelectorURL = rURL == ".uno:ChartElementSelector";
     if( rURL.isEmpty() || bIsChartSelectorURL )
     {
         uno::Any aArg;
@@ -742,8 +742,7 @@ void ControllerCommandDispatch::fireStatusEvent(
 
     // statusbar. Should be handled by base implementation
     // @todo: remove if Issue 68864 is fixed
-    if( rURL.isEmpty() ||
-        rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:StatusBarVisible")))
+    if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" )
     {
         bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController ));
         fireStatusEventForURL( C2U(".uno:StatusBarVisible"), uno::makeAny( bIsStatusBarVisible ), true, xSingleListener );

chart2/source/controller/main/StatusBarCommandDispatch.cxx

@@ -77,8 +77,8 @@ void StatusBarCommandDispatch::fireStatusEvent(
     const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ )
 {
     bool bFireAll( rURL.isEmpty() );
-    bool bFireContext(  bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Context")));
-    bool bFireModified( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ModifiedStatus")));
+    bool bFireContext(  bFireAll || rURL == ".uno:Context" );
+    bool bFireModified( bFireAll || rURL == ".uno:ModifiedStatus" );
 
     if( bFireContext )
     {

chart2/source/controller/main/UndoCommandDispatch.cxx

@@ -92,9 +92,9 @@ void UndoCommandDispatch::fireStatusEvent(
             aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle());
         }
 
-        if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Undo")))
+        if( bFireAll || rURL == ".uno:Undo" )
             fireStatusEventForURL( C2U(".uno:Undo"), aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
-        if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Redo")))
+        if( bFireAll || rURL == ".uno:Redo" )
             fireStatusEventForURL( C2U(".uno:Redo"), aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener );
     }
 }

chart2/source/model/filter/XMLFilter.cxx

@@ -120,13 +120,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
             {
                 // properties understood by storage factory
                 // (see package/source/xstor/xfactory.cxx for details)
-                if ( rMediaDescriptor[i].Name.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ))
-                    || rMediaDescriptor[i].Name.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "Password" ))
-                    || rMediaDescriptor[i].Name.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
-                    )
+                if ( rMediaDescriptor[i].Name == "InteractionHandler" || rMediaDescriptor[i].Name == "Password" || rMediaDescriptor[i].Name == "RepairPackage" )
                 {
                     aPropertiesForStorage.push_back( rMediaDescriptor[i] );
                 }
@@ -187,19 +181,12 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
             ::std::vector< beans::PropertyValue > aPropertiesForStorage;
             for( sal_Int32 i=rMediaDescriptor.getLength(); i--; )
             {
-                if( rMediaDescriptor[i].Name.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "InputStream" )))
+                if( rMediaDescriptor[i].Name == "InputStream" )
                     xStream.set( rMediaDescriptor[i].Value, uno::UNO_QUERY );
 
                 // properties understood by storage factory
                 // (see package/source/xstor/xfactory.cxx for details)
-                if ( rMediaDescriptor[i].Name.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ))
-                     || rMediaDescriptor[i].Name.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "Password" ))
-                     || rMediaDescriptor[i].Name.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
-                    )
+                if ( rMediaDescriptor[i].Name == "InteractionHandler" || rMediaDescriptor[i].Name == "Password" || rMediaDescriptor[i].Name == "RepairPackage" )
                 {
                     aPropertiesForStorage.push_back( rMediaDescriptor[i] );
                 }
@@ -827,7 +814,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes
 {
     apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor );
     if( aMDHelper.ISSET_FilterName )
-        rOutOASIS = aMDHelper.FilterName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("chart8"));
+        rOutOASIS = aMDHelper.FilterName == "chart8";
 }
 // -----------------------------------------------------------------------------
 ::rtl::OUString XMLFilter::getMediaType(bool _bOasis)
@@ -843,7 +830,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >
 {
     apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor );
     if( aMDHelper.ISSET_FilterName )
-        rOutOASIS = aMDHelper.FilterName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("StarOffice XML (Base) Report Chart"));
+        rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart";
 }
 // -----------------------------------------------------------------------------
 ::rtl::OUString XMLReportFilterHelper::getMediaType(bool )

chart2/source/model/template/DataInterpreter.cxx

@@ -383,8 +383,7 @@ bool DataInterpreter::HasCategories(
         GetProperty( rArguments, C2U(("HasCategories"))) >>= bHasCategories;
 
     for( sal_Int32 nLSeqIdx=0; ! bHasCategories && nLSeqIdx<rData.getLength(); ++nLSeqIdx )
-        bHasCategories = ( rData[nLSeqIdx].is() &&
-                           GetRole( rData[nLSeqIdx]->getValues()).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")));
+        bHasCategories = ( rData[nLSeqIdx].is() && GetRole( rData[nLSeqIdx]->getValues() ) == "categories");
 
     return bHasCategories;
 }

chart2/source/tools/ErrorBar.cxx

@@ -176,8 +176,7 @@ struct StaticErrorBarInfo : public rtl::StaticAggregate< uno::Reference< beans::
 bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq )
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( xLSeq, uno::UNO_QUERY );
-    return ( xServiceInfo.is() && xServiceInfo->getImplementationName().equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.chart2.LabeledDataSequence")));
+    return ( xServiceInfo.is() && xServiceInfo->getImplementationName() == "com.sun.star.comp.chart2.LabeledDataSequence" );
 }
 
 } // anonymous namespace