summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-21 14:05:24 +0200
committerNoel Grandin <noel@peralex.com>2013-11-22 08:07:18 +0200
commit2241fd5302c1ec83c8cbaa2422a477628a569aab (patch)
treea1e29ab709aaa0cfda59382db1ef84d25a238908 /slideshow
parent6266efb0fe8cd52ee908d5d36f1de322735fe8bc (diff)
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
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx6
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx14
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx6
3 files changed, 11 insertions, 15 deletions
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 *>(