mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt naming scheme

Browse Source
This commit is contained in:
Caolán McNamara 2011-10-30 21:20:45 +00:00
parent fef11229e6
commit 76e37b7f79
11 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@ -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;

4
drawinglayer/source/primitive2d/metafileprimitive2d.cxx
View File

@ -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;
}

12
filter/source/flash/swfwriter1.cxx
View File

@ -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;
}

4
filter/source/graphicfilter/eps/eps.cxx
View File

@ -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;
}

14
filter/source/svg/svgwriter.cxx
View File

@ -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;
}

7
sal/inc/rtl/string.hxx
View File

@ -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;

4
slideshow/source/engine/shapes/drawshape.cxx
View File

@ -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() &&

16
slideshow/source/engine/shapes/drawshapesubsetting.cxx
View File

@ -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;
}

6
slideshow/source/engine/shapes/gdimtftools.cxx
View File

@ -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(

2
svx/source/svdraw/svdfmtf.cxx
View File

@ -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();

4
vcl/source/gdi/pdfwriter_impl2.cxx
View File

@ -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;
}