From d45483489513692be77a61cf343663e839483204 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 20 Nov 2013 16:36:51 +0200 Subject: Revert "remove RTL_CONSTASCII_STRINGPARAM in OString::equalsL calls" This reverts commit acebbee971136e6ee0a7bc75bd57d937d6e1c295. I mistakenly converted OUString::equalsL calls to OUString::startsWith calls. --- comphelper/source/misc/syntaxhighlight.cxx | 2 +- connectivity/source/drivers/hsqldb/HDriver.cxx | 4 +- cppcanvas/source/mtfrenderer/implrenderer.cxx | 6 +-- dbaccess/source/ui/dlg/dbfindex.cxx | 4 +- extensions/source/plugin/unx/unxmgr.cxx | 2 +- idl/source/objects/slot.cxx | 8 +-- l10ntools/source/export.cxx | 30 ++++++------ linguistic/source/dicimp.cxx | 4 +- sc/source/filter/lotus/lotform.cxx | 67 +++++++++++++------------- sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 +-- sfx2/source/bastyp/mieclip.cxx | 10 ++-- svx/source/xml/xmlgrhlp.cxx | 2 +- sw/source/filter/html/htmlatr.cxx | 18 +++---- sw/source/ui/misc/numberingtypelistbox.cxx | 2 +- sw/source/ui/vba/vbasystem.cxx | 10 ++-- vcl/unx/generic/printer/jobdata.cxx | 2 +- vcl/unx/generic/printer/ppdparser.cxx | 18 +++---- 17 files changed, 99 insertions(+), 98 deletions(-) diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index ce326604c08e..c9bac083beb6 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -368,7 +368,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* { reType = TT_KEYWORDS; - if (aByteStr.startsWith("rem")) + if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem"))) { // Remove all characters until end of line or EOF sal_Unicode cPeek = *pos; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index af9c1bae6052..21ed0d2ccbde 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -279,13 +279,13 @@ namespace connectivity continue; const OString sIniKey = comphelper::string::getToken(sLine, 0, '='); const OString sValue = comphelper::string::getToken(sLine, 1, '='); - if (sIniKey.startsWith("hsqldb.compatible_version")) + if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hsqldb.compatible_version"))) { sVersionString = sValue; } else { - if (sIniKey.startsWith("version") + if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("version")) && ( sVersionString.isEmpty() ) ) { diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 1b59ff2f7806..a8145bb9d2f6 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1653,7 +1653,7 @@ namespace cppcanvas // XPATHSTROKE_SEQ_BEGIN comment // Handle drawing layer fills - else if( pAct->GetComment().startsWith("XPATHFILL_SEQ_BEGIN") ) + else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) { const sal_uInt8* pData = pAct->GetData(); if ( pData ) @@ -1769,7 +1769,7 @@ namespace cppcanvas } } // Handle drawing layer fills - else if( pAct->GetComment().startsWith("EMF_PLUS") ) { + else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS")) ) { static int count = -1, limit = 0x7fffffff; if (count == -1) { count = 0; @@ -1782,7 +1782,7 @@ namespace cppcanvas if (count < limit) processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas ); count ++; - } else if( pAct->GetComment().startsWith("EMF_PLUS_HEADER_INFO") ) { + } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) { SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pAct->GetDataSize ()); SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index c7c76893157a..644df9427785 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -352,7 +352,7 @@ void ODbaseIndexDialog::Init() aNDX = aKeyName.copy(0,3); // yes -> add to the tables index list - if (aNDX.startsWith("NDX")) + if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) ); @@ -455,7 +455,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const aNDX = aKeyName.copy(0,3); //...if yes, delete index file, nKey is at subsequent key - if (aNDX.startsWith("NDX")) + if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { aInfFile.DeleteKey(aKeyName); nKeyCnt--; diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index ca16599e7c7f..2ee2b4964b7d 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -66,7 +66,7 @@ static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDesc } OString aBaseName = rPath.copy(nPos+1); - if (aBaseName.startsWith("libnullplugin.so")) + if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so"))) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "don't like %s\n", aBaseName.getStr() ); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index fd0d51bdb8d3..4d78be88dbc8 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -1090,7 +1090,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, OString aMethodName( GetExecMethod() ); if ( !aMethodName.isEmpty() && - !aMethodName.startsWith("NoExec") ) + !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")) ) { sal_Bool bIn = sal_False; for( size_t n = 0; n < rList.size(); n++ ) @@ -1115,7 +1115,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, aMethodName = GetStateMethod(); if (!aMethodName.isEmpty() && - !aMethodName.startsWith("NoState")) + !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoState"))) { sal_Bool bIn = sal_False; for ( size_t n=0; n < rList.size(); n++ ) @@ -1252,7 +1252,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, // write ExecMethod, with standard name if not specified if( !GetExecMethod().isEmpty() && - !GetExecMethod().startsWith("NoExec")) + !GetExecMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec"))) { rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ',' << GetExecMethod().getStr() << ')'; @@ -1263,7 +1263,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, // write StateMethod, with standard name if not specified if( !GetStateMethod().isEmpty() && - !GetStateMethod().startsWith("NoState")) + !GetStateMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoState"))) { rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ',' << GetStateMethod().getStr() << ')'; diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index b8618fcfcc06..405716719b44 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -507,18 +507,18 @@ int Export::Execute( int nToken, const char * pToken ) OString sValue = sToken.getToken(0, '=', n); CleanValue( sValue ); sKey = sKey.toAsciiUpperCase(); - if (sKey.startsWith("IDENTIFIER")) + if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("IDENTIFIER"))) { OString sId( sValue.replaceAll("\t", OString()). replaceAll(" ", OString())); pResData->SetId(sId, ID_LEVEL_IDENTIFIER); } - else if (sKey.startsWith("HELPID")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HELPID"))) { pResData->sHelpId = sValue; } - else if (sKey.startsWith("STRINGLIST")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST"))) { pResData->bList = sal_True; nList = LIST_STRING; @@ -526,7 +526,7 @@ int Export::Execute( int nToken, const char * pToken ) nListIndex = 0; nListLevel = 0; } - else if (sKey.startsWith("FILTERLIST")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST"))) { pResData->bList = sal_True; nList = LIST_FILTER; @@ -534,7 +534,7 @@ int Export::Execute( int nToken, const char * pToken ) nListIndex = 0; nListLevel = 0; } - else if (sKey.startsWith("UIENTRIES")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES"))) { pResData->bList = sal_True; nList = LIST_UIENTRIES; @@ -564,7 +564,7 @@ int Export::Execute( int nToken, const char * pToken ) OString sValue = sToken.getToken(1, '='); CleanValue( sValue ); sKey = sKey.toAsciiUpperCase(); - if (sKey.startsWith("STRINGLIST")) + if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST"))) { pResData->bList = sal_True; nList = LIST_STRING; @@ -572,7 +572,7 @@ int Export::Execute( int nToken, const char * pToken ) nListIndex = 0; nListLevel = 0; } - else if (sKey.startsWith("FILTERLIST")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST"))) { pResData->bList = sal_True; nList = LIST_FILTER; @@ -580,7 +580,7 @@ int Export::Execute( int nToken, const char * pToken ) nListIndex = 0; nListLevel = 0; } - else if (sKey.startsWith("PAIREDLIST")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("PAIREDLIST"))) { pResData->bList = sal_True; nList = LIST_PAIRED; @@ -588,7 +588,7 @@ int Export::Execute( int nToken, const char * pToken ) nListIndex = 0; nListLevel = 0; } - else if (sKey.startsWith("ITEMLIST")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("ITEMLIST"))) { pResData->bList = sal_True; nList = LIST_ITEM; @@ -596,7 +596,7 @@ int Export::Execute( int nToken, const char * pToken ) nListIndex = 0; nListLevel = 0; } - else if (sKey.startsWith("UIENTRIES")) + else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES"))) { pResData->bList = sal_True; nList = LIST_UIENTRIES; @@ -648,11 +648,11 @@ int Export::Execute( int nToken, const char * pToken ) if ( !sText.isEmpty() && !sLang.isEmpty() ) { sKey = sKey.toAsciiUpperCase(); - if (sKey.startsWith("TEXT") || - sKey.startsWith("MESSAGE") || - sKey.startsWith("CUSTOMUNITTEXT") || - sKey.startsWith("SLOTNAME") || - sKey.startsWith("UINAME")) + if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("TEXT")) || + sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("MESSAGE")) || + sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CUSTOMUNITTEXT")) || + sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SLOTNAME")) || + sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UINAME"))) { SetChildWithText(); if ( sLangIndex.equalsIgnoreAsciiCase("en-US") ) diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index e91d66bf2e37..7000cd0715d5 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -117,7 +117,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe // lang: field if (getTag(aLine, "lang: ", aTagValue)) { - if (aTagValue.startsWith("")) + if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM(""))) nLng = LANGUAGE_NONE; else nLng = LanguageTag::convertToLanguageTypeWithFallback( @@ -127,7 +127,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe // type: negative / positive if (getTag(aLine, "type: ", aTagValue)) { - if (aTagValue.startsWith("negative")) + if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("negative"))) bNeg = sal_True; else bNeg = sal_False; diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 5bea268bf924..c230710dffef 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -1975,71 +1976,71 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest ) { DefTokenId eId = ocNoName; - if (rTest.startsWith("FACT")) + if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FACT"))) eId = ocFact; - else if (rTest.startsWith("ISEMPTY")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ISEMPTY"))) eId=ocIsEmpty; - else if (rTest.startsWith("DEGTORAD")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("DEGTORAD"))) eId=ocRad; - else if (rTest.startsWith("RADTODEG")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("RADTODEG"))) eId=ocDeg; - else if (rTest.startsWith("SIGN")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SIGN"))) eId=ocPlusMinus; - else if (rTest.startsWith("ACOSH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOSH"))) eId=ocArcCosHyp; - else if (rTest.startsWith("ACOTH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOTH"))) eId=ocArcCotHyp; - else if (rTest.startsWith("ASINH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ASINH"))) eId=ocArcSinHyp; - else if (rTest.startsWith("ATANH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ATANH"))) eId=ocArcTanHyp; - else if (rTest.startsWith("COSH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COSH"))) eId=ocCosHyp; - else if (rTest.startsWith("COTH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COTH"))) eId=ocCotHyp; - else if (rTest.startsWith("SINH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SINH"))) eId=ocSinHyp; - else if (rTest.startsWith("TANH")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TANH"))) eId=ocTanHyp; - else if (rTest.startsWith("EVEN")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("EVEN"))) eId=ocIsEven; - else if (rTest.startsWith("ODD")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ODD"))) eId=ocIsOdd; - else if (rTest.startsWith("ACOT")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOT"))) eId=ocArcCot; - else if (rTest.startsWith("COT")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COT"))) eId=ocCot; - else if (rTest.startsWith("TRUNC")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TRUNC"))) eId=ocTrunc; - else if (rTest.startsWith("GEOMEAN")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GEOMEAN"))) eId=ocGeoMean; - else if (rTest.startsWith("HARMEAN")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("HARMEAN"))) eId=ocHarMean; - else if (rTest.startsWith("CORREL")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CORREL"))) eId=ocCorrel; - else if (rTest.startsWith("MEDIAN")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("MEDIAN"))) eId=ocMedian; - else if (rTest.startsWith("COV")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COV"))) eId=ocCovar; - else if (rTest.startsWith("SKEWNESS")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SKEWNESS"))) eId=ocSchiefe; - else if (rTest.startsWith("CHITEST")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CHITEST"))) eId=ocChiTest; - else if (rTest.startsWith("FTEST")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FTEST"))) eId=ocFTest; - else if (rTest.startsWith("AVEDEV")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("AVEDEV"))) eId=ocAveDev; - else if (rTest.startsWith("PRODUCT")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PRODUCT"))) eId=ocProduct; - else if (rTest.startsWith("PERMUT")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PERMUT"))) eId=ocVariationen; - else if (rTest.startsWith("GAMMALN")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GAMMALN"))) eId=ocGammaLn; - else if (rTest.startsWith("POISSON")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("POISSON"))) eId=ocPoissonDist; - else if (rTest.startsWith("NORMAL")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("NORMAL"))) eId=ocNormDist; - else if (rTest.startsWith("CRITBINOMIAL")) + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CRITBINOMIAL"))) eId=ocKritBinom; return eId; } diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index ea9938414082..c1343d9c891b 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -458,7 +458,7 @@ bool PDFContainer::emitSubElements( EmitContext& rWriteContext ) const if( rWriteContext.m_bDecrypt ) { const PDFName* pName = dynamic_cast(m_aSubElements[i]); - if (pName && pName->m_aName.startsWith("Encrypt")) + if (pName && pName->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("Encrypt"))) { i++; continue; @@ -695,7 +695,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const } // is the (first) filter FlateDecode ? - if (pFilter && pFilter->m_aName.startsWith("FlateDecode")) + if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode"))) { bIsDeflated = true; } @@ -850,7 +850,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const if( it != pClone->m_pStream->m_pDict->m_aMap.end() ) { PDFName* pFilter = dynamic_cast(it->second); - if (pFilter && pFilter->m_aName.startsWith("FlateDecode")) + if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode"))) pClone->m_pStream->m_pDict->eraseValue( "Filter" ); else { @@ -858,7 +858,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const if( pArray && ! pArray->m_aSubElements.empty() ) { pFilter = dynamic_cast(pArray->m_aSubElements.front()); - if (pFilter && pFilter->m_aName.startsWith("FlateDecode")) + if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode"))) { delete pFilter; pArray->m_aSubElements.erase( pArray->m_aSubElements.begin() ); diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index 501cd2eb4a82..869b29fb6f17 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -51,15 +51,15 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) { nIndex = 0; OString sTmp(sLine.getToken(0, ':', nIndex)); - if (sTmp.startsWith("StartHTML")) + if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML"))) nStt = sLine.copy(nIndex).toInt32(); - else if (sTmp.startsWith("EndHTML")) + else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML"))) nEnd = sLine.copy(nIndex).toInt32(); - else if (sTmp.startsWith("StartFragment")) + else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartFragment"))) nFragStart = sLine.copy(nIndex).toInt32(); - else if (sTmp.startsWith("EndFragment")) + else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndFragment"))) nFragEnd = sLine.copy(nIndex).toInt32(); - else if (sTmp.startsWith("SourceURL")) + else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL"))) sBaseURL = OStringToOUString( sLine.copy(nIndex), RTL_TEXTENCODING_UTF8 ); if (nEnd >= 0 && nStt >= 0 && diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 06e2a3c51b35..95f5639157dd 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -61,7 +61,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) 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().startsWith("EPSReplacementGraphic") ) ) + && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic")) ) ) pComment = (const MetaCommentAction*)rMtf.GetAction( 1 ); return pComment; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 9ef44e797ddd..8e0333d20843 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -543,13 +543,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // der erste Buchstabe reicht meistens switch( rInfo.aToken[0] ) { - case 'A': OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_address), + case 'A': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_address)), "Doch kein ADDRESS?" ); rInfo.bParaPossible = sal_True; rHWrt.bNoAlign = sal_True; break; - case 'B': OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_blockquote), + case 'B': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_blockquote)), "Doch kein BLOCKQUOTE?" ); rInfo.bParaPossible = sal_True; rHWrt.bNoAlign = sal_True; @@ -561,7 +561,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, } else { - OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_preformtxt), + OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_preformtxt)), "Doch kein PRE?" ); if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken ) { @@ -576,10 +576,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, } break; - case 'D': OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dt) || - rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dd), + case 'D': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) || + rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)), "Doch kein DD/DT?" ); - bDT = rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dt); + bDT = rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)); rInfo.bParaPossible = !bDT; rHWrt.bNoAlign = sal_True; bForceDL = sal_True; @@ -1031,9 +1031,9 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo ) HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(), sal_False ); rHWrt.bLFPossible = - !rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dt) && - !rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dd) && - !rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_li); + !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) && + !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)) && + !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_li)); } if( rInfo.bOutDiv ) { diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 51247ef0dc06..224dab5a4f3a 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -48,7 +48,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) : bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue) { - if (rKey.startsWith("type")) + if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type"))) Reload(rValue.toInt32()); else return ListBox::set_property(rKey, rValue); diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index ece2f6c83291..6ca213bce526 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -57,23 +57,23 @@ void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKe { OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex ); sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 ); - if( sBaseKey.startsWith("HKEY_CURRENT_USER") ) + if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) ) { hBaseKey = HKEY_CURRENT_USER; } - else if( sBaseKey.startsWith("HKEY_LOCAL_MACHINE") ) + else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_LOCAL_MACHINE")) ) { hBaseKey = HKEY_LOCAL_MACHINE; } - else if( sBaseKey.startsWith("HKEY_CLASSES_ROOT") ) + else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CLASSES_ROOT")) ) { hBaseKey = HKEY_CLASSES_ROOT; } - else if( sBaseKey.startsWith("HKEY_USERS") ) + else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_USERS")) ) { hBaseKey = HKEY_USERS; } - else if( sBaseKey.startsWith("HKEY_CURRENT_CONFIG") ) + else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_CONFIG")) ) { hBaseKey = HKEY_CURRENT_CONFIG; } diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index 76c23b4997da..adf9d418bbdf 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -246,7 +246,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa bPDFDevice = true; rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32(); } - else if (aLine.startsWith("PPDContexData")) + else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData"))) { if( bPrinter ) { diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index efd8ee96695c..ed2cdea3958a 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -980,17 +980,17 @@ void PPDParser::parse( ::std::list< OString >& rLines ) parseOpenUI( aCurrentLine ); continue; } - else if (aKey.startsWith("OrderDependency")) + else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OrderDependency"))) { parseOrderDependency( aCurrentLine ); continue; } - else if (aKey.startsWith("UIConstraints") || - aKey.startsWith("NonUIConstraints")) + else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIConstraints")) || + aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("NonUIConstraints"))) { continue; // parsed in pass 2 } - else if( aKey.startsWith("CustomPageSize") ) // currently not handled + else if( aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CustomPageSize")) ) // currently not handled continue; // default values are parsed in pass 2 @@ -1278,15 +1278,15 @@ void PPDParser::parseOrderDependency(const OString& rLine) pKey = keyit->second; pKey->m_nOrderDependency = nOrder; - if( aSetup.startsWith("ExitServer") ) + if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("ExitServer")) ) pKey->m_eSetupType = PPDKey::ExitServer; - else if( aSetup.startsWith("Prolog") ) + else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("Prolog")) ) pKey->m_eSetupType = PPDKey::Prolog; - else if( aSetup.startsWith("DocumentSetup") ) + else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("DocumentSetup")) ) pKey->m_eSetupType = PPDKey::DocumentSetup; - else if( aSetup.startsWith("PageSetup") ) + else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("PageSetup")) ) pKey->m_eSetupType = PPDKey::PageSetup; - else if( aSetup.startsWith("JCLSetup") ) + else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("JCLSetup")) ) pKey->m_eSetupType = PPDKey::JCLSetup; else pKey->m_eSetupType = PPDKey::AnySetup; -- cgit