remove unnecessary RTL_CONSTASCII_STRINGPARAM in OString::equalsIgnoreAsciiL

Convert code like:
aStr.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))
to:
aStr.equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN")
which compiles down to the same code.

Change-Id: Ia69289d853d292b2f27b68863cb6f6ecdbf1a71e

15 files changed, 47 insertions, 52 deletions

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 9b60ea57a72e..d44567cc5c57 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1616,7 +1616,7 @@ namespace cppcanvas
                         MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
 
                         // Handle gradients
-                        if (pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+                        if (pAct->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN"))
                         {
                             MetaGradientExAction* pGradAction = NULL;
                             bool bDone( false );
@@ -1632,7 +1632,7 @@ namespace cppcanvas
 
                                     // skip broken-down rendering, output gradient when sequence is ended
                                     case META_COMMENT_ACTION:
-                                        if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) )
+                                        if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") )
                                         {
                                             bDone = true;
 
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 6172f4047653..00d00591b73c 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -3085,7 +3085,7 @@ namespace
                     // and makes the code less dependent from those Metafile Add-Ons
                     const MetaCommentAction* pA = (const MetaCommentAction*)pAction;
 
-                    if (pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+                    if (pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN"))
                     {
                         // XGRAD_SEQ_BEGIN, XGRAD_SEQ_END should be supported since the
                         // pure recorded paint of the gradients uses the XOR paint functionality
@@ -3105,7 +3105,7 @@ namespace
                             }
                             else if(META_COMMENT_ACTION == pAction->GetType())
                             {
-                                if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")))
+                                if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END"))
                                 {
                                     bDone = true;
                                 }
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6065416df5c3..97eddc7e067a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1912,11 +1912,11 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
                                         if( nType == META_COMMENT_ACTION )
                                         {
                                             const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
-                                            if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")) ) )
+                                            if( ( pA->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_BEGIN") ) )
                                             {
                                                 bIsTextShapeStarted = sal_True;
                                             }
-                                            else if( ( pA->GetComment().equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_PAINTSHAPE_END" ) ) ) )
+                                            else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) )
                                             {
                                                 bIsTextShapeStarted = sal_False;
                                             }
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 3a26b52c4c05..a0ec7daf03bc 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -591,11 +591,11 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
             {
                 const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
                 const OString& rsComment = pA->GetComment();
-                if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOL" ) ) )
+                if( rsComment.equalsIgnoreAsciiCase( "XTEXT_EOL" ) )
                 {
                     bEOL = true;
                 }
-                else if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOP" ) ) )
+                else if( rsComment.equalsIgnoreAsciiCase( "XTEXT_EOP" ) )
                 {
                     bEOP = true;
 
@@ -630,7 +630,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
                         }
                     }
                 }
-                else if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_PAINTSHAPE_END" ) ) )
+                else if( rsComment.equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) )
                 {
                     bETS = true;
                 }
@@ -708,7 +708,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
             {
                 const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
                 const OString& rsComment = pA->GetComment();
-                if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOP" ) ) )
+                if( rsComment.equalsIgnoreAsciiCase( "XTEXT_EOP" ) )
                 {
                     bEOP = true;
                 }
@@ -2686,8 +2686,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                         sType.append(OStringToOUString(
                                         sComment, RTL_TEXTENCODING_UTF8));
                     }
-                    if (sComment.equalsIgnoreAsciiCaseL(
-                                RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN")))
+                    if (sComment.equalsIgnoreAsciiCase("FIELD_SEQ_BEGIN"))
                     {
                         sal_uInt8 const*const pData = pA->GetData();
                         if (pData && (pA->GetDataSize()))
@@ -2964,7 +2963,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
             {
                 const MetaCommentAction*    pA = (const MetaCommentAction*) pAction;
 
-                if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) &&
+                if( ( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") ) &&
                     ( nWriteFlags & SVGWRITER_WRITE_FILL ) )
                 {
                     const MetaGradientExAction* pGradAction = NULL;
@@ -2978,7 +2977,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                             pGradAction = (const MetaGradientExAction*) pAction;
                         else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
                                  ( ( (const MetaCommentAction*) pAction )->GetComment().
-                                        equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
+                                        equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
                         {
                             bDone = sal_True;
                         }
@@ -2987,7 +2986,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     if( pGradAction )
                         ImplWriteGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), nWriteFlags );
                 }
-                else if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) &&
+                else if( ( pA->GetComment().equalsIgnoreAsciiCase("XPATHFILL_SEQ_BEGIN") ) &&
                          ( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
                          pA->GetDataSize() )
                 {
@@ -3036,7 +3035,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                                     if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
                                         ( ( (const MetaCommentAction*) pAction )->GetComment().
-                                        equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
+                                               equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
                                     {
                                         bSkip = sal_False;
                                     }
@@ -3064,13 +3063,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                         if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
                                     ( ( (const MetaCommentAction*) pAction )->GetComment().
-                                    equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
+                                            equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
                         {
                             bSkip = sal_False;
                         }
                     }
                 }
-                else if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) ) &&
+                else if( ( pA->GetComment().equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_BEGIN") ) &&
                          ( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
                          pA->GetDataSize() )
                 {
@@ -3204,7 +3203,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                         if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
                                     ( ( (const MetaCommentAction*) pAction )->GetComment().
-                                    equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
+                                    equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_END") ) )
                         {
                             bSkip = sal_False;
                         }
@@ -3212,7 +3211,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 }
                 else if( !mrExport.IsUsePositionedCharacters() && ( nWriteFlags & SVGWRITER_WRITE_TEXT ) )
                 {
-                    if( ( pA->GetComment().equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_PAINTSHAPE_BEGIN" ) ) ) )
+                    if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_BEGIN" ) ) )
                     {
                         if( pxShape )
                         {
@@ -3247,15 +3246,15 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                             }
                         }
                     }
-                    else if( ( pA->GetComment().equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_PAINTSHAPE_END" ) ) ) )
+                    else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) )
                     {
                         maTextWriter.endTextShape();
                     }
-                    else if( ( pA->GetComment().equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOP" ) ) ) )
+                    else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOP" ) ) )
                     {
                         const MetaAction* pNextAction = rMtf.GetAction( nCurAction + 1 );
                         if( !( ( pNextAction->GetType() == META_COMMENT_ACTION ) &&
-                               ( ( (const MetaCommentAction*) pNextAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END") ) )  ))
+                               ( ( (const MetaCommentAction*) pNextAction )->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_END") )  ))
                         {
                             // nTextFound == -1 => no text found and end of paragraph reached
                             // nTextFound ==  0 => no text found and end of text shape reached
@@ -3284,11 +3283,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                         }
                     }
-                    else if( ( pA->GetComment().equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOL" ) ) ) )
+                    else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOL" ) ) )
                     {
                         const MetaAction* pNextAction = rMtf.GetAction( nCurAction + 1 );
                         if( !( ( pNextAction->GetType() == META_COMMENT_ACTION ) &&
-                               ( ( (const MetaCommentAction*) pNextAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP") ) ) ) )
+                               ( ( (const MetaCommentAction*) pNextAction )->GetComment().equalsIgnoreAsciiCase("XTEXT_EOP") ) ) )
                         {
                             // nTextFound == -2 => no text found and end of line reached
                             // nTextFound == -1 => no text found and end of paragraph reached
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5f40c106bc91..ef18481c4dbd 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -371,7 +371,7 @@ int Export::Execute( int nToken, const char * pToken )
                     break;
                 }
             }
-            if( sToken.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("#define NO_LOCALIZE_EXPORT")) ){
+            if( sToken.equalsIgnoreAsciiCase("#define NO_LOCALIZE_EXPORT") ){
                             bSkipFile = true;
                             return 0;
                         }
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index fc8aa7b4187e..e221f1695398 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -276,7 +276,7 @@ sal_Bool LngParser::Merge(
             for(size_t n = 0; n < aLanguages.size(); ++n)
             {
                 sCur = aLanguages[ n ];
-                if( !sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) && Text[sCur].isEmpty() && pEntrys )
+                if( !sCur.equalsIgnoreAsciiCase("en-US") && Text[sCur].isEmpty() && pEntrys )
                 {
 
                     OString sNewText;
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index 91a0283f0b4e..59d956f55440 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -170,7 +170,7 @@ bool Merge(
     for(size_t n = 0; n < aLanguages.size(); ++n)
     {
         OString sCur = aLanguages[ n ];
-        if (sCur.isEmpty() || sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")))
+        if (sCur.isEmpty() || sCur.equalsIgnoreAsciiCase("en-US"))
             continue;
         const OString aDestinationFile(aDestinationDir + sCur + ".ui");
         if (!lcl_MergeLang(rMap, sCur, aDestinationFile))
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 8265b4afcbb1..046d02adc1d6 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -418,7 +418,7 @@ void XRMResMerge::WorkOnDesc(
             for( unsigned int n = 0; n < aLanguages.size(); n++ ){
                 sCur = aLanguages[ n ];
                 OString sContent;
-                if ( !sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US"))  &&
+                if ( !sCur.equalsIgnoreAsciiCase("en-US")  &&
                     ( pEntrys->GetText(
                         sContent, STRING_TYP_TEXT, sCur, sal_True )) &&
                     !sContent.isEmpty())
@@ -507,7 +507,7 @@ void XRMResMerge::EndOfText(
             for( unsigned int n = 0; n < aLanguages.size(); n++ ){
                 sCur = aLanguages[ n ];
                 OString sContent;
-                if (!sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) &&
+                if (!sCur.equalsIgnoreAsciiCase("en-US") &&
                     ( pEntrys->GetText(
                         sContent, STRING_TYP_TEXT, sCur, sal_True )) &&
                     !sContent.isEmpty() &&
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 379d73c418c7..25d006f60cc5 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -586,7 +586,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
 
         aValue = aConfig.ReadKey( "Orientation", aDefOrientation );
         if (!aValue.isEmpty())
-            aInfo.m_eOrientation = aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("landscape")) ? orientation::Landscape : orientation::Portrait;
+            aInfo.m_eOrientation = aValue.equalsIgnoreAsciiCase("landscape") ? orientation::Landscape : orientation::Portrait;
         int nGroupKeys = aConfig.GetKeyCount();
         for( int nPPDKey = 0; nPPDKey < nGroupKeys; nPPDKey++ )
         {
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 2a8b6f03db3f..76e60b4e13ef 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -916,8 +916,7 @@ namespace slideshow
                     MetaCommentAction * pAct =
                         static_cast<MetaCommentAction *>(pCurrAct);
                     // skip comment if not a special XTEXT comment
-                    if (pAct->GetComment().equalsIgnoreAsciiCaseL(
-                            RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN") ) &&
+                    if (pAct->GetComment().equalsIgnoreAsciiCase("FIELD_SEQ_BEGIN") &&
                         // e.g. date field doesn't have data!
                         // currently assuming that only url field, this is
                         // somehow fragile! xxx todo if possible
@@ -942,8 +941,7 @@ namespace slideshow
                                     pAct->GetDataSize() / sizeof(sal_Unicode) )
                                 ) );
                     }
-                    else if (pAct->GetComment().equalsIgnoreAsciiCaseL(
-                                 RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")) &&
+                    else if (pAct->GetComment().equalsIgnoreAsciiCase("FIELD_SEQ_END") &&
                              // pending end is expected:
                              !maHyperlinkIndices.empty() &&
                              maHyperlinkIndices.back().second == -1)
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 0cb1b075f5c1..8a98dc9d4f60 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -86,7 +86,7 @@ namespace slideshow
                             // the given index
                             maActionClassVector.resize( nActionIndex+1, CLASS_NOOP );
 
-                            if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")) )
+                            if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_EOC") )
                             {
                                 // special, because can happen
                                 // in-between of portions - set
@@ -100,7 +100,7 @@ namespace slideshow
 
                                 maActionClassVector[ nIndex ] = CLASS_CHARACTER_CELL_END;
                             }
-                            else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")) )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_EOW") )
                             {
                                 // special, because can happen
                                 // in-between of portions - set
@@ -114,7 +114,7 @@ namespace slideshow
 
                                 maActionClassVector[ nIndex ] = CLASS_WORD_END;
                             }
-                            else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOS" )) )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_EOS") )
                             {
                                 // special, because can happen
                                 // in-between of portions - set
@@ -128,19 +128,19 @@ namespace slideshow
 
                                 maActionClassVector[ nIndex ] = CLASS_SENTENCE_END;
                             }
-                            else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_EOL") )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_LINE_END;
                             }
-                            else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_EOP") )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_PARAGRAPH_END;
                             }
-                            else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_END") )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_SHAPE_END;
                             }
-                            else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")) )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_BEGIN") )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_SHAPE_START;
                             }
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 484548999dac..9ea6336c3895 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -452,8 +452,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle&       o_rScrollRect,
             // skip comment if not a special XTEXT... comment
             if( pAct->GetComment().matchIgnoreAsciiCase( OString("XTEXT"), 0 ) )
             {
-                if (pAct->GetComment().equalsIgnoreAsciiCaseL(
-                        RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
+                if (pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_SCROLLRECT"))
                 {
                     o_rScrollRect = ::vcl::unotools::b2DRectangleFromRectangle(
                         *reinterpret_cast<Rectangle const *>(
@@ -461,8 +460,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle&       o_rScrollRect,
 
                     bScrollRectSet = true;
                 }
-                else if (pAct->GetComment().equalsIgnoreAsciiCaseL(
-                             RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTRECT")) )
+                else if (pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTRECT") )
                 {
                     o_rPaintRect = ::vcl::unotools::b2DRectangleFromRectangle(
                         *reinterpret_cast<Rectangle const *>(
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 32430046f26e..6a8df65566c9 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2028,7 +2028,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
                     OString aDesc( pFDesc->fgd[ 0 ].cFileName );
                     rtl_TextEncoding    eTextEncoding = osl_getThreadTextEncoding();
 
-                    if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL")) )
+                    if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCase(".URL") )
                     {
                         SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
                                                                                   STREAM_STD_READ );
@@ -2056,9 +2056,9 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
 
                             while( pStream->ReadLine( aLine ) )
                             {
-                                if (aLine.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("[InternetShortcut]")))
+                                if (aLine.equalsIgnoreAsciiCase("[InternetShortcut]"))
                                     bSttFnd = sal_True;
-                                else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("URL=")))
+                                else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCase("URL="))
                                 {
                                     rBmk = INetBookmark( OStringToOUString(aLine.copy(4), eTextEncoding),
                                                          OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) );
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 04ae4cc75291..0dc5a03a5bde 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1220,7 +1220,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
 {
     bool aSkipComment = false;
 
-    if (rAct.GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+    if (rAct.GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN"))
     {
         MetaGradientExAction* pAct = (MetaGradientExAction*) pMtf->NextAction();
 
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 8c5950783383..25ada354ac7f 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1245,9 +1245,9 @@ void PPDParser::parseOpenUI(const OString& rLine)
 
     sal_Int32 nIndex = 0;
     OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) );
-    if( aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("boolean")))
+    if( aValue.equalsIgnoreAsciiCase("boolean"))
         pKey->m_eUIType = PPDKey::Boolean;
-    else if (aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pickmany")))
+    else if (aValue.equalsIgnoreAsciiCase("pickmany"))
         pKey->m_eUIType = PPDKey::PickMany;
     else
         pKey->m_eUIType = PPDKey::PickOne;