diff options
34 files changed, 139 insertions, 139 deletions
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 880dbe6e1d7d..a0b82a4d74ff 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -331,21 +331,21 @@ wrapper::ItemConverter* createItemConverter( OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel ) { - if( rDispatchCommand.equals("AllTitles")) + if( rDispatchCommand == "AllTitles") return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" ); TitleHelper::eTitleType nTitleType( TitleHelper::MAIN_TITLE ); - if( rDispatchCommand.equals("SubTitle") ) + if( rDispatchCommand == "SubTitle" ) nTitleType = TitleHelper::SUB_TITLE; - else if( rDispatchCommand.equals("XTitle") ) + else if( rDispatchCommand == "XTitle" ) nTitleType = TitleHelper::X_AXIS_TITLE; - else if( rDispatchCommand.equals("YTitle") ) + else if( rDispatchCommand == "YTitle" ) nTitleType = TitleHelper::Y_AXIS_TITLE; - else if( rDispatchCommand.equals("ZTitle") ) + else if( rDispatchCommand == "ZTitle" ) nTitleType = TitleHelper::Z_AXIS_TITLE; - else if( rDispatchCommand.equals("SecondaryXTitle") ) + else if( rDispatchCommand == "SecondaryXTitle" ) nTitleType = TitleHelper::SECONDARY_X_AXIS_TITLE; - else if( rDispatchCommand.equals("SecondaryYTitle") ) + else if( rDispatchCommand == "SecondaryYTitle" ) nTitleType = TitleHelper::SECONDARY_Y_AXIS_TITLE; uno::Reference< XTitle > xTitle( TitleHelper::getTitle( nTitleType, xChartModel ) ); @@ -354,28 +354,28 @@ OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno:: OUString lcl_getAxisCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) { - if( rDispatchCommand.equals("DiagramAxisAll")) + if( rDispatchCommand == "DiagramAxisAll") return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" ); sal_Int32 nDimensionIndex=0; bool bMainAxis=true; - if( rDispatchCommand.equals("DiagramAxisX")) + if( rDispatchCommand == "DiagramAxisX") { nDimensionIndex=0; bMainAxis=true; } - else if( rDispatchCommand.equals("DiagramAxisY")) + else if( rDispatchCommand == "DiagramAxisY") { nDimensionIndex=1; bMainAxis=true; } - else if( rDispatchCommand.equals("DiagramAxisZ")) + else if( rDispatchCommand == "DiagramAxisZ") { nDimensionIndex=2; bMainAxis=true; } - else if( rDispatchCommand.equals("DiagramAxisA")) + else if( rDispatchCommand == "DiagramAxisA") { nDimensionIndex=0; bMainAxis=false; } - else if( rDispatchCommand.equals("DiagramAxisB")) + else if( rDispatchCommand == "DiagramAxisB") { nDimensionIndex=1; bMainAxis=false; } @@ -389,7 +389,7 @@ OUString lcl_getGridCIDForCommand( const OString& rDispatchCommand, const uno::R { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); - if( rDispatchCommand.equals("DiagramGridAll")) + if( rDispatchCommand == "DiagramGridAll") return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, "ALLELEMENTS" ); sal_Int32 nDimensionIndex=0; @@ -397,27 +397,27 @@ OUString lcl_getGridCIDForCommand( const OString& rDispatchCommand, const uno::R //x and y is swapped in the commands - if( rDispatchCommand.equals("DiagramGridYMain")) + if( rDispatchCommand == "DiagramGridYMain") { nDimensionIndex=0; bMainGrid=true; } - else if( rDispatchCommand.equals("DiagramGridXMain")) + else if( rDispatchCommand == "DiagramGridXMain") { nDimensionIndex=1; bMainGrid=true; } - else if( rDispatchCommand.equals("DiagramGridZMain")) + else if( rDispatchCommand == "DiagramGridZMain") { nDimensionIndex=2; bMainGrid=true; } - else if( rDispatchCommand.equals("DiagramGridYHelp")) + else if( rDispatchCommand == "DiagramGridYHelp") { nDimensionIndex=0; bMainGrid=false; } - else if( rDispatchCommand.equals("DiagramGridXHelp")) + else if( rDispatchCommand == "DiagramGridXHelp") { nDimensionIndex=1; bMainGrid=false; } - else if( rDispatchCommand.equals("DiagramGridZHelp")) + else if( rDispatchCommand == "DiagramGridZHelp") { nDimensionIndex=2; bMainGrid=false; } @@ -448,65 +448,65 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt( xSeries, uno::UNO_QUERY ); //legend - if( rDispatchCommand.equals("Legend") || rDispatchCommand.equals("FormatLegend") ) + if( rDispatchCommand == "Legend" || rDispatchCommand == "FormatLegend" ) { eObjectType = OBJECTTYPE_LEGEND; //@todo set particular aParticleID if we have more than one legend } //wall floor area - else if( rDispatchCommand.equals("DiagramWall") || rDispatchCommand.equals("FormatWall") ) + else if( rDispatchCommand == "DiagramWall" || rDispatchCommand == "FormatWall" ) { //OBJECTTYPE_DIAGRAM; eObjectType = OBJECTTYPE_DIAGRAM_WALL; //@todo set particular aParticleID if we have more than one diagram } - else if( rDispatchCommand.equals("DiagramFloor") || rDispatchCommand.equals("FormatFloor") ) + else if( rDispatchCommand == "DiagramFloor" || rDispatchCommand == "FormatFloor" ) { eObjectType = OBJECTTYPE_DIAGRAM_FLOOR; //@todo set particular aParticleID if we have more than one diagram } - else if( rDispatchCommand.equals("DiagramArea") || rDispatchCommand.equals("FormatChartArea") ) + else if( rDispatchCommand == "DiagramArea" || rDispatchCommand == "FormatChartArea" ) { eObjectType = OBJECTTYPE_PAGE; } //title - else if( rDispatchCommand.equals("MainTitle") - || rDispatchCommand.equals("SubTitle") - || rDispatchCommand.equals("XTitle") - || rDispatchCommand.equals("YTitle") - || rDispatchCommand.equals("ZTitle") - || rDispatchCommand.equals("SecondaryXTitle") - || rDispatchCommand.equals("SecondaryYTitle") - || rDispatchCommand.equals("AllTitles") + else if( rDispatchCommand == "MainTitle" + || rDispatchCommand == "SubTitle" + || rDispatchCommand == "XTitle" + || rDispatchCommand == "YTitle" + || rDispatchCommand == "ZTitle" + || rDispatchCommand == "SecondaryXTitle" + || rDispatchCommand == "SecondaryYTitle" + || rDispatchCommand == "AllTitles" ) { return lcl_getTitleCIDForCommand( rDispatchCommand, xChartModel ); } //axis - else if( rDispatchCommand.equals("DiagramAxisX") - || rDispatchCommand.equals("DiagramAxisY") - || rDispatchCommand.equals("DiagramAxisZ") - || rDispatchCommand.equals("DiagramAxisA") - || rDispatchCommand.equals("DiagramAxisB") - || rDispatchCommand.equals("DiagramAxisAll") + else if( rDispatchCommand == "DiagramAxisX" + || rDispatchCommand == "DiagramAxisY" + || rDispatchCommand == "DiagramAxisZ" + || rDispatchCommand == "DiagramAxisA" + || rDispatchCommand == "DiagramAxisB" + || rDispatchCommand == "DiagramAxisAll" ) { return lcl_getAxisCIDForCommand( rDispatchCommand, xChartModel ); } //grid - else if( rDispatchCommand.equals("DiagramGridYMain") - || rDispatchCommand.equals("DiagramGridXMain") - || rDispatchCommand.equals("DiagramGridZMain") - || rDispatchCommand.equals("DiagramGridYHelp") - || rDispatchCommand.equals("DiagramGridXHelp") - || rDispatchCommand.equals("DiagramGridZHelp") - || rDispatchCommand.equals("DiagramGridAll") + else if( rDispatchCommand == "DiagramGridYMain" + || rDispatchCommand == "DiagramGridXMain" + || rDispatchCommand == "DiagramGridZMain" + || rDispatchCommand == "DiagramGridYHelp" + || rDispatchCommand == "DiagramGridXHelp" + || rDispatchCommand == "DiagramGridZHelp" + || rDispatchCommand == "DiagramGridAll" ) { return lcl_getGridCIDForCommand( rDispatchCommand, xChartModel ); } //data series - else if( rDispatchCommand.equals("FormatDataSeries") ) + else if( rDispatchCommand == "FormatDataSeries" ) { if( eSelectedType == OBJECTTYPE_DATA_SERIES ) return rSelectedCID; @@ -515,12 +515,12 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: OBJECTTYPE_DATA_SERIES, ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ) ); } //data point - else if( rDispatchCommand.equals("FormatDataPoint") ) + else if( rDispatchCommand == "FormatDataPoint" ) { return rSelectedCID; } //data labels - else if( rDispatchCommand.equals("FormatDataLabels") ) + else if( rDispatchCommand == "FormatDataLabels" ) { if( eSelectedType == OBJECTTYPE_DATA_LABELS ) return rSelectedCID; @@ -529,7 +529,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: OBJECTTYPE_DATA_LABELS, OUString(), rSelectedCID ); } //data labels - else if( rDispatchCommand.equals("FormatDataLabel") ) + else if( rDispatchCommand == "FormatDataLabel" ) { if( eSelectedType == OBJECTTYPE_DATA_LABEL ) return rSelectedCID; @@ -549,7 +549,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } //mean value line - else if( rDispatchCommand.equals("FormatMeanValue") ) + else if( rDispatchCommand == "FormatMeanValue" ) { if( eSelectedType == OBJECTTYPE_DATA_AVERAGE_LINE ) return rSelectedCID; @@ -560,7 +560,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getMeanValueLine( xRegCurveCnt ) ), true ); } //trend line - else if( rDispatchCommand.equals("FormatTrendline") ) + else if( rDispatchCommand == "FormatTrendline" ) { if( eSelectedType == OBJECTTYPE_DATA_CURVE ) return rSelectedCID; @@ -571,7 +571,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ), false ); } //trend line equation - else if( rDispatchCommand.equals("FormatTrendlineEquation") ) + else if( rDispatchCommand == "FormatTrendlineEquation" ) { if( eSelectedType == OBJECTTYPE_DATA_CURVE_EQUATION ) return rSelectedCID; @@ -582,17 +582,17 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ) ); } // y error bars - else if( rDispatchCommand.equals("FormatXErrorBars") ) + else if( rDispatchCommand == "FormatXErrorBars" ) { return lcl_getErrorCIDForCommand(OBJECTTYPE_DATA_ERRORS_X, eSelectedType, rSelectedCID ); } // y error bars - else if( rDispatchCommand.equals("FormatYErrorBars") ) + else if( rDispatchCommand == "FormatYErrorBars" ) { return lcl_getErrorCIDForCommand(OBJECTTYPE_DATA_ERRORS_Y, eSelectedType, rSelectedCID ); } // axis - else if( rDispatchCommand.equals("FormatAxis") ) + else if( rDispatchCommand == "FormatAxis" ) { if( eSelectedType == OBJECTTYPE_AXIS ) return rSelectedCID; @@ -603,7 +603,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } // major grid - else if( rDispatchCommand.equals("FormatMajorGrid") ) + else if( rDispatchCommand == "FormatMajorGrid" ) { if( eSelectedType == OBJECTTYPE_GRID ) return rSelectedCID; @@ -615,7 +615,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } // minor grid - else if( rDispatchCommand.equals("FormatMinorGrid") ) + else if( rDispatchCommand == "FormatMinorGrid" ) { if( eSelectedType == OBJECTTYPE_SUBGRID ) return rSelectedCID; @@ -626,13 +626,13 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } // title - else if( rDispatchCommand.equals("FormatTitle") ) + else if( rDispatchCommand == "FormatTitle" ) { if( eSelectedType == OBJECTTYPE_TITLE ) return rSelectedCID; } // stock loss - else if( rDispatchCommand.equals("FormatStockLoss") ) + else if( rDispatchCommand == "FormatStockLoss" ) { if( eSelectedType == OBJECTTYPE_DATA_STOCK_LOSS ) return rSelectedCID; @@ -640,7 +640,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, OUString()); } // stock gain - else if( rDispatchCommand.equals("FormatStockGain") ) + else if( rDispatchCommand == "FormatStockGain" ) { if( eSelectedType == OBJECTTYPE_DATA_STOCK_GAIN ) return rSelectedCID; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 2d147b08b181..532174820dbb 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -422,7 +422,7 @@ void ODbaseIndex::createINFEntry() for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++) { aKeyName = aInfFile.GetKeyName(i); - if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry)) + if (bCase ? aKeyName == aNewEntry : aKeyName.equalsIgnoreAsciiCase(aNewEntry)) { aNewEntry.clear(); break; diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 66f676bf19eb..f4a84d75f4f5 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -670,7 +670,7 @@ void ODbaseTable::refreshIndexes() // Refences the key an index-file? aKeyName = aInfFile.GetKeyName( nKey ); //...if yes, add the index list of the table - if (aKeyName.copy(0,3).equals("NDX")) + if (aKeyName.startsWith("NDX")) { OString aIndexName = aInfFile.ReadKey(aKeyName); aURL.setName(OStringToOUString(aIndexName, m_eEncoding)); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b9dedadb47e7..ed8bfa3e3c04 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2874,7 +2874,7 @@ unsigned char* doc_renderFont(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* /*pTh { const FontMetric& rFontMetric = pList->GetFontName(i); const OUString& aFontName = rFontMetric.GetFamilyName(); - if (!aSearchedFontName.equals(aFontName.toUtf8().getStr())) + if (aSearchedFontName != aFontName.toUtf8()) continue; if (aText.isEmpty()) diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index a790375485b9..7ed2a978c42c 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -296,7 +296,7 @@ bool Sane::Open( const char* name ) OString aDevice( name ); for( int i = 0; i < nDevices; i++ ) { - if( aDevice.equals( ppDevices[i]->name ) ) + if( aDevice == ppDevices[i]->name ) { mnDevice = i; break; @@ -335,7 +335,7 @@ int Sane::GetOptionByName( const char* rName ) OString aOption( rName ); for( i = 0; i < mnOptions; i++ ) { - if( mppOptions[i]->name && aOption.equals( mppOptions[i]->name ) ) + if( mppOptions[i]->name && aOption == mppOptions[i]->name ) return i; } return -1; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 3813f58eea5e..48c9dc6e52f0 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -1320,7 +1320,7 @@ bool SaneDlg::LoadState() aConfig.SetGroup( "SANE" ); OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); - for( i = 0; i < Sane::CountDevices() && !aString.equals(OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ; + for( i = 0; i < Sane::CountDevices() && aString != OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding()); i++ ) ; if( i == Sane::CountDevices() ) return false; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 2a591fd88fc6..2c4182ef66ac 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -1225,7 +1225,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) if( pGradAction ) ImplWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), rVDev ); } - else if ( pA->GetComment().equals("XPATHFILL_SEQ_END") ) + else if ( pA->GetComment() == "XPATHFILL_SEQ_END" ) { if ( aFillPath.Count() ) { @@ -1242,7 +1242,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) bool bSkipSequence = false; OString sSeqEnd; - if( pA->GetComment().equals( "XPATHSTROKE_SEQ_BEGIN" ) ) + if( pA->GetComment() == "XPATHSTROKE_SEQ_BEGIN" ) { sSeqEnd = "XPATHSTROKE_SEQ_END"; SvtGraphicStroke aStroke; @@ -1277,7 +1277,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) ImplPolyLine( aPath ); } } - else if (pA->GetComment().equals("XPATHFILL_SEQ_BEGIN")) + else if (pA->GetComment() == "XPATHFILL_SEQ_BEGIN") { sSeqEnd = "XPATHFILL_SEQ_END"; SvtGraphicFill aFill; @@ -1348,7 +1348,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) break; case MetaActionType::COMMENT : { - if (static_cast<const MetaCommentAction*>(pAction)->GetComment().equals("XPATHFILL_SEQ_END")) + if (static_cast<const MetaCommentAction*>(pAction)->GetComment() == "XPATHFILL_SEQ_END") bOk = false; } break; @@ -1391,7 +1391,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) if ( pMA->GetType() == MetaActionType::COMMENT ) { OString sComment( static_cast<MetaCommentAction*>(pMA)->GetComment() ); - if ( sComment.equals( sSeqEnd ) ) + if ( sComment == sSeqEnd ) break; } } diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index d828cbd91991..5e1776246246 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -496,31 +496,31 @@ namespace XSLT // ignore non-string parameters continue; } - if (nameUTF8.equals("StylesheetURL")) + if (nameUTF8 == "StylesheetURL") { m_styleSheetURL = valueUTF8; } - else if (nameUTF8.equals("SourceURL")) + else if (nameUTF8 == "SourceURL") { m_parameters.insert(pair<const char*, OString> ( PARAM_SOURCE_URL, valueUTF8)); } - else if (nameUTF8.equals("SourceBaseURL")) + else if (nameUTF8 == "SourceBaseURL") { m_parameters.insert(pair<const char*, OString> ( PARAM_SOURCE_BASE_URL, valueUTF8)); } - else if (nameUTF8.equals("TargetURL")) + else if (nameUTF8 == "TargetURL") { m_parameters.insert(pair<const char*, OString> ( PARAM_TARGET_URL, valueUTF8)); } - else if (nameUTF8.equals("TargetBaseURL")) + else if (nameUTF8 == "TargetBaseURL") { m_parameters.insert(pair<const char*, OString> ( PARAM_TARGET_BASE_URL, valueUTF8)); } - else if (nameUTF8.equals("DoctypePublic")) + else if (nameUTF8 == "DoctypePublic") { m_parameters.insert(pair<const char*, OString> ( PARAM_DOCTYPE_PUBLIC, valueUTF8)); diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 87bc329e9596..602ec4447bbd 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -1464,11 +1464,11 @@ LanguageType MsLangId::convertUnxByteStringToLanguage( for (const IsoLangGLIBCModifiersEntry* pGLIBCModifiersEntry = aImplIsoLangGLIBCModifiersEntries; pGLIBCModifiersEntry->mnLang != LANGUAGE_DONTKNOW; ++pGLIBCModifiersEntry) { // avoid embedded \0 warning - if (aLowerLang.equals( static_cast< const char* >( pGLIBCModifiersEntry->maLanguage )) && - aAtString.equals( static_cast< const char* >( pGLIBCModifiersEntry->maAtString ))) + if (aLowerLang == static_cast< const char* >( pGLIBCModifiersEntry->maLanguage ) && + aAtString == static_cast< const char* >( pGLIBCModifiersEntry->maAtString )) { if (aUpperCountry.isEmpty() || - aUpperCountry.equals( static_cast< const char* >( pGLIBCModifiersEntry->maCountry ))) + aUpperCountry == static_cast< const char* >( pGLIBCModifiersEntry->maCountry )) { return pGLIBCModifiersEntry->mnLang; } diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index 708e900a8542..22899d6e5c64 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -62,7 +62,7 @@ OString SvStringHashTable::GetNearString( const OString& rName ) const for( auto const & rPair : maInt2EntryMap ) { SvStringHashEntry * pE = rPair.second.get(); - if( pE->GetName().equalsIgnoreAsciiCase( rName ) && !pE->GetName().equals( rName ) ) + if( pE->GetName().equalsIgnoreAsciiCase( rName ) && pE->GetName() != rName ) return pE->GetName(); } return OString(); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index d68b366cdfd0..20ebd4c5d4c9 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -367,7 +367,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, bool bIn = false; for( size_t n = 0; n < rList.size(); n++ ) { - if (rList[n]->equals(aMethodName)) + if (*rList[n] == aMethodName) { bIn = true; break; @@ -392,7 +392,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, bool bIn = false; for ( size_t n=0; n < rList.size(); n++ ) { - if (rList[n]->equals(aMethodName)) + if (*rList[n] == aMethodName) { bIn = true; break; diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 1e0e74dfd8bd..5ecace5416ea 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -260,7 +260,7 @@ SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType, SvMetaType * SvIdlDataBase::FindType( const OString& rName ) { for( SvRefMemberList<SvMetaType *>::const_iterator it = aTypeList.begin(); it != aTypeList.end(); ++it ) - if( rName.equals((*it)->GetName()) ) + if( rName == (*it)->GetName() ) return *it; return nullptr; } @@ -275,7 +275,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm ) OString aName = rTok.GetString(); for( const auto& aType : GetTypeList() ) { - if( aType->GetName().equals(aName) ) + if( aType->GetName() == aName ) { return aType; } @@ -309,7 +309,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr for( sal_uLong i = 0; i < aSlotList.size(); i++ ) { SvMetaSlot * pSlot = aSlotList[i]; - if( pSlot->GetSlotId().getString().equals(rTok.GetString()) ) + if( pSlot->GetSlotId().getString() == rTok.GetString() ) return pSlot; } } diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 5b1911fb0583..4fe4d48ccff3 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -596,7 +596,7 @@ javaFrameworkError jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo) // /java/javaInfo/@vendorUpdate != javaSelection/updated (javavendors.xml) OString sUpdated = jfw::getElementUpdated(); - if (!sUpdated.equals(settings.getJavaInfoAttrVendorUpdate())) + if (sUpdated != settings.getJavaInfoAttrVendorUpdate()) { ppInfo->reset(); return JFW_E_INVALID_SETTINGS; diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 56eceb8c236c..fa213224a533 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -311,7 +311,7 @@ MergeDataFile::MergeDataFile( bFirstLang, bCaseSensitive ); if( bFirstLang && bWithQtz && - !sEnableReleaseBuild.equals("TRUE") ) + sEnableReleaseBuild != "TRUE" ) { aLanguageSet.insert("qtz"); InsertEntry( diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 6e33ea5b2b70..fdaf8f9349ca 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -73,7 +73,7 @@ namespace rtl_OStringBuffer sal_Int32 nLenStrBuftmp = aStrBuftmp.getLength(); rtl::OString sStr(aStrBuftmp.getStr()); - bool res = aStrtmp.equals( sStr ); + bool res = aStrtmp == sStr; CPPUNIT_ASSERT_EQUAL_MESSAGE ( @@ -14248,7 +14248,7 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - bool bRes = expVal.equals( aStrBuf.getStr() ); + bool bRes = expVal == aStrBuf.getStr(); CPPUNIT_ASSERT_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[0]+(-9223372036854775808)", diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 68df587690da..4a52bc8a7df9 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -365,7 +365,7 @@ inline bool checkDirectory(const OUString& str, oslCheckMode nCheckMode) inline OString outputError(const OString & returnVal, const OString & rightVal, const sal_Char * msg = "") { OString aString; - if (returnVal.equals(rightVal)) + if (returnVal == rightVal) return aString; aString += msg; @@ -707,7 +707,7 @@ namespace osl_FileBase if (!_sAssumeResultStr.isEmpty()) { - bool bStrAreEqual = _sAssumeResultStr.equals(sStr); + bool bStrAreEqual = _sAssumeResultStr == sStr; CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong", _nAssumeError, nError); CPPUNIT_ASSERT_MESSAGE("Assumption is wrong", diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index f5c088b6c3ad..6b693067785f 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -199,7 +199,7 @@ public: OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5); CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 && aSum2.getLength() == 32 ); - CPPUNIT_ASSERT_MESSAGE("source is the same, dest must be also the same", aSum1.equals(aSum2)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("source is the same, dest must be also the same", aSum1, aSum2); } { @@ -210,7 +210,7 @@ public: OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5); CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 && aSum2.getLength() == 32 ); - CPPUNIT_ASSERT_MESSAGE("differ only in one char", !aSum1.equals(aSum2)); + CPPUNIT_ASSERT_MESSAGE("differ only in one char", aSum1 != aSum2); } } diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx index f92ce9378301..de3902ef7f8c 100644 --- a/sal/qa/rtl/strings/test_oustring_convert.cxx +++ b/sal/qa/rtl/strings/test_oustring_convert.cxx @@ -79,7 +79,7 @@ void testConvertToString(TestConvertToString const & rTest) if (bSuccess) { - if (rTest.pStrict == nullptr || !aStrict.equals(rTest.pStrict)) + if (rTest.pStrict == nullptr || aStrict != rTest.pStrict) { rtl::OStringBuffer aMessage(aPrefix); aMessage.append("strict = \""); @@ -90,7 +90,7 @@ void testConvertToString(TestConvertToString const & rTest) } else { - if (!aStrict.equals(rtl::OString(RTL_CONSTASCII_STRINGPARAM("12345")))) + if (aStrict != rtl::OString(RTL_CONSTASCII_STRINGPARAM("12345"))) { rtl::OStringBuffer aMessage(aPrefix); aMessage.append("modified output"); @@ -103,7 +103,7 @@ void testConvertToString(TestConvertToString const & rTest) CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false); } } - if (!aRelaxed.equals(rTest.pRelaxed)) + if (aRelaxed != rTest.pRelaxed) { rtl::OStringBuffer aMessage(aPrefix); aMessage.append("relaxed = \""); diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 148e4422fbed..b0f8574f7300 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -887,13 +887,13 @@ DBusHandlerResult ProfileMessageFunction { SAL_INFO("sdremote.bluetooth", "ProfileMessageFunction||" << dbus_message_get_interface(pMessage) << "||" << dbus_message_get_member(pMessage)); - if (OString(dbus_message_get_interface(pMessage)).equals("org.bluez.Profile1")) + if (OString(dbus_message_get_interface(pMessage)) == "org.bluez.Profile1") { - if (OString(dbus_message_get_member(pMessage)).equals("Release")) + if (OString(dbus_message_get_member(pMessage)) == "Release") { return DBUS_HANDLER_RESULT_HANDLED; } - else if (OString(dbus_message_get_member(pMessage)).equals("NewConnection")) + else if (OString(dbus_message_get_member(pMessage)) == "NewConnection") { if (!dbus_message_has_signature(pMessage, "oha{sv}")) { @@ -944,7 +944,7 @@ DBusHandlerResult ProfileMessageFunction return DBUS_HANDLER_RESULT_HANDLED; } } - else if (OString(dbus_message_get_member(pMessage)).equals("RequestDisconnection")) + else if (OString(dbus_message_get_member(pMessage)) == "RequestDisconnection") { return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 3fd6d9a1a9fe..12801b2927fc 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -81,17 +81,17 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) { } - if ( aCommand[0].equals( "transition_next" ) ) + if ( aCommand[0] == "transition_next" ) { if ( xSlideShowController.is() ) xSlideShowController->gotoNextEffect(); } - else if ( aCommand[0].equals( "transition_previous" ) ) + else if ( aCommand[0] == "transition_previous" ) { if ( xSlideShowController.is() ) xSlideShowController->gotoPreviousEffect(); } - else if ( aCommand[0].equals( "goto_slide" ) ) + else if ( aCommand[0] == "goto_slide" ) { // FIXME: if 0 returned, then not a valid number sal_Int32 aSlide = aCommand[1].toInt32(); @@ -101,17 +101,17 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) xSlideShowController->gotoSlideIndex( aSlide ); } } - else if ( aCommand[0].equals( "presentation_start" ) ) + else if ( aCommand[0] == "presentation_start" ) { if ( xPresentation.is() ) xPresentation->start(); } - else if ( aCommand[0].equals( "presentation_stop" ) ) + else if ( aCommand[0] == "presentation_stop" ) { if ( xPresentation.is() ) xPresentation->end(); } - else if ( aCommand[0].equals( "presentation_blank_screen" ) ) + else if ( aCommand[0] == "presentation_blank_screen" ) { if ( aCommand.size() > 1 ) { @@ -123,7 +123,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) xSlideShowController->blankScreen( 0 ); // Default is black } } - else if (aCommand[0].equals( "pointer_started" )) + else if (aCommand[0] == "pointer_started" ) { // std::cerr << "pointer_started" << std::endl; float x = aCommand[1].toFloat(); @@ -164,7 +164,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) SAL_INFO( "sdremote", "Pointer started, we display the pointer on screen" ); } - else if (aCommand[0].equals( "pointer_dismissed" )) + else if (aCommand[0] == "pointer_dismissed" ) { SolarMutexGuard aSolarGuard; if (xSlideShow.is()) try @@ -183,7 +183,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) SAL_INFO( "sdremote", "Pointer dismissed, we hide the pointer on screen" ); } - else if (aCommand[0].equals( "pointer_coordination" )) + else if (aCommand[0] == "pointer_coordination" ) { float x = aCommand[1].toFloat(); float y = aCommand[2].toFloat(); @@ -206,7 +206,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) "exception caught: " << comphelper::anyToString( cppu::getCaughtException() )); } } - else if ( aCommand[0].equals( "presentation_resume" ) ) + else if ( aCommand[0] == "presentation_resume" ) { if ( xSlideShowController.is() ) { diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 047747b70eea..7382ad00a80a 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -110,8 +110,8 @@ void RemoteServer::execute() BufferedStreamSocket *pSocket = new BufferedStreamSocket( aSocket); OString aLine; if ( pSocket->readLine( aLine) - && aLine.equals( "LO_SERVER_CLIENT_PAIR" ) && - pSocket->readLine( aLine ) ) + && aLine == "LO_SERVER_CLIENT_PAIR" + && pSocket->readLine( aLine ) ) { OString aName( aLine ); diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 732484fa0eb1..4a90b784fde9 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -552,7 +552,7 @@ void PDFDict::eraseValue( const OString& rName ) for( unsigned int i = 0; i < nEle; i++ ) { PDFName* pName = dynamic_cast<PDFName*>(m_aSubElements[i]); - if( pName && pName->m_aName.equals( rName ) ) + if( pName && pName->m_aName == rName ) { for( unsigned int j = i+1; j < nEle; j++ ) { diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 186167126541..bcc81a1b6c65 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -331,7 +331,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF PDFName* pName = dynamic_cast<PDFName*>(map_it->second); if( ! pName ) continue; - if( ! pName->m_aName.equals( "FontDescriptor" ) ) + if( pName->m_aName != "FontDescriptor" ) continue; // the font name will be helpful, also there must be one in diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index f6074b1f46de..03473756ff2e 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -215,7 +215,7 @@ void StyleContainer::emit( EmitContext& rContext, { if( ! it->second.IsSubStyle ) { - if( it->second.Name.equals( "style:master-page" ) ) + if( it->second.Name == "style:master-page" ) aMasterPageSection.push_back( it->first ); else if( getStyleName( it->first ) == "standard" ) aOfficeStyleSection.push_back( it->first ); diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 1586caf4959d..11d6d69ba65a 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -839,7 +839,7 @@ long FontSizeNames::Name2Size( const OUString& rName ) const // linear search is sufficient for this rare case for( long i = mnElem; --i >= 0; ) - if ( aName.equals(mpArray[i].mszUtf8Name) ) + if ( aName == mpArray[i].mszUtf8Name ) return mpArray[i].mnSize; } diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 936b5841a479..4080b993bf47 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -353,7 +353,7 @@ void printSetPropertyMixinBody( OString s(fieldtype.getToken(0, '<', nPos)); OString t = s.copy(s.lastIndexOf('/')+1); - if (t.equals("Optional")) { + if (t == "Optional") { optional=true; if (single) { single=false; @@ -429,7 +429,7 @@ void printMethods(std::ostream & o, static OString sd("_"); bool body = !delegate.isEmpty(); - bool defaultbody = delegate.equals(sd); + bool defaultbody = delegate == sd; if (body && propertyhelper.getLength() > 1) { if (name == "com.sun.star.beans.XPropertySet") { diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index ec60403064c6..2a5c84cb0400 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -351,7 +351,7 @@ void printSetPropertyMixinBody( buffer.append(')'); OString t = buffer.makeStringAndClear(); - if ( t.equals("((Optional)") ) { + if ( t == "((Optional)" ) { optional=true; if (single) { single=false; @@ -441,7 +441,7 @@ void printMethods(std::ostream & o, static OString sd("_"); bool body = !delegate.isEmpty(); - bool defaultbody = delegate.equals(sd); + bool defaultbody = delegate == sd; generated.add(u2b(name)); rtl::Reference< unoidl::Entity > ent; diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index d4c269a394f9..7910d163d543 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -63,7 +63,7 @@ bool getOutputStream(ProgramOptions const & options, OString & tmpSourceFileName) { bool bStandardout = false; - if ( options.outputpath.equals("stdout") ) + if ( options.outputpath == "stdout" ) { bStandardout = true; *ppOutputStream = &std::cout; diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 6ace40b53192..1aee36d03639 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -277,7 +277,7 @@ handleCertificateValidationRequest_( { uno::Reference< security::XCertificateExtension >element = extensions[i]; OString aId ( reinterpret_cast<const char *>(element->getExtensionId().getConstArray()), element->getExtensionId().getLength()); - if (aId.equals(OID_SUBJECT_ALTERNATIVE_NAME)) + if (aId == OID_SUBJECT_ALTERNATIVE_NAME) { sanExtension = uno::Reference<security::XSanExtension>(element, uno::UNO_QUERY); break; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9d8c448970ec..6d930abaab30 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1860,7 +1860,7 @@ VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OString { VclPtr<vcl::Window> pCurrentChild; - if (m_pParent && !isConsideredGtkPseudo(m_pParent) && !m_sID.isEmpty() && rID.equals(m_sID)) + if (m_pParent && !isConsideredGtkPseudo(m_pParent) && !m_sID.isEmpty() && rID == m_sID) { pCurrentChild = m_pParent; @@ -2105,7 +2105,7 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader) } } - if (sType.equals("tab")) + if (sType == "tab") { handleTabChild(pParent, reader); return; @@ -2145,7 +2145,7 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader) // We want to sort labels before contents of frames // for keyboard traversal, especially if there // are multiple widgets using the same mnemonic - if (sType.equals("label")) + if (sType == "label") { if (VclFrame *pFrameParent = dynamic_cast<VclFrame*>(pParent)) pFrameParent->designate_label(pCurrentChild); @@ -3309,7 +3309,7 @@ vcl::Window *VclBuilder::get_by_name(const OString& sID) for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) { - if (aI->m_sID.equals(sID)) + if (aI->m_sID == sID) return aI->m_pWindow; } @@ -3321,7 +3321,7 @@ PopupMenu *VclBuilder::get_menu(const OString& sID) for (std::vector<MenuAndId>::iterator aI = m_aMenus.begin(), aEnd = m_aMenus.end(); aI != aEnd; ++aI) { - if (aI->m_sID.equals(sID)) + if (aI->m_sID == sID) return aI->m_pMenu; } @@ -3349,7 +3349,7 @@ void VclBuilder::set_response(const OString& sID, short nResponse) for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) { - if (aI->m_sID.equals(sID)) + if (aI->m_sID == sID) { aI->m_nResponseId = nResponse; return; @@ -3365,7 +3365,7 @@ void VclBuilder::delete_by_name(const OString& sID) for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) { - if (aI->m_sID.equals(sID)) + if (aI->m_sID == sID) { aI->m_pWindow.disposeAndClear(); m_aChildren.erase(aI); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 601b7334c717..dc97c97bb943 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -259,8 +259,8 @@ void PrinterInfoManager::initialize() { m_aGlobalDefaults.m_aContext. setValue( pKey, - aValue.equals("*nil") ? nullptr : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), - true ); + aValue == "*nil" ? nullptr : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), + true ); } } } @@ -388,7 +388,7 @@ void PrinterInfoManager::initialize() // override the settings in m_aGlobalDefaults if keys exist aValue = aConfig.ReadKey( "DefaultPrinter" ); - if (!aValue.equals("0") && !aValue.equalsIgnoreAsciiCase("false")) + if (aValue != "0" && !aValue.equalsIgnoreAsciiCase("false")) aDefaultPrinter = aPrinterName; aValue = aConfig.ReadKey( "Location" ); @@ -443,8 +443,8 @@ void PrinterInfoManager::initialize() { aPrinter.m_aInfo.m_aContext. setValue( pKey, - aValue.equals("*nil") ? nullptr : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), - true ); + aValue == "*nil" ? nullptr : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), + true ); } } } diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx index de7f8fb010bd..4d1960df367e 100644 --- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx +++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx @@ -285,7 +285,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) } Strm().Seek(nCurrent); OString aKeyword = aBuf.makeStringAndClear(); - if (aKeyword.equals("\\ftnalt")) + if (aKeyword == "\\ftnalt") nId = NS_ooxml::LN_endnote; if (m_aStates.top().pCurrentBuffer == &m_aSuperBuffer) diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 5734c8e1282e..42df67cbd160 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -278,7 +278,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara { // skip binary data explicitly, to not trip over rtf markup // control characters - if (rKeyword.equals("bin") && nParam > 0) + if (rKeyword == "bin" && nParam > 0) Strm().SeekRel(nParam); return RTFError::OK; } diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 079be582e02b..e168fca4a674 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -207,7 +207,7 @@ css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > unsigned char* objid = reinterpret_cast<unsigned char *>(const_cast<char *>(objID.getStr())); unsigned int objidlen = objID.getLength(); - if (objID.equals("2.5.29.17")) + if (objID == "2.5.29.17") { SanExtensionImpl* pExtn = new SanExtensionImpl; pExtn->setCertExtn(value, vlen, objid, objidlen, crit); @@ -252,7 +252,7 @@ css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certifi unsigned char* objid = (*extns)->id.data; unsigned int objidlen = (*extns)->id.len; - if ( objId.equals("OID.2.5.29.17") ) + if ( objId == "OID.2.5.29.17" ) { rtl::Reference<SanExtensionImpl> xSanImpl( new SanExtensionImpl); |