diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-30 21:20:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 09:27:24 +0000 |
commit | 76e37b7f798a211a9a3f3110f30d65a2c93dba4b (patch) | |
tree | a4ca0978f6e33db5740c305908c78a5b1621b386 | |
parent | fef11229e6231814a9d5aa9227b17fbac4878731 (diff) |
adapt naming scheme
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 | ||||
-rw-r--r-- | drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4 | ||||
-rw-r--r-- | filter/source/flash/swfwriter1.cxx | 12 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 14 | ||||
-rw-r--r-- | sal/inc/rtl/string.hxx | 7 | ||||
-rw-r--r-- | slideshow/source/engine/shapes/drawshape.cxx | 4 | ||||
-rw-r--r-- | slideshow/source/engine/shapes/drawshapesubsetting.cxx | 16 | ||||
-rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl2.cxx | 4 |
11 files changed, 40 insertions, 41 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 32456e445106..1ddfc69f7dc7 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -516,7 +516,7 @@ namespace cppcanvas ++io_rCurrActionIndex; if( pCurrAct->GetType() == META_COMMENT_ACTION && - static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAscii( + static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase( pCommentString) ) { // requested comment found, done @@ -551,7 +551,7 @@ namespace cppcanvas } if( pCurrAct->GetType() == META_COMMENT_ACTION && - static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAscii( + static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase( pCommentString) ) { // delimiting end comment found, done @@ -1686,7 +1686,7 @@ namespace cppcanvas MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct); // Handle gradients - if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) + if (pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) { MetaGradientExAction* pGradAction = NULL; bool bDone( false ); @@ -1702,7 +1702,7 @@ namespace cppcanvas // skip broken-down rendering, output gradient when sequence is ended case META_COMMENT_ACTION: - if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) + if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) { bDone = true; diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 685c4fc00c87..967e1e740757 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -3107,7 +3107,7 @@ namespace // and makes the code less dependent from those Metafile Add-Ons const MetaCommentAction* pA = (const MetaCommentAction*)pAction; - if (pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) + if (pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("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 @@ -3127,7 +3127,7 @@ namespace } else if(META_COMMENT_ACTION == pAction->GetType()) { - if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) + if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) { bDone = true; } diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 027e21ac4301..4a4abf9907ee 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1658,7 +1658,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) const sal_uInt8* pData = pA->GetData(); String aSkipComment; - if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) + if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) { const MetaGradientExAction* pGradAction = NULL; sal_Bool bDone = sal_False; @@ -1670,7 +1670,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) if( pAction->GetType() == META_GRADIENTEX_ACTION ) pGradAction = (const MetaGradientExAction*) pAction; else if( ( pAction->GetType() == META_COMMENT_ACTION ) && - ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) ) + ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) ) { bDone = sal_True; } @@ -1679,7 +1679,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) if( pGradAction ) Impl_writeGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient()); } - else if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) && + else if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) && pData ) { @@ -1703,14 +1703,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) pAction = rMtf.GetAction( i ); if( ( pAction->GetType() == META_COMMENT_ACTION ) && - ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) ) + ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) ) { bDone = sal_True; } } } } - else if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) && + else if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) && pData ) { @@ -1734,7 +1734,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) pAction = rMtf.GetAction( i ); if( ( pAction->GetType() == META_COMMENT_ACTION ) && - ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) ) + ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) ) { bDone = sal_True; } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index aad48765dc0d..c26f3eb79a96 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -1244,7 +1244,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_COMMENT_ACTION: { const MetaCommentAction* pA = (const MetaCommentAction*) pMA; - if ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) + if ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) { const MetaGradientExAction* pGradAction = NULL; while( ++nCurAction < nCount ) @@ -1253,7 +1253,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) if( pAction->GetType() == META_GRADIENTEX_ACTION ) pGradAction = (const MetaGradientExAction*) pAction; else if( ( pAction->GetType() == META_COMMENT_ACTION ) && - ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) ) + ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) ) { break; } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 1e6d11584170..f69fe6038ff9 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1627,7 +1627,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const MetaCommentAction* pA = (const MetaCommentAction*) pAction; String aSkipComment; - if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) && + if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) && ( nWriteFlags & SVGWRITER_WRITE_FILL ) ) { const MetaGradientExAction* pGradAction = NULL; @@ -1641,7 +1641,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, pGradAction = (const MetaGradientExAction*) pAction; else if( ( pAction->GetType() == META_COMMENT_ACTION ) && ( ( (const MetaCommentAction*) pAction )->GetComment(). - equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) ) + equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) ) { bDone = sal_True; } @@ -1650,7 +1650,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( pGradAction ) ImplWriteGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), nWriteFlags ); } - else if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) && + else if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) && ( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) && pA->GetDataSize() ) { @@ -1697,7 +1697,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( ( pAction->GetType() == META_COMMENT_ACTION ) && ( ( (const MetaCommentAction*) pAction )->GetComment(). - equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) ) + equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) ) { bSkip = sal_False; } @@ -1725,13 +1725,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( ( pAction->GetType() == META_COMMENT_ACTION ) && ( ( (const MetaCommentAction*) pAction )->GetComment(). - equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) ) + equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) ) { bSkip = sal_False; } } } - else if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) ) && + else if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) ) && ( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) && pA->GetDataSize() ) { @@ -1781,7 +1781,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( ( pAction->GetType() == META_COMMENT_ACTION ) && ( ( (const MetaCommentAction*) pAction )->GetComment(). - equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) ) + equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) ) { bSkip = sal_False; } diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index 23fee9d7674e..ee4101188013 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -414,10 +414,9 @@ public: @return sal_True if the strings are equal; sal_False, otherwise. */ - sal_Bool equalsIgnoreAsciiCaseAscii( const sal_Char * asciiStr ) const SAL_THROW(()) + sal_Bool equalsIgnoreAsciiCase( const sal_Char * asciiStr ) const SAL_THROW(()) { - return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length, - asciiStr, rtl_str_getLength(asciiStr) ) == 0; + return rtl_str_compareIgnoreAsciiCase( pData->buffer, asciiStr ) == 0; } /** @@ -439,7 +438,7 @@ public: @return sal_True if the strings are equal; sal_False, otherwise. */ - sal_Bool equalsIgnoreAsciiCaseAsciiL( const sal_Char * asciiStr, sal_Int32 asciiStrLength ) const SAL_THROW(()) + sal_Bool equalsIgnoreAsciiCaseL( const sal_Char * asciiStr, sal_Int32 asciiStrLength ) const SAL_THROW(()) { if ( pData->length != asciiStrLength ) return sal_False; 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( diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 9fe3753ef64b..c3a3fa2503c1 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -956,7 +956,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM { ByteString aSkipComment; - if (rAct.GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) + if (rAct.GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) { MetaGradientExAction* pAct = (MetaGradientExAction*) pMtf->NextAction(); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 50ae86268e0c..852e7ffac16c 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -523,7 +523,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa const MetaCommentAction* pA = (const MetaCommentAction*) pAction; String aSkipComment; - if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) + if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) { const MetaGradientExAction* pGradAction = NULL; sal_Bool bDone = sal_False; @@ -535,7 +535,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa if( pAction->GetType() == META_GRADIENTEX_ACTION ) pGradAction = (const MetaGradientExAction*) pAction; else if( ( pAction->GetType() == META_COMMENT_ACTION ) && - ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) ) + ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) ) { bDone = sal_True; } |