remove unnecessary RTL_CONSTASCII_STRINGPARAM in OUString::equalsL

Convert code like this:
if (aStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
to:
if (aStr == "rem")
which compiles down to the same code.

Change-Id: I2dfa0f0a457c465948ecf720daaa45ff29d69de9

17 files changed, 98 insertions, 100 deletions

diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index c9bac083beb6..580f2842c8b3 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -368,7 +368,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*
                 {
                     reType = TT_KEYWORDS;
 
-                    if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
+                    if( aByteStr == "rem" )
                     {
                         // Remove all characters until end of line or EOF
                         sal_Unicode cPeek = *pos;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 21ed0d2ccbde..1e7b6b49c2b2 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -279,15 +279,13 @@ namespace connectivity
                                         continue;
                                     const OString sIniKey = comphelper::string::getToken(sLine, 0, '=');
                                     const OString sValue = comphelper::string::getToken(sLine, 1, '=');
-                                    if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hsqldb.compatible_version")))
+                                    if( sIniKey == "hsqldb.compatible_version" )
                                     {
                                         sVersionString = sValue;
                                     }
                                     else
                                     {
-                                        if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("version"))
-                                            &&  ( sVersionString.isEmpty() )
-                                            )
+                                        if (sIniKey == "version" && sVersionString.isEmpty())
                                         {
                                             sVersionString = sValue;
                                         }
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index a8145bb9d2f6..9b60ea57a72e 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1653,7 +1653,7 @@ namespace cppcanvas
                         // XPATHSTROKE_SEQ_BEGIN comment
 
                         // Handle drawing layer fills
-                        else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+                        else if( pAct->GetComment() == "XPATHFILL_SEQ_BEGIN" )
                         {
                             const sal_uInt8* pData = pAct->GetData();
                             if ( pData )
@@ -1769,7 +1769,7 @@ namespace cppcanvas
                             }
                         }
                         // Handle drawing layer fills
-                        else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS")) ) {
+                        else if( pAct->GetComment() == "EMF_PLUS" ) {
                             static int count = -1, limit = 0x7fffffff;
                             if (count == -1) {
                                 count = 0;
@@ -1782,7 +1782,7 @@ namespace cppcanvas
                             if (count < limit)
                                 processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas );
                             count ++;
-                        } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) {
+                        } else if( pAct->GetComment() == "EMF_PLUS_HEADER_INFO" ) {
                             SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pAct->GetDataSize ());
 
                             SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ);
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 644df9427785..b71b56ea332f 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -352,7 +352,7 @@ void ODbaseIndexDialog::Init()
                 aNDX = aKeyName.copy(0,3);
 
                 // yes -> add to the tables index list
-                if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
+                if (aNDX == "NDX")
                 {
                     aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding());
                     rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) );
@@ -455,7 +455,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
         aNDX = aKeyName.copy(0,3);
 
         //...if yes, delete index file, nKey is at subsequent key
-        if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
+        if (aNDX == "NDX")
         {
             aInfFile.DeleteKey(aKeyName);
             nKeyCnt--;
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 2ee2b4964b7d..101e235a337c 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -66,7 +66,7 @@ static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDesc
     }
 
     OString aBaseName = rPath.copy(nPos+1);
-    if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so")))
+    if (aBaseName == "libnullplugin.so")
     {
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "don't like %s\n", aBaseName.getStr() );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 4d78be88dbc8..c54010439a42 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1090,7 +1090,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
 
     OString aMethodName( GetExecMethod() );
     if ( !aMethodName.isEmpty() &&
-         !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")) )
+         aMethodName != "NoExec" )
     {
         sal_Bool bIn = sal_False;
         for( size_t n = 0; n < rList.size(); n++ )
@@ -1115,7 +1115,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
 
     aMethodName = GetStateMethod();
     if (!aMethodName.isEmpty() &&
-        !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoState")))
+        aMethodName != "NoState")
     {
         sal_Bool bIn = sal_False;
         for ( size_t n=0; n < rList.size(); n++ )
@@ -1252,7 +1252,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
 
         // write ExecMethod, with standard name if not specified
         if( !GetExecMethod().isEmpty() &&
-            !GetExecMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")))
+            GetExecMethod() != "NoExec")
         {
             rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
                     << GetExecMethod().getStr() << ')';
@@ -1263,7 +1263,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
 
         // write StateMethod, with standard name if not specified
         if( !GetStateMethod().isEmpty() &&
-            !GetStateMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoState")))
+            GetStateMethod() != "NoState")
         {
             rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
                     << GetStateMethod().getStr() << ')';
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 405716719b44..5f40c106bc91 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -507,18 +507,18 @@ int Export::Execute( int nToken, const char * pToken )
             OString sValue = sToken.getToken(0, '=', n);
             CleanValue( sValue );
             sKey = sKey.toAsciiUpperCase();
-            if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("IDENTIFIER")))
+            if (sKey == "IDENTIFIER")
             {
                 OString sId(
                     sValue.replaceAll("\t", OString()).
                     replaceAll(" ", OString()));
                 pResData->SetId(sId, ID_LEVEL_IDENTIFIER);
             }
-            else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HELPID")))
+            else if (sKey == "HELPID")
             {
                 pResData->sHelpId = sValue;
             }
-            else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
+            else if (sKey =="STRINGLIST")
             {
                 pResData->bList = sal_True;
                 nList = LIST_STRING;
@@ -526,7 +526,7 @@ int Export::Execute( int nToken, const char * pToken )
                 nListIndex = 0;
                 nListLevel = 0;
             }
-            else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
+            else if (sKey == "FILTERLIST")
             {
                 pResData->bList = sal_True;
                 nList = LIST_FILTER;
@@ -534,7 +534,7 @@ int Export::Execute( int nToken, const char * pToken )
                 nListIndex = 0;
                 nListLevel = 0;
             }
-            else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
+            else if (sKey == "UIENTRIES")
             {
                 pResData->bList = sal_True;
                 nList = LIST_UIENTRIES;
@@ -564,7 +564,7 @@ int Export::Execute( int nToken, const char * pToken )
                 OString sValue = sToken.getToken(1, '=');
                 CleanValue( sValue );
                 sKey = sKey.toAsciiUpperCase();
-                if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
+                if (sKey == "STRINGLIST")
                 {
                     pResData->bList = sal_True;
                     nList = LIST_STRING;
@@ -572,7 +572,7 @@ int Export::Execute( int nToken, const char * pToken )
                     nListIndex = 0;
                     nListLevel = 0;
                 }
-                else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
+                else if (sKey == "FILTERLIST")
                 {
                     pResData->bList = sal_True;
                     nList = LIST_FILTER;
@@ -580,7 +580,7 @@ int Export::Execute( int nToken, const char * pToken )
                     nListIndex = 0;
                     nListLevel = 0;
                 }
-                else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("PAIREDLIST")))
+                else if (sKey == "PAIREDLIST")
                 {
                     pResData->bList = sal_True;
                     nList = LIST_PAIRED;
@@ -588,7 +588,7 @@ int Export::Execute( int nToken, const char * pToken )
                     nListIndex = 0;
                     nListLevel = 0;
                 }
-                else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("ITEMLIST")))
+                else if (sKey == "ITEMLIST")
                 {
                     pResData->bList = sal_True;
                     nList = LIST_ITEM;
@@ -596,7 +596,7 @@ int Export::Execute( int nToken, const char * pToken )
                     nListIndex = 0;
                     nListLevel = 0;
                 }
-                else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
+                else if (sKey == "UIENTRIES")
                 {
                     pResData->bList = sal_True;
                     nList = LIST_UIENTRIES;
@@ -648,11 +648,11 @@ int Export::Execute( int nToken, const char * pToken )
                 if ( !sText.isEmpty() && !sLang.isEmpty() )
                 {
                     sKey = sKey.toAsciiUpperCase();
-                    if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("TEXT")) ||
-                        sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("MESSAGE"))  ||
-                        sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CUSTOMUNITTEXT"))  ||
-                        sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SLOTNAME"))  ||
-                        sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UINAME")))
+                    if (sKey == "TEXT" ||
+                        sKey == "MESSAGE"  ||
+                        sKey == "CUSTOMUNITTEXT"  ||
+                        sKey == "SLOTNAME"  ||
+                        sKey == "UINAME")
                     {
                         SetChildWithText();
                         if ( sLangIndex.equalsIgnoreAsciiCase("en-US") )
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 7000cd0715d5..42e18a7b62b6 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -117,7 +117,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
             // lang: field
             if (getTag(aLine, "lang: ", aTagValue))
             {
-                if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("<none>")))
+                if (aTagValue == "<none>")
                     nLng = LANGUAGE_NONE;
                 else
                     nLng = LanguageTag::convertToLanguageTypeWithFallback(
@@ -127,7 +127,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
             // type: negative / positive
             if (getTag(aLine, "type: ", aTagValue))
             {
-                if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("negative")))
+                if (aTagValue == "negative")
                     bNeg = sal_True;
                 else
                     bNeg = sal_False;
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index c230710dffef..12bd4b4cb209 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1976,71 +1976,71 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
 {
     DefTokenId  eId = ocNoName;
 
-    if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FACT")))
+    if (rTest == "FACT")
             eId = ocFact;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ISEMPTY")))
+    else if (rTest == "ISEMPTY")
             eId=ocIsEmpty;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("DEGTORAD")))
+    else if (rTest == "DEGTORAD")
             eId=ocRad;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("RADTODEG")))
+    else if (rTest == "RADTODEG")
             eId=ocDeg;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SIGN")))
+    else if (rTest == "SIGN")
             eId=ocPlusMinus;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOSH")))
+    else if (rTest == "ACOSH")
             eId=ocArcCosHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOTH")))
+    else if (rTest == "ACOTH")
             eId=ocArcCotHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ASINH")))
+    else if (rTest == "ASINH")
             eId=ocArcSinHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ATANH")))
+    else if (rTest == "ATANH")
             eId=ocArcTanHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COSH")))
+    else if (rTest == "COSH")
             eId=ocCosHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COTH")))
+    else if (rTest == "COTH")
             eId=ocCotHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SINH")))
+    else if (rTest == "SINH")
             eId=ocSinHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TANH")))
+    else if (rTest == "TANH")
             eId=ocTanHyp;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("EVEN")))
+    else if (rTest == "EVEN")
             eId=ocIsEven;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ODD")))
+    else if (rTest == "ODD")
             eId=ocIsOdd;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOT")))
+    else if (rTest == "ACOT")
             eId=ocArcCot;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COT")))
+    else if (rTest == "COT")
             eId=ocCot;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TRUNC")))
+    else if (rTest == "TRUNC")
             eId=ocTrunc;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GEOMEAN")))
+    else if (rTest == "GEOMEAN")
             eId=ocGeoMean;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("HARMEAN")))
+    else if (rTest == "HARMEAN")
             eId=ocHarMean;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CORREL")))
+    else if (rTest == "CORREL")
             eId=ocCorrel;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("MEDIAN")))
+    else if (rTest == "MEDIAN")
             eId=ocMedian;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COV")))
+    else if (rTest == "COV")
             eId=ocCovar;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SKEWNESS")))
+    else if (rTest == "SKEWNESS")
             eId=ocSchiefe;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CHITEST")))
+    else if (rTest == "CHITEST")
             eId=ocChiTest;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FTEST")))
+    else if (rTest == "FTEST")
             eId=ocFTest;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("AVEDEV")))
+    else if (rTest == "AVEDEV")
             eId=ocAveDev;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PRODUCT")))
+    else if (rTest == "PRODUCT")
             eId=ocProduct;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PERMUT")))
+    else if (rTest == "PERMUT")
             eId=ocVariationen;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GAMMALN")))
+    else if (rTest == "GAMMALN")
             eId=ocGammaLn;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("POISSON")))
+    else if (rTest =="POISSON")
             eId=ocPoissonDist;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("NORMAL")))
+    else if (rTest == "NORMAL")
             eId=ocNormDist;
-    else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CRITBINOMIAL")))
+    else if (rTest == "CRITBINOMIAL")
             eId=ocKritBinom;
     return eId;
 }
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index c1343d9c891b..4cef68866569 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -458,7 +458,7 @@ bool PDFContainer::emitSubElements( EmitContext& rWriteContext ) const
         if( rWriteContext.m_bDecrypt )
         {
             const PDFName* pName = dynamic_cast<PDFName*>(m_aSubElements[i]);
-            if (pName && pName->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("Encrypt")))
+            if (pName && pName->m_aName == "Encrypt")
             {
                 i++;
                 continue;
@@ -695,7 +695,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const
             }
 
             // is the (first) filter FlateDecode ?
-            if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+            if (pFilter && pFilter->m_aName == "FlateDecode")
             {
                 bIsDeflated = true;
             }
@@ -850,7 +850,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
                     if( it != pClone->m_pStream->m_pDict->m_aMap.end() )
                     {
                         PDFName* pFilter = dynamic_cast<PDFName*>(it->second);
-                        if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+                        if (pFilter && pFilter->m_aName == "FlateDecode")
                             pClone->m_pStream->m_pDict->eraseValue( "Filter" );
                         else
                         {
@@ -858,7 +858,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
                             if( pArray && ! pArray->m_aSubElements.empty() )
                             {
                                 pFilter = dynamic_cast<PDFName*>(pArray->m_aSubElements.front());
-                                if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+                                if (pFilter && pFilter->m_aName == "FlateDecode")
                                 {
                                     delete pFilter;
                                     pArray->m_aSubElements.erase( pArray->m_aSubElements.begin() );
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 869b29fb6f17..8205f1751f84 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -51,15 +51,15 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
         {
             nIndex = 0;
             OString sTmp(sLine.getToken(0, ':', nIndex));
-            if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML")))
+            if (sTmp == "StartHTML")
                 nStt = sLine.copy(nIndex).toInt32();
-            else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML")))
+            else if (sTmp == "EndHTML")
                 nEnd = sLine.copy(nIndex).toInt32();
-            else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartFragment")))
+            else if (sTmp == "StartFragment")
                 nFragStart = sLine.copy(nIndex).toInt32();
-            else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndFragment")))
+            else if (sTmp == "EndFragment")
                 nFragEnd = sLine.copy(nIndex).toInt32();
-            else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL")))
+            else if (sTmp == "SourceURL")
                 sBaseURL = OStringToOUString( sLine.copy(nIndex), RTL_TEXTENCODING_UTF8 );
 
             if (nEnd >= 0 && nStt >= 0 &&
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 95f5639157dd..0509b7c8309e 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -61,7 +61,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
     if ( ( rMtf.GetActionSize() >= 2 )
             && ( rMtf.FirstAction()->GetType() == META_EPS_ACTION )
             && ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION )
-            && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic")) ) )
+            && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment() == "EPSReplacementGraphic" ) )
         pComment = (const MetaCommentAction*)rMtf.GetAction( 1 );
 
     return pComment;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 8e0333d20843..2bda34812975 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -543,13 +543,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         // der erste Buchstabe reicht meistens
         switch( rInfo.aToken[0] )
         {
-        case 'A': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_address)),
+        case 'A': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address,
                             "Doch kein ADDRESS?" );
                     rInfo.bParaPossible = sal_True;
                     rHWrt.bNoAlign = sal_True;
                     break;
 
-        case 'B': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_blockquote)),
+        case 'B': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote,
                             "Doch kein BLOCKQUOTE?" );
                     rInfo.bParaPossible = sal_True;
                     rHWrt.bNoAlign = sal_True;
@@ -561,7 +561,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
                     }
                     else
                     {
-                        OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_preformtxt)),
+                        OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt,
                                 "Doch kein PRE?" );
                         if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken )
                         {
@@ -576,10 +576,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
                     }
                     break;
 
-        case 'D': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) ||
-                            rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)),
+        case 'D': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt ||
+                            rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dd,
                             "Doch kein DD/DT?" );
-                    bDT = rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt));
+                    bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt;
                     rInfo.bParaPossible = !bDT;
                     rHWrt.bNoAlign = sal_True;
                     bForceDL = sal_True;
@@ -1031,9 +1031,9 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(),
                                     sal_False );
         rHWrt.bLFPossible =
-            !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) &&
-            !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)) &&
-            !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_li));
+            rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dt &&
+            rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dd &&
+            rInfo.aToken != OOO_STRING_SVTOOLS_HTML_li;
     }
     if( rInfo.bOutDiv )
     {
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index 224dab5a4f3a..79162c16f8aa 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -48,7 +48,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) :
 
 bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type")))
+    if (rKey == "type")
         Reload(rValue.toInt32());
     else
         return ListBox::set_property(rKey, rValue);
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 6ca213bce526..9af1dbb4ad4e 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -57,23 +57,23 @@ void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKe
     {
         OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex );
         sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 );
-        if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) )
+        if( sBaseKey == "HKEY_CURRENT_USER" )
         {
             hBaseKey = HKEY_CURRENT_USER;
         }
-        else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_LOCAL_MACHINE")) )
+        else if( sBaseKey == "HKEY_LOCAL_MACHINE" )
         {
             hBaseKey = HKEY_LOCAL_MACHINE;
         }
-        else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CLASSES_ROOT")) )
+        else if( sBaseKey == "HKEY_CLASSES_ROOT" )
         {
             hBaseKey = HKEY_CLASSES_ROOT;
         }
-        else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_USERS")) )
+        else if( sBaseKey == "HKEY_USERS" )
         {
             hBaseKey = HKEY_USERS;
         }
-        else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_CONFIG")) )
+        else if( sBaseKey == "HKEY_CURRENT_CONFIG" )
         {
             hBaseKey = HKEY_CURRENT_CONFIG;
         }
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index adf9d418bbdf..9b9e9eca2aa1 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -246,7 +246,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
             bPDFDevice = true;
             rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32();
         }
-        else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData")))
+        else if (aLine == "PPDContexData")
         {
             if( bPrinter )
             {
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index ed2cdea3958a..8c5950783383 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -980,17 +980,17 @@ void PPDParser::parse( ::std::list< OString >& rLines )
             parseOpenUI( aCurrentLine );
             continue;
         }
-        else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OrderDependency")))
+        else if (aKey == "OrderDependency")
         {
             parseOrderDependency( aCurrentLine );
             continue;
         }
-        else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIConstraints")) ||
-                 aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("NonUIConstraints")))
+        else if (aKey == "UIConstraints" ||
+                 aKey == "NonUIConstraints")
         {
             continue; // parsed in pass 2
         }
-        else if( aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CustomPageSize")) ) // currently not handled
+        else if( aKey == "CustomPageSize" ) // currently not handled
             continue;
 
         // default values are parsed in pass 2
@@ -1278,15 +1278,15 @@ void PPDParser::parseOrderDependency(const OString& rLine)
         pKey = keyit->second;
 
     pKey->m_nOrderDependency = nOrder;
-    if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("ExitServer")) )
+    if( aSetup == "ExitServer" )
         pKey->m_eSetupType = PPDKey::ExitServer;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("Prolog")) )
+    else if( aSetup == "Prolog" )
         pKey->m_eSetupType = PPDKey::Prolog;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("DocumentSetup")) )
+    else if( aSetup == "DocumentSetup" )
         pKey->m_eSetupType = PPDKey::DocumentSetup;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("PageSetup")) )
+    else if( aSetup == "PageSetup" )
         pKey->m_eSetupType = PPDKey::PageSetup;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("JCLSetup")) )
+    else if( aSetup == "JCLSetup" )
         pKey->m_eSetupType = PPDKey::JCLSetup;
     else
         pKey->m_eSetupType = PPDKey::AnySetup;