ByteString->rtl::OString

3 files changed, 20 insertions, 20 deletions

diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index e2492a4ddd3a..d3b9a2fab89b 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -1090,9 +1090,8 @@ namespace slideshow
                     MetaCommentAction * pAct =
                         static_cast<MetaCommentAction *>(pCurrAct);
                     // skip comment if not a special XTEXT comment
-                    if (pAct->GetComment().CompareIgnoreCaseToAscii(
-                            RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN") ) ==
-                        COMPARE_EQUAL &&
+                    if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+                            RTL_CONSTASCII_STRINGPARAM("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
@@ -1117,9 +1116,8 @@ namespace slideshow
                                     pAct->GetDataSize() / sizeof(sal_Unicode) )
                                 ) );
                     }
-                    else if (pAct->GetComment().CompareIgnoreCaseToAscii(
-                                 RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")) ==
-                             COMPARE_EQUAL &&
+                    else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+                                 RTL_CONSTASCII_STRINGPARAM("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 bfe36dcc6c27..b474c05ad8a4 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -91,14 +91,14 @@ namespace slideshow
                         MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
 
                         // skip comment if not a special XTEXT comment
-                        if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT", 5 ) == COMPARE_EQUAL )
+                        if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT")) )
                         {
                             // fill classification vector with NOOPs,
                             // then insert corresponding classes at
                             // the given index
                             maActionClassVector.resize( nActionIndex+1, CLASS_NOOP );
 
-                            if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOC" ) == COMPARE_EQUAL )
+                            if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")) )
                             {
                                 // special, because can happen
                                 // in-between of portions - set
@@ -112,7 +112,7 @@ namespace slideshow
 
                                 maActionClassVector[ nIndex ] = CLASS_CHARACTER_CELL_END;
                             }
-                            else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOW" ) == COMPARE_EQUAL )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")) )
                             {
                                 // special, because can happen
                                 // in-between of portions - set
@@ -126,7 +126,7 @@ namespace slideshow
 
                                 maActionClassVector[ nIndex ] = CLASS_WORD_END;
                             }
-                            else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOS" ) == COMPARE_EQUAL )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOS" )) )
                             {
                                 // special, because can happen
                                 // in-between of portions - set
@@ -140,19 +140,19 @@ namespace slideshow
 
                                 maActionClassVector[ nIndex ] = CLASS_SENTENCE_END;
                             }
-                            else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOL" ) == COMPARE_EQUAL )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_LINE_END;
                             }
-                            else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOP" ) == COMPARE_EQUAL )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_PARAGRAPH_END;
                             }
-                            else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_PAINTSHAPE_END" ) == COMPARE_EQUAL )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
                             {
                                 maActionClassVector[ nActionIndex ] = CLASS_SHAPE_END;
                             }
-                            else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_PAINTSHAPE_BEGIN" ) == COMPARE_EQUAL )
+                            else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("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 aed27647642c..ab85873ceb2c 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -481,19 +481,21 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle&       o_rScrollRect,
             MetaCommentAction * pAct =
                 static_cast<MetaCommentAction *>(pCurrAct);
             // skip comment if not a special XTEXT comment
-            if (pAct->GetComment().CompareIgnoreCaseToAscii(
-                    RTL_CONSTASCII_STRINGPARAM("XTEXT") ) == COMPARE_EQUAL)
+            if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("XTEXT") ))
             {
-                if (pAct->GetComment().CompareIgnoreCaseToAscii(
-                        "XTEXT_SCROLLRECT" ) == COMPARE_EQUAL) {
+                if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+                        RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
+                {
                     o_rScrollRect = ::vcl::unotools::b2DRectangleFromRectangle(
                         *reinterpret_cast<Rectangle const *>(
                             pAct->GetData() ) );
 
                     bScrollRectSet = true;
                 }
-                else if (pAct->GetComment().CompareIgnoreCaseToAscii(
-                             "XTEXT_PAINTRECT" ) == COMPARE_EQUAL) {
+                else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+                             RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTRECT")) )
+                {
                     o_rPaintRect = ::vcl::unotools::b2DRectangleFromRectangle(
                         *reinterpret_cast<Rectangle const *>(
                             pAct->GetData() ) );