diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-29 08:25:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 09:27:22 +0000 |
| commit | 6a73e43b718cc22a6cec0b2fada8bb6ada3893bf (patch) | |
| tree | f5c672c42a13813aed6ba9e10079968e7f5d7a89 /svx | |
| parent | 67cf9cbeebaa258cb790e71b559586fd3299017b (diff) | |
MetaCommentAction now using rtl::OString
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 0be5e6843903..9fe3753ef64b 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().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL ) + if (rAct.GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))) { MetaGradientExAction* pAct = (MetaGradientExAction*) pMtf->NextAction(); @@ -1019,7 +1019,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM while( pSkipAct && ((pSkipAct->GetType() != META_COMMENT_ACTION ) - || (((MetaCommentAction*)pSkipAct)->GetComment().CompareIgnoreCaseToAscii(aSkipComment.GetBuffer()) != COMPARE_EQUAL))) + || !(((MetaCommentAction*)pSkipAct)->GetComment().equalsIgnoreAsciiCase(aSkipComment)))) { pSkipAct = pMtf->NextAction(); } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 9c47a215fbb0..f7330dc40ec3 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -72,13 +72,12 @@ using ::com::sun::star::lang::XMultiServiceFactory; const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) { - static ByteString aComment( (const sal_Char*)"EPSReplacementGraphic" ); const MetaCommentAction* pComment = NULL; if ( ( rMtf.GetActionSize() >= 2 ) && ( rMtf.FirstAction()->GetType() == META_EPS_ACTION ) && ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION ) - && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment() == aComment ) ) + && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic")) ) ) pComment = (const MetaCommentAction*)rMtf.GetAction( 1 ); return pComment; |