summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-10-30 21:20:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-01 09:27:24 +0000
commit76e37b7f798a211a9a3f3110f30d65a2c93dba4b (patch)
treea4ca0978f6e33db5740c305908c78a5b1621b386 /slideshow
parentfef11229e6231814a9d5aa9227b17fbac4878731 (diff)
adapt naming scheme
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx16
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx6
3 files changed, 13 insertions, 13 deletions
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index d3b9a2fab89b..153ffb28cd4b 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -1090,7 +1090,7 @@ namespace slideshow
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT comment
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN") ) &&
// e.g. date field doesn't have data!
// currently assuming that only url field, this is
@@ -1116,7 +1116,7 @@ namespace slideshow
pAct->GetDataSize() / sizeof(sal_Unicode) )
) );
}
- else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ else if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")) &&
// pending end is expected:
!maHyperlinkIndices.empty() &&
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index b474c05ad8a4..919280b56dae 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().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT")) )
+ if( pAct->GetComment().equalsIgnoreAsciiCaseL(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().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")) )
+ if( pAct->GetComment().equalsIgnoreAsciiCaseL(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().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(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().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOS" )) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(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().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
{
maActionClassVector[ nActionIndex ] = CLASS_LINE_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
{
maActionClassVector[ nActionIndex ] = CLASS_PARAGRAPH_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
{
maActionClassVector[ nActionIndex ] = CLASS_SHAPE_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(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 ab85873ceb2c..77d8a0861bb5 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -481,10 +481,10 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT comment
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT") ))
{
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
{
o_rScrollRect = ::vcl::unotools::b2DRectangleFromRectangle(
@@ -493,7 +493,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
bScrollRectSet = true;
}
- else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ else if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTRECT")) )
{
o_rPaintRect = ::vcl::unotools::b2DRectangleFromRectangle(