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 @@ private:
 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 @@ protected:
 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 @@ private:
 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 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
 {
     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

chart2/source/tools/RegressionCurveHelper.cxx

@@ -101,29 +101,21 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
     Reference< XRegressionCurve > xResult;
 
     // todo: use factory methods with service name
-    if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                "com.sun.star.chart2.LinearRegressionCurve" )))
+    if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
     {
-        xResult.set(
-            new LinearRegressionCurve( xContext ));
+        xResult.set( new LinearRegressionCurve( xContext ) );
     }
-    else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
     {
-        xResult.set(
-            new LogarithmicRegressionCurve( xContext ));
+        xResult.set( new LogarithmicRegressionCurve( xContext ) );
     }
-    else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.ExponentialRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
     {
-        xResult.set(
-            new ExponentialRegressionCurve( xContext ));
+        xResult.set( new ExponentialRegressionCurve( xContext ) );
     }
-    else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.PotentialRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
     {
-        xResult.set(
-            new PotentialRegressionCurve( xContext ));
+        xResult.set( new PotentialRegressionCurve( xContext ) );
     }
 
     return xResult;
@@ -137,30 +129,25 @@ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionC
     Reference< XRegressionCurveCalculator > xResult;
 
     // todo: use factory methods with service name
-    if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.MeanValueRegressionCurve" )))
+    if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
     {
-        xResult.set( new MeanValueRegressionCurveCalculator());
+        xResult.set( new MeanValueRegressionCurveCalculator() );
     }
-    if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.LinearRegressionCurve" )))
+    if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
     {
-        xResult.set( new LinearRegressionCurveCalculator());
+        xResult.set( new LinearRegressionCurveCalculator() );
     }
-    else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
     {
-        xResult.set( new LogarithmicRegressionCurveCalculator());
+        xResult.set( new LogarithmicRegressionCurveCalculator() );
     }
-    else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.ExponentialRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
     {
-        xResult.set( new ExponentialRegressionCurveCalculator());
+        xResult.set( new ExponentialRegressionCurveCalculator() );
     }
-    else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.chart2.PotentialRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
     {
-        xResult.set( new PotentialRegressionCurveCalculator());
+        xResult.set( new PotentialRegressionCurveCalculator() );
     }
 
     return xResult;
@@ -192,15 +179,12 @@ void RegressionCurveHelper::initializeCurveCalculator(
             if( xProp->getPropertyValue(
                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole )
             {
-                if( bUseXValuesIfAvailable &&
-                    ! bXValuesFound &&
-                    aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values-x" )))
+                if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" )
                 {
                     aXValues = DataSequenceToDoubleSequence( xSeq );
                     bXValuesFound = true;
                 }
-                else if( ! bYValuesFound &&
-                         aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values-y" )))
+                else if( !bYValuesFound && aRole == "values-y" )
                 {
                     aYValues = DataSequenceToDoubleSequence( xSeq );
                     bYValuesFound = true;
@@ -537,28 +521,23 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
         {
             ::rtl::OUString aServiceName( xServName->getServiceName() );
 
-            if( aServiceName.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" )))
+            if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
             {
                 eResult = REGRESSION_TYPE_LINEAR;
             }
-            else if( aServiceName.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+            else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
             {
                 eResult = REGRESSION_TYPE_LOG;
             }
-            else if( aServiceName.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ExponentialRegressionCurve" )))
+            else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
             {
                 eResult = REGRESSION_TYPE_EXP;
             }
-            else if( aServiceName.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PotentialRegressionCurve" )))
+            else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
             {
                 eResult = REGRESSION_TYPE_POWER;
             }
-            else if( aServiceName.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
+            else if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
             {
                 eResult = REGRESSION_TYPE_MEAN_VALUE;
             }
@@ -604,28 +583,23 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
         return aResult;
 
     OUString aServiceName( xServiceName->getServiceName());
-    if( aServiceName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
+    if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
     {
         aResult = ::chart::SchResId::getResString( STR_REGRESSION_MEAN );
     }
-    else if( aServiceName.equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
     {
         aResult = ::chart::SchResId::getResString( STR_REGRESSION_LINEAR );
     }
-    else if( aServiceName.equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
     {
         aResult = ::chart::SchResId::getResString( STR_REGRESSION_LOG );
     }
-    else if( aServiceName.equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ExponentialRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
     {
         aResult = ::chart::SchResId::getResString( STR_REGRESSION_EXP );
     }
-    else if( aServiceName.equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PotentialRegressionCurve" )))
+    else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
     {
         aResult = ::chart::SchResId::getResString( STR_REGRESSION_POWER );
     }

cli_ure/source/climaker/climaker_emit.cxx

@@ -648,13 +648,11 @@ Assembly * TypeEmitter::type_resolve(
     OUString uno_name( xType->getName() );
     if (TypeClass_EXCEPTION == xType->getTypeClass())
     {
-        if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                                       "com.sun.star.uno.Exception") ))
+        if ( uno_name == "com.sun.star.uno.Exception" )
         {
             return get_type_Exception();
         }
-        if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                                       "com.sun.star.uno.RuntimeException") ))
+        if ( uno_name == "com.sun.star.uno.RuntimeException" )
         {
             return get_type_RuntimeException();
         }
@@ -723,8 +721,7 @@ Assembly * TypeEmitter::type_resolve(
     Reference< reflection::XInterfaceTypeDescription2 > const & xType )
 {
     OUString uno_name( xType->getName() );
-    if (uno_name.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ))
+    if ( uno_name == "com.sun.star.uno.XInterface" )
     {
         return __typeof (::System::Object);
     }
@@ -750,8 +747,7 @@ Assembly * TypeEmitter::type_resolve(
                 Reference<reflection::XInterfaceTypeDescription2> xIfaceTd =
                     resolveInterfaceTypedef(seqBaseTypes[i]);
 
-                if (xIfaceTd->getName().equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False)
+                if ( xIfaceTd->getName() != "com.sun.star.uno.XInterface" )
                 {
                     vecBaseTypes.push_back(xIfaceTd);
                 }
@@ -867,8 +863,7 @@ Assembly * TypeEmitter::type_resolve(
             Reference<reflection::XInterfaceTypeDescription2> aBaseType =
                 resolveInterfaceTypedef( seqBaseTypes[i]);
 
-            if (aBaseType->getName().equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False)
+            if ( aBaseType->getName() != "com.sun.star.uno.XInterface" )
             {
                 ::System::String * basetype_name = to_cts_name( aBaseType->getName() );
                 iface_entry * base_entry = dynamic_cast< iface_entry * >(

cli_ure/source/uno_bridge/cli_bridge.cxx

@@ -326,16 +326,14 @@ void SAL_CALL uno_ext_getMapping(
 
     try
     {
-        if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) ) &&
-            to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+        if ( from_env_typename == UNO_LB_CLI && to_env_typename == UNO_LB_UNO )
         {
             Bridge * bridge = new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1
             mapping = &bridge->m_cli2uno;
             uno_registerMapping(
                 &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_CLI) ))
+        else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_CLI )
         {
             Bridge * bridge = new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1
             mapping = &bridge->m_uno2cli;

codemaker/source/cppumaker/cpputype.cxx

@@ -1587,9 +1587,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
     inc();
     sal_Int16 nBases = m_reader.getSuperTypeCount();
     OSL_ASSERT(nBases > 0);
-    if (nBases == 1
-        && m_reader.getSuperTypeName(0).equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XInterface")))
+    if (nBases == 1 && m_reader.getSuperTypeName(0) == "com/sun/star/uno/XInterface" )
     {
         nBases = 0;
     }
@@ -2215,9 +2213,7 @@ void InterfaceType::dumpExceptionSpecification(
             rtl::OUString name(
                 m_reader.getMethodExceptionTypeName(
                     static_cast< sal_uInt16 >(methodIndex), i));
-            if (!name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(
-                        "com/sun/star/uno/RuntimeException")))
+            if ( name != "com/sun/star/uno/RuntimeException" )
             {
                 if (!first) {
                     out << ", ";
@@ -2269,9 +2265,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames(
     sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex);
     for (sal_uInt16 i = 0; i < n; ++i) {
         rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i));
-        if (!name.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "com/sun/star/uno/RuntimeException")))
+        if ( name != "com/sun/star/uno/RuntimeException" )
         {
             dumpExceptionTypeName(out, prefix, count++, name);
         }

codemaker/source/javamaker/javatype.cxx

@@ -2198,8 +2198,7 @@ void handleInterfaceType(
                  || mflags == RT_MODE_ATTRIBUTE_SET)
                 && reader.getMethodName(j) == attrNameUtf16)
             {
-                if (!reader.getMethodReturnTypeName(j).equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM("void"))
+                if (reader.getMethodReturnTypeName(j) != "void"
                     || reader.getMethodParameterCount(j) != 0
                     || (mflags == RT_MODE_ATTRIBUTE_GET
                         ? getter != SAL_MAX_UINT16
@@ -2895,8 +2894,7 @@ void handleService(
                                   reader.getMethodName(i)));
             bool defaultCtor = name.getLength() == 0;
             if (reader.getMethodFlags(i) != RT_MODE_TWOWAY
-                || (!reader.getMethodReturnTypeName(i).equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM("void")))
+                || (reader.getMethodReturnTypeName(i) != "void")
                 || (defaultCtor
                     && (methods != 1 || reader.getMethodParameterCount(i) != 0
                         || reader.getMethodExceptionCount(i) != 0)))

configmgr/qa/unit/test.cxx

@@ -291,9 +291,7 @@ void RecursiveTest::disposing(css::lang::EventObject const & Source)
 void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt)
     throw (css::uno::RuntimeException)
 {
-    CPPUNIT_ASSERT(
-        evt.Source == properties_ &&
-        evt.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")));
+    CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" );
     if (count_ > 0) {
         --count_;
         step();
@@ -406,7 +404,7 @@ void Test::testKeySet() {
                 RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
         s);
-    CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("baa")));
+    CPPUNIT_ASSERT( s == "baa" );
 }
 
 void Test::testKeyReset() {
@@ -422,7 +420,7 @@ void Test::testKeyReset() {
                     RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
             s);
-        CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo")));
+        CPPUNIT_ASSERT( s == "Foo" );
     }
 }
 
@@ -436,8 +434,7 @@ void Test::testSetSetMemberName() {
                     ".uno:FontworkShapeType")),
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
         s);
-    CPPUNIT_ASSERT(
-        s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Shape")));
+    CPPUNIT_ASSERT( s == "Fontwork Shape" );
 
     css::uno::Reference< css::container::XNameAccess > access(
         createUpdateAccess(
@@ -468,8 +465,7 @@ void Test::testSetSetMemberName() {
                     ".uno:FontworkShapeType")),
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
         s);
-    CPPUNIT_ASSERT(
-        s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Gallery")));
+    CPPUNIT_ASSERT( s == "Fontwork Gallery" );
 }
 
 void Test::testReadCommands() {

configmgr/source/components.cxx

@@ -221,7 +221,7 @@ Components & Components::getSingleton(
 }
 
 bool Components::allLocales(rtl::OUString const & locale) {
-    return locale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"));
+    return locale == "*";
 }
 
 rtl::Reference< Node > Components::resolvePathRepresentation(

configmgr/source/configurationprovider.cxx

@@ -259,12 +259,10 @@ Service::createInstanceWithArguments(
         }
     }
     bool update;
-    if (ServiceSpecifier.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM(accessServiceName)))
+    if ( ServiceSpecifier == accessServiceName )
     {
         update = false;
-    } else if (ServiceSpecifier.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM(updateAccessServiceName)))
+    } else if ( ServiceSpecifier == updateAccessServiceName )
     {
         update = true;
     } else {

connectivity/source/drivers/evoab2/NDriver.cxx

@@ -181,7 +181,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion(  ) throw(RuntimeException)
 // --------------------------------------------------------------------------------
 sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url )
 {
-    return (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:local")) || url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))||url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))&& EApiInit();
+    return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit();
 }
 // -----------------------------------------------------------------------------
 

connectivity/source/drivers/hsqldb/HConnection.cxx

@@ -333,7 +333,7 @@ namespace connectivity { namespace hsqldb
             {
                 Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW );
                 ::rtl::OUString sTableType = xValueAccess->getString( 1 );
-                bIsTextTable = sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TEXT" ) );
+                bIsTextTable = sTableType == "TEXT";
             }
         }
         catch( const Exception& )

connectivity/source/drivers/mozab/MConnection.cxx

@@ -157,7 +157,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
     //
     sal_Int32 nLen = url.indexOf(':');
     nLen = url.indexOf(':',nLen+1);
-    OSL_ENSURE( url.copy( 0, nLen ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:address" ) ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
+    OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
 
     ::rtl::OUString aAddrbookURI(url.copy(nLen+1));
     // Get Scheme

connectivity/source/drivers/mysql/YDriver.cxx

@@ -106,7 +106,7 @@ namespace connectivity
     {
         sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl)
         {
-            return _sUrl.copy(0,16).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:mysql:odbc:"));
+            return _sUrl.copy(0,16) == "sdbc:mysql:odbc:";
         }
         //--------------------------------------------------------------------
         sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl)

connectivity/source/drivers/postgresql/pq_databasemetadata.cxx

@@ -1475,7 +1475,7 @@ static void columnMetaData2DatabaseTypeDescription(
     queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " ) );
     while( rs->next() )
     {
-        if( row->getString( 9 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
+        if( row->getString( 9 ) == "d" && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
         {
             oidMap[row->getInt(12)] = DatabaseTypeDescription();
             if( domains )
@@ -1646,7 +1646,7 @@ static void columnMetaData2DatabaseTypeDescription(
             row[1] <<= sNewSchema;
             row[2] <<= sNewTable;
             row[3] <<= xRow->getString(3);
-            if( xRow->getString(8).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) )
+            if( xRow->getString(8) == "d" )
             {
                 DatabaseTypeDescription desc( domainMap[xRow->getInt(11)] );
                 type = typeNameToDataType( desc.typeName, desc.typeType );

cppu/qa/test_any.cxx

@@ -308,9 +308,7 @@ void Test::testVoid() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -408,9 +406,7 @@ void Test::testBoolean() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -509,9 +505,7 @@ void Test::testByte() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -610,9 +604,7 @@ void Test::testShort() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -713,9 +705,7 @@ void Test::testUnsignedShort() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -810,9 +800,7 @@ void Test::testLong() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -907,9 +895,7 @@ void Test::testUnsignedLong() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1004,9 +990,7 @@ void Test::testHyper() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1101,9 +1085,7 @@ void Test::testUnsignedHyper() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1198,9 +1180,7 @@ void Test::testFloat() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1295,9 +1275,7 @@ void Test::testDouble() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1397,9 +1375,7 @@ void Test::testChar() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1494,9 +1470,7 @@ void Test::testString() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            (a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1591,9 +1565,7 @@ void Test::testType() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1689,9 +1661,7 @@ void Test::testSequence() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1792,9 +1762,7 @@ void Test::testEnum() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1893,9 +1861,7 @@ void Test::testStruct() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1949,10 +1915,7 @@ void Test::testStruct() {
 void Test::testPoly() {
     css::uno::Any a;
     a <<= Poly< css::uno::Sequence< ::sal_Unicode > >();
-    CPPUNIT_ASSERT_MESSAGE(
-        "type name",
-        a.getValueType().getTypeName().equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("Poly<[]char>")));
+    CPPUNIT_ASSERT_MESSAGE( "type name", a.getValueType().getTypeName() == "Poly<[]char>" );
     CPPUNIT_ASSERT_MESSAGE(
         "constructor",
         a == css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >()));
@@ -2018,9 +1981,7 @@ void Test::testException() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -2136,9 +2097,7 @@ void Test::testInterface() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());
@@ -2252,9 +2211,7 @@ void Test::testNull() {
     }
     {
         rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
-        CPPUNIT_ASSERT_MESSAGE(
-            "rtl::OUString",
-            !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+        CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
     }
     {
         css::uno::Type b(getCppuType< rtl::OUString >());

cppu/source/uno/lbenv.cxx

@@ -217,8 +217,7 @@ inline InterfaceEntry * ObjectEntry::find(
     OUString const & type_name =
         OUString::unacquired(
             &((typelib_TypeDescription *) pTypeDescr_)->pTypeName );
-    if (type_name.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ))
+    if ( type_name == "com.sun.star.uno.XInterface" )
     {
         return &aInterfaces[ 0 ];
     }

cppu/source/uno/lbmap.cxx

@@ -427,7 +427,7 @@ static Mapping loadExternalMapping(
         oslModule hModule = 0;
         OUString aName;
 
-        if (EnvDcp::getTypeName(rFrom.getTypeName()).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+        if ( EnvDcp::getTypeName(rFrom.getTypeName()) == UNO_LB_UNO )
             hModule = loadModule( aName = getBridgeName( rTo, rFrom, rAddPurpose ) );
         if (! hModule)
             hModule = loadModule( aName = getBridgeName( rFrom, rTo, rAddPurpose ) );

cppuhelper/source/implbase_ex.cxx

@@ -72,7 +72,7 @@ static inline void checkInterface( Type const & rType )
 //--------------------------------------------------------------------------------------------------
 static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(())
 {
-    return (((OUString const *)&pStr)->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) != sal_False);
+    return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface");
 }
 //--------------------------------------------------------------------------------------------------
 static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(())

cppuhelper/source/propertysetmixin.cxx

@@ -219,9 +219,7 @@ void Data::initProperties(
                 // works if the specified exceptions are of the exact type, not
                 // of a supertype:
                 for (sal_Int32 j = 0; j < excs.getLength(); ++j) {
-                    if (excs[j]->getName().equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM(
-                                "com.sun.star.beans.UnknownPropertyException")))
+                    if ( excs[j]->getName() == "com.sun.star.beans.UnknownPropertyException" )
                     {
                         getUnknown = true;
                         break;
@@ -229,15 +227,10 @@ void Data::initProperties(
                 }
                 excs = attr->getSetExceptions();
                 for (sal_Int32 j = 0; j < excs.getLength(); ++j) {
-                    if (excs[j]->getName().equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM(
-                                "com.sun.star.beans.UnknownPropertyException")))
+                    if ( excs[j]->getName() == "com.sun.star.beans.UnknownPropertyException" )
                     {
                         setUnknown = true;
-                    } else if (excs[j]->getName().equalsAsciiL(
-                                   RTL_CONSTASCII_STRINGPARAM(
-                                       "com.sun.star.beans."
-                                       "PropertyVetoException")))
+                    } else if ( excs[j]->getName() == "com.sun.star.beans.PropertyVetoException" )
                     {
                         attrAttribs
                             |= css::beans::PropertyAttribute::CONSTRAINED;

cppuhelper/source/servicefactory.cxx

@@ -256,8 +256,7 @@ static void add_access_control_entries(
                       "single-user-id");
             entry.value <<= ac_user;
             context_values.push_back( entry );
-            if (! ac_mode.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("single-user") ))
+            if ( ac_mode != "single-user" )
             {
                 throw SecurityException(
                     OUSTR("set UNO_AC=single-user "
@@ -267,8 +266,7 @@ static void add_access_control_entries(
         }
         else
         {
-            if (! ac_mode.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("single-default-user") ))
+            if ( ac_mode != "single-default-user" )
             {
                 throw SecurityException(
                     OUSTR("set UNO_AC=single-default-user "

cppuhelper/test/cfg_test.cxx

@@ -113,14 +113,14 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA
     OSL_VERIFY( n == 13 );
     OSL_VERIFY( m_xContext->getValueByName(
         OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop1") ) >>= val );
-    OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("value of serviceprop1") ) );
+    OSL_VERIFY( val == "value of serviceprop1" );
     // impl properties
     OSL_VERIFY( m_xContext->getValueByName(
         OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop0") ) >>= n );
     OSL_VERIFY( n == 15 );
     OSL_VERIFY( m_xContext->getValueByName(
         OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop1") ) >>= val );
-    OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("value of implprop1") ) );
+    OSL_VERIFY( val == "value of implprop1" );
 }
 // XInitialization
 //__________________________________________________________________________________________________
@@ -131,11 +131,11 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
     OUString val;
     OSL_VERIFY( rArgs.getLength() == 3 );
     OSL_VERIFY( rArgs[ 0 ] >>= val );
-    OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("first argument") ) );
+    OSL_VERIFY( val == "first argument" );
     OSL_VERIFY( rArgs[ 1 ] >>= val );
-    OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("second argument") ) );
+    OSL_VERIFY( val == "second argument" );
     OSL_VERIFY( rArgs[ 2 ] >>= val );
-    OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("third argument") ) );
+    OSL_VERIFY( val == "third argument" );
 }
 // XServiceInfo
 //__________________________________________________________________________________________________

cppuhelper/test/testimplhelper.cxx

@@ -349,24 +349,24 @@ static void dotest( const Reference< XInterface > & xOriginal )
     }
 
     Reference< A > xa( xOriginal, UNO_QUERY );
-    OSL_ENSURE( xa->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### A failed!" );
+    OSL_ENSURE( xa->a() == "a", "### A failed!" );
     Reference< BA > xba( xa, UNO_QUERY );
-    OSL_ENSURE( xba->ba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ba") ), "### BA failed!" );
-    OSL_ENSURE( xba->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### BA failed!" );
+    OSL_ENSURE( xba->ba() == "ba", "### BA failed!" );
+    OSL_ENSURE( xba->a() == "a" ), "### BA failed!" );
     Reference< CA > xca( xba, UNO_QUERY );
-    OSL_ENSURE( xca->ca().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ca") ), "### CA failed!" );
-    OSL_ENSURE( xca->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### CA failed!" );
+    OSL_ENSURE( xca->ca() == "ca", "### CA failed!" );
+    OSL_ENSURE( xca->a() == "a", "### CA failed!" );
     Reference< DBA > xdba( xca, UNO_QUERY );
-    OSL_ENSURE( xdba->dba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dba") ), "### DBA failed!" );
-    OSL_ENSURE( xdba->ba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ba") ), "### DBA failed!" );
-    OSL_ENSURE( xdba->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### DBA failed!" );
+    OSL_ENSURE( xdba->dba() == "dba", "### DBA failed!" );
+    OSL_ENSURE( xdba->ba() == "ba", "### DBA failed!" );
+    OSL_ENSURE( xdba->a() == "a", "### DBA failed!" );
     Reference< E > xe( xdba, UNO_QUERY );
-    OSL_ENSURE( xe->e().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("e") ), "### E failed!" );
+    OSL_ENSURE( xe->e() == "e", "### E failed!" );
     Reference< FE > xfe( xe, UNO_QUERY );
-    OSL_ENSURE( xfe->fe().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("fe") ), "### FE failed!" );
+    OSL_ENSURE( xfe->fe() == "fe", "### FE failed!" );
     Reference< G > xg( xfe, UNO_QUERY );
-    OSL_ENSURE( xg->g().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("g") ), "### G failed!" );
-    OSL_ENSURE( xg->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### G failed!" );
+    OSL_ENSURE( xg->g() == "g", "### G failed!" );
+    OSL_ENSURE( xg->a() == "a", "### G failed!" );
 
     // type provider
     Reference< lang::XTypeProvider > xProv( xg, UNO_QUERY );
@@ -466,16 +466,16 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
     dotest( xWeakImpl );
     Reference< H > xH( xWeakImpl, UNO_QUERY );
     Reference< I > xI( xH, UNO_QUERY );
-    OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h") ) );
-    OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i") ) );
+    OSL_ASSERT( xH->h() == "h" );
+    OSL_ASSERT( xI->i() == "i" );
 
     xWeakAggImpl = (OWeakObject *)new TestAggImplInh();
     Reference< lang::XTypeProvider > xTP7( xWeakAggImpl, UNO_QUERY );
     dotest( xWeakAggImpl );
     xH.set( xWeakAggImpl, UNO_QUERY );
     xI.set( xH, UNO_QUERY );
-    OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h2") ) );
-    OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i2") ) );
+    OSL_ASSERT( xH->h() == "h2" );
+    OSL_ASSERT( xI->i() == "i2" );
 
     //
     OSL_ASSERT(
@@ -545,8 +545,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
     }
     catch (RuntimeException & rExc)
     {
-        OSL_ENSURE( rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("runtime exc") ) && rExc.Context == xImpl,
-                     "### unexpected exception content!" );
+        OSL_ENSURE( rExc.Message == "runtime exc" && rExc.Context == xImpl, "### unexpected exception content!" );
         try
         {
             throwException( makeAny( Exception(
@@ -558,8 +557,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
         }
         catch (Exception & rExc2)
         {
-            OSL_ENSURE( rExc2.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("exc") ) && rExc2.Context == xImpl,
-                         "### unexpected exception content!" );
+            OSL_ENSURE( rExc2.Message == "exc" && rExc2.Context == xImpl, "### unexpected exception content!" );
             try
             {
                 throwException( makeAny( lang::IllegalAccessException(
@@ -567,8 +565,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
             }
             catch (lang::IllegalAccessException & rExc3)
             {
-                OSL_ENSURE( rExc3.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("axxess exc") ) && rExc3.Context == xImpl,
-                             "### unexpected exception content!" );
+                OSL_ENSURE( rExc3.Message == "axxess exc" && rExc3.Context == xImpl, "### unexpected exception content!" );
                 return;
             }
         }

cpputools/source/unoexe/unoexe.cxx

@@ -534,9 +534,7 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName )
 
             if (_aImplName.isEmpty() && _aServiceName.isEmpty())
             {
-                OSL_ASSERT(
-                    rName.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM("uno.ComponentContext") ) );
+                OSL_ASSERT( rName == "uno.ComponentContext" );
                 xRet = _xContext;
             }
             else if (_bSingleInstance)

cui/source/customize/cfg.cxx

@@ -404,9 +404,7 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
 {
     OSL_TRACE("SupportsDocumentConfig: %s", PRTSTR(aModuleId));
 
-    if  (  aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) )
-        || aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.frame.Bibliography" ) )
-        )
+    if  ( aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography" )
     {
         return sal_False;
     }

cui/source/customize/cfgutil.cxx

@@ -801,9 +801,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
                     moduleDescr.getConstArray();
                 for ( sal_Int32 pos = moduleDescr.getLength(); pos--; )
                 {
-                    if (pmoduleDescr[ pos ].Name.equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM(
-                                "ooSetupFactoryEmptyDocumentURL") ))
+                    if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
                     {
                         pmoduleDescr[ pos ].Value >>= factoryURL;
                         OSL_TRACE("factory url for doc images is %s",

cui/source/customize/selector.cxx

@@ -315,7 +315,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
             Sequence< Reference< browse::XBrowseNode > > children =
                 _rxRootNode->getChildNodes();
 
-            sal_Bool bIsRootNode = _rxRootNode->getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Root"));
+            sal_Bool bIsRootNode = _rxRootNode->getName() == "Root";
 
             /* To mimic current starbasic behaviour we
             need to make sure that only the current document
@@ -586,7 +586,7 @@ Image SvxConfigGroupListBox_Impl::GetImage(
     Image aImage;
     if ( bIsRootNode )
     {
-        if ( node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) || node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) )
+        if ( node->getName() == "user" || node->getName() == "share" )
         {
             aImage = m_hdImage;
         }
@@ -619,9 +619,7 @@ Image SvxConfigGroupListBox_Impl::GetImage(
                     moduleDescr.getConstArray();
                 for ( sal_Int32 pos = moduleDescr.getLength(); pos--; )
                 {
-                    if (pmoduleDescr[ pos ].Name.equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM(
-                                "ooSetupFactoryEmptyDocumentURL") ))
+                    if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
                     {
                         pmoduleDescr[ pos ].Value >>= factoryURL;
                         break;

cui/source/dialogs/about.cxx

@@ -169,10 +169,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 
     rtl::OUStringBuffer sText(m_aVendorTextStr);
     sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
-    sal_uInt32 nCopyrightId =
-        utl::ConfigManager::getProductName().equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("LibreOffice"))
-        ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
+    sal_uInt32 nCopyrightId = utl::ConfigManager::getProductName() == "LibreOffice" ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
     String aProductCopyrightTextStr(ResId(nCopyrightId, *rId.GetResMgr()));
     sText.append(aProductCopyrightTextStr);
     sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));

cui/source/dialogs/hldocntp.cxx

@@ -197,15 +197,15 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
                 rDynamicMenuEntry[e].Value >>= aTargetName;
         }
         //#i96822# business cards, labels and database should not be inserted here
-        if( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21051" ) ) ||
-                aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21052" )) ||
-                aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/sdatabase?Interactive" )))
+        if( aDocumentUrl == "private:factory/swriter?slot=21051" ||
+            aDocumentUrl == "private:factory/swriter?slot=21052" ||
+            aDocumentUrl == "private:factory/sdatabase?Interactive" )
             continue;
 
         // Insert into listbox
         if ( !aDocumentUrl.isEmpty() )
         {
-            if ( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/simpress?slot=6686" ) ) )              // SJ: #106216# do not start
+            if ( aDocumentUrl == "private:factory/simpress?slot=6686" )              // SJ: #106216# do not start
                 aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress
 
             // insert private-url and default-extension as user-data

cui/source/dialogs/scriptdlg.cxx

@@ -243,9 +243,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
                     moduleDescr.getConstArray();
                 for ( sal_Int32 pos = moduleDescr.getLength(); pos--; )
                 {
-                    if (pmoduleDescr[ pos ].Name.equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM(
-                                "ooSetupFactoryEmptyDocumentURL") ))
+                    if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
                     {
                         pmoduleDescr[ pos ].Value >>= factoryURL;
                         break;

cui/source/tabpages/macroass.cxx

@@ -131,7 +131,7 @@ String ConvertToUIName_Impl( SvxMacro *pMacro )
 {
     String aName( pMacro->GetMacName() );
     String aEntry;
-    if ( ! pMacro->GetLanguage().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("JavaScript")) )
+    if ( pMacro->GetLanguage() != "JavaScript" )
     {
         sal_uInt16 nCount = comphelper::string::getTokenCount(aName, '.');
         aEntry = aName.GetToken( nCount-1, '.' );

dbaccess/source/core/api/KeySet.cxx

@@ -360,7 +360,7 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OU
             for(;pAnd != pAndEnd;++pAnd)
             {
                 ::rtl::OUString sValue;
-                if ( !(pAnd->Value >>= sValue) || !(sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("?")) || sValue.matchAsciiL(":",1,0)) )
+                if ( !(pAnd->Value >>= sValue) || !( sValue == "?" || sValue.matchAsciiL( ":",1,0 ) ) )
                 { // we have a criteria which has to be taken into account for updates
                     m_aFilterColumns.push_back(pAnd->Name);
                 }

dbaccess/source/core/dataaccess/connection.cxx

@@ -681,9 +681,7 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createInstance" );
     Reference< XServiceInfo > xRet;
-    if  (  ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier )
-        || ( _sServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) ) )
-        )
+    if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" )
     {
         xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext );
         m_aComposers.push_back(WeakReferenceHelper(xRet));

dbaccess/source/core/dataaccess/databasedocument.cxx

@@ -2046,7 +2046,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewControlle
 
 Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
 {
-    if ( !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Default" ) ) && !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) )
+    if ( _ViewName != "Default" && _ViewName != "Preview" )
         throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
     if ( !_Frame.is() )
         throw IllegalArgumentException( ::rtl::OUString(), *this, 3 );

dbaccess/source/core/dataaccess/definitioncontainer.cxx

@@ -614,7 +614,7 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const
 void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
 {
     ClearableMutexGuard aGuard(m_aMutex);
-    if(evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ))
+    if( evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName ==  "Title" )
     {
         m_bInPropertyChange = sal_True;
         try
@@ -641,7 +641,7 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a
 {
     MutexGuard aGuard(m_aMutex);
 
-    if(aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+    if( aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" )
     {
         ::rtl::OUString sNewName;
         aEvent.NewValue >>= sNewName;

dbaccess/source/core/dataaccess/documenteventexecutor.cxx

@@ -190,10 +190,7 @@ namespace dbaccess
                 // no script is assigned to this event
                 return;
 
-            bool bDispatchScriptURL =
-                (   sEventType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) )
-                ||  sEventType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Service" ) )
-                );
+            bool bDispatchScriptURL = ( sEventType == "Script" || sEventType == "Service" );
             bool bNonEmptyScript = !sScript.isEmpty();
 
             OSL_ENSURE( bDispatchScriptURL && bNonEmptyScript,

dbaccess/source/core/misc/DatabaseDataProvider.cxx

@@ -278,7 +278,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum
                 ::rtl::OUString aRole;
                 if  (   xSeqProp.is()
                     &&  ( xSeqProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ) ) ) >>= aRole )
-                    &&  aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "categories" ) )
+                    &&  aRole == "categories"
                     )
                 {
                     bHasCategories = sal_True;

dbaccess/source/core/recovery/dbdocrecovery.cxx

@@ -231,7 +231,7 @@ namespace dbaccess
                     continue;
 
                 // the only section we support so far is "storages"
-                if ( !sCurrentSection.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storages" ) ) )
+                if ( sCurrentSection != "storages" )
                 {
                     bCurrentSectionIsKnownToBeUnsupported = true;
                     continue;

dbaccess/source/core/recovery/settingsimport.cxx

@@ -117,7 +117,7 @@ namespace dbaccess
             o_rLocalName = i_rElementName.copy( nSeparatorPos + 1 );
         }
 
-        OSL_ENSURE( o_rNamespace.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ), "SettingsImport::split: unexpected namespace!" );
+        OSL_ENSURE( o_rNamespace == "config", "SettingsImport::split: unexpected namespace!" );
             // our recovery file is kind of hand-made, so there shouldn't be anything else than "config".
             // If there is, then just ignore it ...
     }

dbaccess/source/ext/macromigration/migrationengine.cxx

@@ -332,7 +332,7 @@ namespace dbmm
                 bool bCausedByNewStyleReport =
                         ( _rDocument.eType == eReport )
                     &&  ( aError.isExtractableTo( ::cppu::UnoType< WrongFormatException >::get() ) )
-                    &&  ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.sun.xml.report" ) ) );
+                    &&  ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ) == "application/vnd.sun.xml.report" );
 
                 if ( bCausedByNewStyleReport )
                 {
@@ -1636,9 +1636,7 @@ namespace dbmm
         Any aException;
         try
         {
-            if  (   !_rScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) )
-                ||  _rScriptType.isEmpty()
-                )
+            if  ( _rScriptType != "Script" || _rScriptType.isEmpty() )
             {
                 OSL_FAIL(
                     "MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: no or unknown script type!" );
@@ -1669,7 +1667,7 @@ namespace dbmm
 
             ::rtl::OUString sLocation = xUri->getParameter(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "location" ) ) );
-            if ( !sLocation.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "document" ) ) )
+            if ( sLocation != "document" )
             {
                 // only document libraries must be migrated, of course
                 return false;

dbaccess/source/filter/xml/dbloader2.cxx

@@ -165,7 +165,7 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac
         {
             ::rtl::OUString sMediaType;
             xStorageProperties->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType;
-            if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII)) || sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_VND_SUN_XML_BASE_ASCII)) )
+            if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII || sMediaType == MIMETYPE_VND_SUN_XML_BASE_ASCII )
             {
                 if ( bStreamFromDescr && sURL.compareTo( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ), 14 ) != COMPARE_EQUAL )
                 {
@@ -346,7 +346,7 @@ namespace
                 URL aURL;
                 aURL.Complete = _rURL;
                 xTransformer->parseStrict( aURL );
-                bDoesAllow = aURL.Arguments.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Interactive" ) );
+                bDoesAllow = aURL.Arguments == "Interactive";
             }
         }
         catch( const Exception& )

dbaccess/source/filter/xml/xmlColumn.cxx

@@ -90,7 +90,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
                 m_sHelpMessage = sValue;
                 break;
             case XML_TOK_COLUMN_VISIBILITY:
-                m_bHidden = !sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("visible"));
+                m_bHidden = sValue != "visible";
                 break;
             case XML_TOK_COLUMN_TYPE_NAME:
                 sType = sValue;
@@ -101,7 +101,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
                     m_aDefaultValue <<= sValue;
                 break;
             case XML_TOK_COLUMN_VISIBLE:
-                m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false"));
+                m_bHidden = sValue == "false";
                 break;
             case XML_TOK_DEFAULT_CELL_STYLE_NAME:
                 m_sCellStyleName = sValue;

dbaccess/source/filter/xml/xmlDataSourceSetting.cxx

@@ -72,7 +72,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
         {
             case XML_TOK_DATA_SOURCE_SETTING_IS_LIST:
-                m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+                m_bIsList = sValue == "true";
                 break;
             case XML_TOK_DATA_SOURCE_SETTING_TYPE:
                 {

dbaccess/source/filter/xml/xmlQuery.cxx

@@ -76,7 +76,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
                 m_sCommand = sValue;
                 break;
             case XML_TOK_ESCAPE_PROCESSING:
-                m_bEscapeProcessing = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+                m_bEscapeProcessing = sValue == "true";
                 break;
         }
     }

dbaccess/source/filter/xml/xmlServerDatabase.cxx

@@ -90,10 +90,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
     if ( !sType.isEmpty() )
     {
         ::rtl::OUStringBuffer sURL;
-        if  (   sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysql:jdbc" ) )
-            ||  sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysqlc" ) )
-            ||  sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysql:mysqlc" ) )
-            )
+        if  ( sType == "sdbc:mysql:jdbc" || sType == "sdbc:mysqlc" || sType == "sdbc:mysql:mysqlc" )
         {
             sURL.append( sType );
             sURL.append( sal_Unicode( ':' ) );

dbaccess/source/filter/xml/xmlTable.cxx

@@ -91,10 +91,10 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
                 m_sStyleName = sValue;
                 break;
             case XML_TOK_APPLY_FILTER:
-                m_bApplyFilter = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+                m_bApplyFilter = sValue == "true";
                 break;
             case XML_TOK_APPLY_ORDER:
-                m_bApplyOrder = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+                m_bApplyOrder = sValue == "true";
                 break;
         }
     }

dbaccess/source/ui/misc/WCopyTable.cxx

@@ -151,7 +151,7 @@ bool ObjectCopySource::isView() const
         {
             ::rtl::OUString sObjectType;
             OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType );
-            bIsView = sObjectType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) );
+            bIsView = sObjectType == "VIEW";
         }
     }
     catch( const Exception& )

desktop/source/app/appinit.cxx

@@ -136,8 +136,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                                        "system.desktop-environment" ) )
                 );
                 rtl::OUString aDesktopEnvironment;
-                if ((aValue >>= aDesktopEnvironment)
-                    && aDesktopEnvironment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")))
+                if ( (aValue >>= aDesktopEnvironment) && aDesktopEnvironment == "GNOME" )
                 {
                     Reference<XContentProviderManager> xCPM =
                         cb->getContentProviderManagerInterface();

desktop/source/app/cmdlineargs.cxx

@@ -596,56 +596,56 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
     {
         AddStringListParam_Impl( CMD_STRINGPARAM_LANGUAGE, oArg.copy(RTL_CONSTASCII_LENGTH("language=")) );
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "writer" )) == sal_True )
+    else if ( oArg == "writer" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WRITER );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_WRITER, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "calc" )) == sal_True )
+    else if ( oArg == "calc" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_CALC );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_CALC, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "draw" )) == sal_True )
+    else if ( oArg == "draw" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_DRAW );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_DRAW, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "impress" )) == sal_True )
+    else if ( oArg == "impress" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_IMPRESS );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_IMPRESS, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "base" )) == sal_True )
+    else if ( oArg == "base" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_BASE );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_BASE, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "global" )) == sal_True )
+    else if ( oArg == "global" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_GLOBAL );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_GLOBAL, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "math" )) == sal_True )
+    else if ( oArg == "math" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_MATH );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_MATH, sal_True );
         m_bDocumentArgs = true;
     }
-    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "web" )) == sal_True )
+    else if ( oArg == "web" )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WEB );
         if ( !bAlreadySet )

desktop/source/deployment/manager/dp_manager.cxx

@@ -139,14 +139,9 @@ void PackageManagerImpl::initActivationLayer(
                 Reference<sdbc::XRow> xRow( xResultSet, UNO_QUERY_THROW );
                 OUString title( xRow->getString( 1 /* Title */ ) );
                 // xxx todo: remove workaround for tdoc
-                if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                                            "this_is_a_dummy_stream_just_there_"
-                                            "as_a_workaround_for_a_"
-                                            "temporary_limitation_of_the_"
-                                            "storage_api_implementation") ))
+                if ( title == "this_is_a_dummy_stream_just_there_as_a_workaround_for_a_temporary_limitation_of_the_storage_api_implementation" )
                     continue;
-                if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
-                                             "META-INF") ) )
+                if ( title == "META-INF" )
                     continue;
 
                 ::ucbhelper::Content sourceContent(

desktop/source/deployment/misc/dp_dependencies.cxx

@@ -118,28 +118,19 @@ check(dp_misc::DescriptionInfoset const & infoset) {
         css::uno::Reference< css::xml::dom::XElement > e(
             deps->item(i), css::uno::UNO_QUERY_THROW);
         bool sat = false;
-        if (e->getNamespaceURI().equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg))
-            && e->getTagName().equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM(minimalVersionOpenOfficeOrg)))
+        if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == minimalVersionOpenOfficeOrg )
         {
             sat = satisfiesMinimalVersion(
                 getReferenceOpenOfficeOrgMajorMinor(),
                 e->getAttribute(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
-        } else if (e->getNamespaceURI().equalsAsciiL(
-                       RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg))
-                   && e->getTagName().equalsAsciiL(
-                       RTL_CONSTASCII_STRINGPARAM(maximalVersionOpenOfficeOrg)))
+        } else if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == maximalVersionOpenOfficeOrg )
         {
             sat = satisfiesMaximalVersion(
                 getReferenceOpenOfficeOrgMajorMinor(),
                 e->getAttribute(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
-        } else if (e->getNamespaceURI().equalsAsciiL(
-                       RTL_CONSTASCII_STRINGPARAM(namespaceLibreOffice))
-                   && e->getTagName().equalsAsciiL(
-                       RTL_CONSTASCII_STRINGPARAM(minimalVersionLibreOffice)))
+        } else if (e->getNamespaceURI() == namespaceLibreOffice && e->getTagName() == minimalVersionLibreOffice )
         {
             sat = satisfiesMinimalVersion(
                 getLibreOfficeMajorMinorMicro(),
@@ -173,30 +164,21 @@ rtl::OUString getErrorText(
     css::uno::Reference< css::xml::dom::XElement > const & dependency)
 {
     OSL_ASSERT(dependency.is());
-    if (dependency->getNamespaceURI().equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg))
-        && dependency->getTagName().equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM(minimalVersionOpenOfficeOrg)))
+    if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg )
     {
         return produceErrorText(
             ResId::toString(
                 dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN)),
             dependency->getAttribute(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
-    } else if (dependency->getNamespaceURI().equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg))
-               && dependency->getTagName().equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM(maximalVersionOpenOfficeOrg)))
+    } else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg )
     {
         return produceErrorText(
             ResId::toString(
                 dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX)),
             dependency->getAttribute(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
-    } else if (dependency->getNamespaceURI().equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM(namespaceLibreOffice))
-               && dependency->getTagName().equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM(minimalVersionLibreOffice)))
+    } else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice )
     {
         return produceErrorText(
             ResId::toString(

desktop/source/deployment/misc/dp_ucb.cxx

@@ -133,9 +133,7 @@ bool create_folder(
         {
             // make sure the only required bootstrap property is "Title":
             Sequence<beans::Property> const & rProps = info.Properties;
-            if (rProps.getLength() != 1 ||
-                !rProps[ 0 ].Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("Title") ))
+            if ( rProps.getLength() != 1 || rProps[ 0 ].Name != "Title" )
                 continue;
 
             try {

desktop/source/deployment/registry/component/dp_component.cxx

@@ -407,8 +407,7 @@ BackendImpl::ComponentPackageImpl::getRDB() const
             that->initServiceRdbFiles();
         }
     }
-    if (m_loader.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.SharedLibrary") ))
+    if ( m_loader == "com.sun.star.loader.SharedLibrary" )
         return that->m_xNativeRDB;
     else
         return that->m_xCommonRDB;
@@ -420,8 +419,7 @@ BackendImpl::ComponentPackageImpl::getRDB_RO() const
 {
     BackendImpl * that = getMyBackend();
 
-    if (m_loader.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.SharedLibrary") ))
+    if ( m_loader == "com.sun.star.loader.SharedLibrary" )
         return that->m_xNativeRDB_RO;
     else
         return that->m_xCommonRDB_RO;
@@ -498,9 +496,7 @@ void BackendImpl::initServiceRdbFiles()
             &oldRDB, makeURL( getCachePath(), m_commonRDB_RO),
             xCmdEnv, false /* no throw */ );
     }
-    m_commonRDB = m_commonRDB_RO.equalsAsciiL(
-        RTL_CONSTASCII_STRINGPARAM("common.rdb") )
-        ? OUSTR("common_.rdb") : OUSTR("common.rdb");
+    m_commonRDB = m_commonRDB_RO == "common.rdb" ? OUSTR("common_.rdb") : OUSTR("common.rdb");
     if (oldRDB.get().is())
     {
         if (! cacheDir.transferContent(
@@ -729,13 +725,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
     OUString mediaType(mediaType_);
-    if (mediaType.isEmpty() ||
-        mediaType.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM(
-                "application/vnd.sun.star.uno-component") ) ||
-        mediaType.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM(
-                "application/vnd.sun.star.uno-typelibrary") ))
+    if ( mediaType.isEmpty() || mediaType == "application/vnd.sun.star.uno-component" || mediaType == "application/vnd.sun.star.uno-typelibrary" )
     {
         // detect exact media-type:
         ::ucbhelper::Content ucbContent;
@@ -961,11 +951,7 @@ void BackendImpl::unorc_verify_init(
                                 RTL_CONSTASCII_LENGTH("?$ORIGIN/"));
                             state = 2;
                         }
-                        else if (state <= 2 &&
-                                 token.equalsAsciiL(
-                                     RTL_CONSTASCII_STRINGPARAM(
-                                         "${$ORIGIN/${_OS}_${_ARCH}rc:"
-                                         "UNO_SERVICES}")))
+                        else if ( state <= 2 && token == "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}" )
                         {
                             state = 3;
                         }
@@ -1605,9 +1591,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
                 m_loader, url, getRDB());
         // Only write to unorc after successful registration; it may fail if
         // there is no suitable java
-        if (m_loader.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2")) &&
-            !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv))
+        if (m_loader == "com.sun.star.loader.Java2" && !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv))
         {
             that->addToUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv);
             data.javaTypeLibrary = true;

desktop/source/deployment/registry/dp_registry.cxx

@@ -235,10 +235,7 @@ void PackageRegistryImpl::insertBackend(
             //The package backend shall also be called to determine the mediatype
             //(XPackageRegistry.bindPackage) when the URL points to a directory.
             const bool bExtension = mediaType.equals(OUSTR("application/vnd.sun.star.package-bundle"));
-            if (fileFilter.isEmpty() ||
-                fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*.*") ) ||
-                fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ) ||
-                bExtension)
+            if (fileFilter.isEmpty() || fileFilter == "*.*" || fileFilter == "*" || bExtension)
             {
                 m_ambiguousBackends.insert( xBackend );
             }

desktop/source/deployment/registry/package/dp_package.cxx

@@ -1458,17 +1458,13 @@ void BackendImpl::PackageImpl::scanBundle(
         {
             if (!(fullPath.isEmpty() || mediaType.isEmpty()))
                 break;
-            if (attribs[i].Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("FullPath") ))
+            if ( attribs[i].Name == "FullPath" )
                 attribs[i].Value >>= fullPath;
-            else if (attribs[i].Name.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM("MediaType") ))
+            else if ( attribs[i].Name == "MediaType" )
                 attribs[i].Value >>= mediaType;
         }
 
-        if (fullPath.isEmpty() || mediaType.isEmpty() ||
-            mediaType.equalsAsciiL( // opt: exclude common text/xml
-                RTL_CONSTASCII_STRINGPARAM("text/xml") ))
+        if ( fullPath.isEmpty() || mediaType.isEmpty() || mediaType == "text/xml" )// opt: exclude common text/xml
             continue;
 
         String type, subType;

desktop/source/pkgchk/unopkg/unopkg_app.cxx

@@ -284,10 +284,8 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
         osl_getCommandArg( nPos, &subCommand.pData );
         ++nPos;
         subCommand = subCommand.trim();
-        subcmd_add = subCommand.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("add") );
-        subcmd_gui = subCommand.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("gui") );
+        subcmd_add = subCommand == "add";
+        subcmd_gui = subCommand == "gui";
 
         // sun-command options and packages:
         while (nPos < nCount)
@@ -345,8 +343,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
         }
         else
         {
-            if (repository.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("shared") )) {
+            if ( repository == "shared" ) {
                 option_shared = true;
             }
             else if (option_shared) {
@@ -437,9 +434,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
             && ! dp_misc::office_is_running())
             dp_misc::syncRepositories(xCmdEnv);
 
-        if (subcmd_add ||
-            subCommand.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("remove") ))
+        if ( subcmd_add || subCommand == "remove" )
         {
             for ( ::std::size_t pos = 0; pos < cmdPackages.size(); ++pos )
             {

desktop/source/splash/splash.cxx

@@ -359,9 +359,7 @@ OUString implReadBootstrapKey( const OUString& _rKey )
 
 void SplashScreen::loadConfig()
 {
-    _bShowLogo = !implReadBootstrapKey(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Logo"))).
-        equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0"));
+    _bShowLogo = implReadBootstrapKey( "Logo" ) != "0";
 
     OUString sProgressFrameColor = implReadBootstrapKey(
         OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressFrameColor" ) ) );

embeddedobj/source/commonembedding/persistence.cxx

@@ -76,21 +76,15 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence<
 
     for ( sal_Int32 nInd = 0; nInd < aMedDescr.getLength(); nInd++ )
     {
-        if ( aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComponentData" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentTitle" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JumpMark" ) )
-          // || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) makes no sence for embedded objects
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartPresentation" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewData" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewId" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MacroExecutionMode" ) )
-          || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UpdateDocMode" ) )
-          || (aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentBaseURL" ) ) && bCanUseDocumentBaseURL) )
+        if ( aMedDescr[nInd].Name == "ComponentData" || aMedDescr[nInd].Name == "DocumentTitle"
+          || aMedDescr[nInd].Name == "InteractionHandler" || aMedDescr[nInd].Name == "JumpMark"
+          // || aMedDescr[nInd].Name == "Password" // makes no sence for embedded objects
+          || aMedDescr[nInd].Name == "Preview" || aMedDescr[nInd].Name == "ReadOnly"
+          || aMedDescr[nInd].Name == "StartPresentation" || aMedDescr[nInd].Name == "RepairPackage"
+          || aMedDescr[nInd].Name == "StatusIndicator" || aMedDescr[nInd].Name == "ViewData"
+          || aMedDescr[nInd].Name == "ViewId" || aMedDescr[nInd].Name == "MacroExecutionMode"
+          || aMedDescr[nInd].Name == "UpdateDocMode"
+          || (aMedDescr[nInd].Name == "DocumentBaseURL" && bCanUseDocumentBaseURL) )
         {
             aResult.realloc( ++nResLen );
             aResult[nResLen-1] = aMedDescr[nInd];

embeddedobj/source/msole/olecomponent.cxx

@@ -1591,7 +1591,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
     // TODO: Investigate if there is already the format name
     //       and whether this format is really required
     else if ( aFlavor.DataType == getCppuType( ( const uno::Reference< io::XInputStream >* ) 0 )
-            && aFlavor.MimeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/x-openoffice-contentstream" ) ) )
+            && aFlavor.MimeType == "application/x-openoffice-contentstream" )
     {
         // allow to retrieve stream-representation of the object persistence
         bSupportedFlavor = sal_True;

embeddedobj/test/MainThreadExecutor/xexecutor.cxx

@@ -68,7 +68,7 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na
 {
     uno::Reference< task::XJob > xJob;
 
-    if ( aArguments.getLength() > 0 && aArguments[0].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
+    if ( aArguments.getLength() > 0 && aArguments[0].Name == "JobToExecute" )
         aArguments[0].Value >>= xJob;
 
     if ( !xJob.is() )

embedserv/source/embed/guid.cxx

@@ -193,7 +193,7 @@
             if ( aAnyProp >>= aProperties ) )
             {
                 for ( sal_Int32 nInd = 0; nInd < aProperties.getLength; nInd++ )
-                if ( aProperties[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) )
+                if ( aProperties[nInd].Name == "UIName" )
                 {
                     aProperties[nInd].Value >>= aResult;
                     break;

extensions/source/bibliography/framectr.cxx

@@ -221,10 +221,7 @@ BibFrameController_Impl::~BibFrameController_Impl()
 
 sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return (
-            sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Bibliography")) ||
-            sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Controller"))
-           );
+    return ( sServiceName == "com.sun.star.frame.Bibliography" || sServiceName == "com.sun.star.frame.Controller" );
 }
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException)
@@ -574,8 +571,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         {
             RemoveFilter();
         }
-        else if(_rURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:5503")) ||
-                aCommand.EqualsAscii("CloseDoc"))
+        else if( _rURL.Complete == "slot:5503" || aCommand.EqualsAscii("CloseDoc") )
         {
             Application::PostUserEvent( STATIC_LINK( this, BibFrameController_Impl,
                                         DisposeHdl ), 0 );
@@ -740,10 +736,10 @@ void BibFrameController_Impl::addStatusListener(
         uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getDataSources();
         aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0));
     }
-    else if(aURL.Path == C2U("Bib/sdbsource") ||
-            aURL.Path == C2U("Bib/Mapping") ||
-            aURL.Path == C2U("Bib/autoFilter") ||
-            aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bib/standardFilter")))
+    else if( aURL.Path == "Bib/sdbsource" ||
+             aURL.Path == "Bib/Mapping" ||
+             aURL.Path == "Bib/autoFilter" ||
+             aURL.Path == "Bib/standardFilter" )
     {
         aEvent.IsEnabled  = sal_True;
     }

extensions/source/logging/loggerconfig.cxx

@@ -133,7 +133,7 @@ namespace logging
         //----------------------------------------------------------------
         void    lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const ::rtl::OUString& _rSettingName, Any& _inout_rSettingValue )
         {
-            if ( !_rSettingName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileURL" ) ) )
+            if ( _rSettingName != "FileURL" )
                 // not interested in this setting
                 return;
 

extensions/source/propctrlr/eventhandler.cxx

@@ -271,7 +271,7 @@ namespace pcr
 
                 aScriptEvent = *pAssignedEvent;
 
-                if ( !aScriptEvent.ScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarBasic" ) ) )
+                if ( aScriptEvent.ScriptType != "StarBasic" )
                     continue;
 
                 // this is an old-style macro specification:

fileaccess/source/FileAccess.cxx

@@ -461,8 +461,7 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL )
             if ( rProps.getLength() != 1 )
                 continue;
 
-            if ( !rProps[ 0 ].Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+            if ( rProps[ 0 ].Name != "Title" )
                 continue;
 
             Sequence<rtl::OUString> aNames(1);
@@ -735,8 +734,7 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL,
             if ( rProps.getLength() != 1 )
                 continue;
 
-            if ( !rProps[ 0 ].Name.equalsAsciiL(
-                     RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+            if ( rProps[ 0 ].Name != "Title" )
                 continue;
 
             Sequence<rtl::OUString> aNames(1);

filter/source/config/cache/filtercache.cxx

@@ -435,7 +435,7 @@ CacheItem FilterCache::getItem(      EItemType        eType,
 
         // In Standalone-Impress the module WriterWeb is not installed
         // but it is there to load help pages
-        bool bIsHelpFilter = sItem.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_web_HTML_help"));
+        bool bIsHelpFilter = sItem == "writer_web_HTML_help";
 
         if ( !bIsHelpFilter && !impl_isModuleInstalled(sDocService) )
         {

filter/source/config/cache/lateinitlistener.cxx

@@ -80,11 +80,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE
     // a) indicate completed open of the first document in which case launch thread
     // b) indicate close of application without any documents opened, in which case skip launching thread but drop references break cyclic dependencies in
     // case of e.g. cancel from open/new database wizard or impress wizard
-    if (
-        (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnNew"))) ||
-        (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnLoad"))) ||
-        (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnCloseApp")))
-       )
+    if ( aEvent.EventName == "OnNew" || aEvent.EventName == "OnLoad" || aEvent.EventName == "OnCloseApp" )
     {
         // this thread must be started one times only ...
         // cancel listener connection before!
@@ -108,7 +104,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE
         aLock.clear();
         // <- SAFE
 
-        if (!aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnCloseApp")))
+        if ( aEvent.EventName != "OnCloseApp" )
         {
             rtl::Reference< LateInitThread >(new LateInitThread())->launch();
                 //TODO: a protocol is missing how to join with the launched

filter/source/config/cache/typedetection.cxx

@@ -251,21 +251,13 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
             // one type TextAscii and two filters registered for these one type.
             // But then we loose automatic opening of CSV files in calc instead of opening these files
             // inside writer.
-            if (
-                (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))) &&
-                (
-                    (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text"))) ||
-                    (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text_encoded")))
-                )
-               )
+            if ( sDocumentService == "com.sun.star.sheet.SpreadsheetDocument"
+                && ( sRealType == "writer_Text" || sRealType == "writer_Text_encoded" ) )
             {
                 sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_Text_txt_csv_StarCalc" ));
             }
             else
-            if (
-                (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))) &&
-                (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc_Text_txt_csv_StarCalc")))
-               )
+            if ( sDocumentService == "com.sun.star.text.TextDocument" && sRealType == "calc_Text_txt_csv_StarCalc" )
             {
                 sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_Text" ));
             }

filter/source/flash/swfexporter.cxx

@@ -517,7 +517,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b
         if( xShape.is() )
         {
             Reference< XShapes > xShapes2( xShape, UNO_QUERY );
-            if( xShapes2.is() && xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape")))
+            if( xShapes2.is() && xShape->getShapeType() == "com.sun.star.drawing.GroupShape" )
                 // export the contents of group shapes, but we only ever stream at the top
                 // recursive level anyway, so pass false for streaming.
                 exportShapes( xShapes2, false, bMaster);
@@ -605,8 +605,7 @@ void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster )
             GDIMetaFile     aMtf;
             Reference< XComponent > xComponent( xShape, UNO_QUERY );
 
-            bool bIsOleObject = xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape"))
-                                || xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape"));
+            bool bIsOleObject = xShape->getShapeType() == "com.sun.star.presentation.OLE2Shape" || xShape->getShapeType() == "com.sun.star.drawing.OLE2Shape";
 
             getMetaFile( xComponent, aMtf );
 

filter/source/msfilter/eschesdo.cxx

@@ -248,7 +248,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
 
             rtl::OUString sCustomShapeType;
             MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType );
-            if ( sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-502ad400" ) ) || sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-60da8460" ) ) )
+            if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" )
             {
                 ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
                 if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )

filter/source/svg/svgexport.cxx

@@ -1434,9 +1434,9 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
                     OUString aShapeClass = implGetClassFromShape( rxShape );
                     if( mbPresentation )
                     {
-                        sal_Bool bIsPageNumber = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Slide_Number" ) );
-                        sal_Bool bIsFooter = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Footer" ) );
-                        sal_Bool bIsDateTime = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Date/Time" ) );
+                        sal_Bool bIsPageNumber = aShapeClass == "Slide_Number";
+                        sal_Bool bIsFooter = aShapeClass == "Footer";
+                        sal_Bool bIsDateTime = aShapeClass == "Date/Time";
                         if( bIsPageNumber || bIsDateTime || bIsFooter )
                         {
                             // to notify to the SVGActionWriter::ImplWriteActions method

filter/source/svg/svgreader.cxx

@@ -181,7 +181,7 @@ struct AnnotatingVisitor
                 {
                     const rtl::OUString sValue(xNode->getNodeValue());
                     ElementRefMapType::iterator aFound=maGradientIdMap.end();
-                    if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
+                    if ( sValue.copy(0,1) == "#" )
                         aFound = maGradientIdMap.find(sValue.copy(1));
                     else
                         aFound = maGradientIdMap.find(sValue);
@@ -219,7 +219,7 @@ struct AnnotatingVisitor
                 {
                     const rtl::OUString sValue(xNode->getNodeValue());
                     ElementRefMapType::iterator aFound=maGradientIdMap.end();
-                    if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
+                    if ( sValue.copy(0,1) == "#" )
                         aFound = maGradientIdMap.find(sValue.copy(1));
                     else
                         aFound = maGradientIdMap.find(sValue);
@@ -826,7 +826,7 @@ struct AnnotatingVisitor
             case XML_HREF:
             {
                 ElementRefMapType::iterator aFound=maStopIdMap.end();
-                if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
+                if ( sValue.copy(0,1) == "#" )
                     aFound = maStopIdMap.find(sValue.copy(1));
                 else
                     aFound = maStopIdMap.find(sValue);
@@ -2430,7 +2430,7 @@ struct ShapeRenderingVisitor
                 aFont.SetColor(getVclColor(maCurrState.maFillColor));
                 aFont.SetFillColor(getVclColor(maCurrState.maFillColor));
 
-                if( !maCurrState.maFontStyle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("normal")) )
+                if( maCurrState.maFontStyle != "normal" )
                     aFont.SetItalic(ITALIC_NORMAL); // TODO: discriminate
                 if( maCurrState.mnFontWeight != 400.0 )
                     aFont.SetWeight(WEIGHT_BOLD); // TODO: discriminate

filter/source/t602/t602filter.cxx

@@ -155,19 +155,18 @@ T602ImportFilter::~T602ImportFilter()
     const PropertyValue * pValue = Descriptor.getConstArray();
     for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
-        if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+        if ( pValue[i].Name == "InputStream" )
             pValue[i].Value >>= mxInputStream;
-/*        else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "FilterName" ) ) )
+/*        else if ( pValue[i].Name == "FilterName" )
             pValue[i].Value >>= aFilterName;
-        else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+        else if ( pValue[i].Name == "TypeName" )
             pValue[i].Value >>= aTypeName; */
     }
 
     if (!mxInputStream.is())
         return ::rtl::OUString();
 
-/*    if ( aFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "T602Document" ) )  ||
-           aTypeName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_T602_Document" ) ) )
+/*    if ( aFilterName == "T602Document" || aTypeName == "writer_T602_Document" )
         // preselection by type (extension) or filter name: no reason to check type
         return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_T602_Document" ) ); */
 
@@ -210,7 +209,7 @@ void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments )
         nLength = aAnySeq.getLength();
         for ( sal_Int32 i = 0 ; i < nLength; i++)
         {
-            if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+            if ( pValue[i].Name == "Type" )
             {
                 pValue[i].Value >>= msFilterName;
                 break;
@@ -262,7 +261,7 @@ sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star
     OUString sURL;
     for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
-        if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+        if ( pValue[i].Name == "InputStream" )
             pValue[i].Value >>= mxInputStream;
     }
 
@@ -893,8 +892,7 @@ OUString T602ImportFilter_getImplementationName ()
 sal_Bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName )
     throw (RuntimeException)
 {
-    return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
-        ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+    return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
 }
 
 Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames(  )
@@ -1221,7 +1219,7 @@ OUString T602ImportFilterDialog_getImplementationName ()
 sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName )
     throw (RuntimeException)
 {
-    return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) );
+    return ServiceName == SERVICE_NAME;
 }
 
 Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames(  )

filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx

@@ -391,8 +391,7 @@ OUString XmlFilterAdaptor_getImplementationName ()
 sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName )
     throw (RuntimeException)
 {
-    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
-           ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) );
+    return ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2;
 }
 Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames(  )
     throw (RuntimeException)

filter/source/xmlfilterdetect/filterdetect.cxx

@@ -154,15 +154,15 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
     sal_Int32 location=nLength;
     for (sal_Int32 i = 0 ; i < nLength; i++)
     {
-        if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ))
+        if ( pValue[i].Name == "TypeName" )
         {
             location=i;
         }
-        else if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ))
+        else if ( pValue[i].Name == "URL" )
         {
             pValue[i].Value >>= sUrl;
         }
-        else if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ))
+        else if ( pValue[i].Name == "InputStream" )
         {
             pValue[i].Value >>= xInStream ;
         }
@@ -207,7 +207,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
             {
                 ::rtl::OUString tmpStr;
                 lProps[j].Value >>=tmpStr;
-                if ((lProps[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat"))) && !tmpStr.isEmpty())
+                if ( lProps[j].Name == "ClipboardFormat" && !tmpStr.isEmpty() )
                 {
                     sTypeName = supportedByType(tmpStr,resultString, myTypes[i]);
                 }
@@ -248,18 +248,18 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments )
         for ( sal_Int32 i = 0 ; i < nLength; i++)
         {
 
-            if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+            if ( pValue[i].Name == "Type" )
             {
                  pValue[i].Value >>= msFilterName;
 
             }
-            else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "UserData" ) ) )
+            else if ( pValue[i].Name == "UserData" )
             {
 
                 pValue[i].Value >>= msUserData;
 
             }
-            else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TemplateName" ) ) )
+            else if ( pValue[i].Name == "TemplateName" )
             {
 
               pValue[i].Value>>=msTemplateName;

filter/source/xsltdialog/typedetectionimport.cxx

@@ -254,7 +254,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const
     if( maStack.empty() )
     {
         // #109668# support legacy name as well on import
-        if( aName == sRootNode || aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oor:node")) )
+        if( aName == sRootNode || aName == "oor:node" )
         {
             eNewState = e_Root;
         }

filter/source/xsltdialog/xmlfiltersettingsdialog.cxx

@@ -1161,7 +1161,7 @@ void XMLFilterSettingsDialog::initFilterList()
                     continue;
 
                 // if this is not an XSLTFilter entry, skip it
-                if( !aUserData[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) ) )
+                if( aUserData[0] != "com.sun.star.documentconversion.XSLTFilter" )
                     continue;
 
                 // get filter information from userdata

forms/source/component/Filter.cxx

@@ -588,16 +588,14 @@ namespace frm
                 if (xVclWindow.is())
                 {
                     Any aValue;
-                    if  (   aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) )
+                    if  (   aText == "1"
                         ||  aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("TRUE"))
                         ||  aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IS TRUE"))
                         )
                     {
                         aValue <<= (sal_Int32)STATE_CHECK;
                     }
-                    else if (   aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "0" ) )
-                            ||  aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE"))
-                            )
+                    else if ( aText == "0" || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE")) )
                     {
                         aValue <<= (sal_Int32)STATE_NOCHECK;
                     }