[Libreoffice-commits] core.git: accessibility/source basctl/source basic/source bridges/source canvas/source chart2/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jul 13 09:03:28 UTC 2017
accessibility/source/extended/accessibletabbarpage.cxx | 2 -
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2 -
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 2 -
basctl/source/basicide/basidesh.cxx | 2 -
basctl/source/basicide/bastype2.cxx | 4 +--
basctl/source/basicide/bastype3.cxx | 2 -
basctl/source/dlged/dlgedobj.cxx | 2 -
basctl/source/dlged/managelang.cxx | 6 ++---
basic/source/classes/sbunoobj.cxx | 2 -
bridges/source/jni_uno/jni_info.h | 2 -
canvas/source/factory/cf_service.cxx | 12 +++++-----
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 6 ++---
chart2/source/controller/dialogs/DataBrowserModel.cxx | 6 ++---
chart2/source/controller/dialogs/DialogModel.cxx | 8 +++---
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 2 -
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 4 +--
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 4 +--
chart2/source/controller/main/ChartController_Window.cxx | 8 +++---
chart2/source/controller/main/SelectionHelper.cxx | 10 ++++----
chart2/source/controller/main/ShapeController.cxx | 2 -
chart2/source/model/main/ChartModel.cxx | 2 -
chart2/source/model/main/ChartModel_Persistence.cxx | 2 -
chart2/source/model/template/ChartTypeTemplate.cxx | 6 ++---
chart2/source/model/template/DataInterpreter.cxx | 6 ++---
chart2/source/tools/DataSeriesHelper.cxx | 2 -
chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 2 -
chart2/source/tools/ObjectIdentifier.cxx | 8 +++---
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 2 -
chart2/source/tools/XMLRangeHelper.cxx | 2 -
chart2/source/view/main/ChartView.cxx | 10 ++++----
chart2/source/view/main/PropertyMapper.cxx | 2 -
31 files changed, 66 insertions(+), 66 deletions(-)
New commits:
commit 8a75aa52ef572655db261679da431aff84f52348
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jul 13 09:53:35 2017 +0200
use more OUString::operator== in a*..chart2
Change-Id: Ifb5608abebffd9687ed55e8c74f9be54a749111d
Reviewed-on: https://gerrit.libreoffice.org/39887
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index d090b807a8b3..272d357cb440 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -129,7 +129,7 @@ namespace accessibility
void AccessibleTabBarPage::SetPageText( const OUString& sPageText )
{
- if ( !m_sPageText.equals( sPageText ) )
+ if ( m_sPageText != sPageText )
{
Any aOldValue, aNewValue;
aOldValue <<= m_sPageText;
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 88de3464d633..32fec8247a8c 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -170,7 +170,7 @@ void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos )
void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibleName )
{
- if ( !m_sAccessibleName.equals( sAccessibleName ) )
+ if ( m_sAccessibleName != sAccessibleName )
{
Any aOldValue, aNewValue;
aOldValue <<= m_sAccessibleName;
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 0b462f7cfecb..6bd311c8a960 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -91,7 +91,7 @@ void VCLXAccessibleStatusBarItem::SetShowing( bool bShowing )
void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName )
{
- if ( !m_sItemName.equals( sItemName ) )
+ if ( m_sItemName != sItemName )
{
Any aOldValue, aNewValue;
aOldValue <<= m_sItemName;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 1dc25a3aa38b..e9d2f5b0acda 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -776,7 +776,7 @@ void Shell::RemoveWindow( BaseWindow* pWindow_, bool bDestroy, bool bAllowChange
if ( pWindow_->GetDocument().isInVBAMode() )
{
SbModule* pMod = StarBASIC::GetActiveModule();
- if ( !pMod || !pMod->GetName().equals(pWindow_->GetName()) )
+ if ( !pMod || pMod->GetName() != pWindow_->GetName() )
{
bStop = false;
}
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 86a5f2c26aba..56ff853e79a2 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -503,7 +503,7 @@ SvTreeListEntry* TreeListBox::ImpFindEntry( SvTreeListEntry* pParent, const OUSt
SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
while ( pEntry )
{
- if ( rText.equals(GetEntryText( pEntry )) )
+ if ( rText == GetEntryText( pEntry ) )
return pEntry;
pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
@@ -622,7 +622,7 @@ SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* pParent, const OUStrin
{
Entry* pBasicEntry = static_cast<Entry*>(pEntry->GetUserData());
assert(pBasicEntry && "FindEntry: no Entry ?!");
- if ( ( pBasicEntry->GetType() == eType ) && ( rText.equals(GetEntryText( pEntry )) ) )
+ if ( ( pBasicEntry->GetType() == eType ) && ( rText == GetEntryText( pEntry ) ) )
return pEntry;
pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 489cb1d1ee83..cf588e5d18bd 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -386,7 +386,7 @@ bool TreeListBox::IsValidEntry( SvTreeListEntry* pEntry )
{
bIsValid = aDocument.isAlive()
&& (aDocument.isApplication()
- || GetRootEntryName(aDocument, eLocation).equals(GetEntryText(pEntry)));
+ || GetRootEntryName(aDocument, eLocation) == GetEntryText(pEntry));
}
break;
case OBJ_TYPE_LIBRARY:
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 257d17ec33f7..4d71d4070022 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -452,7 +452,7 @@ void SAL_CALL DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt
OUString aNewName;
evt.NewValue >>= aNewName;
- if ( !aNewName.equals(aOldName) )
+ if ( aNewName != aOldName )
{
Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) )
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 6ec85ace2663..439731afaacb 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -49,9 +49,9 @@ using namespace ::com::sun::star::uno;
bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight )
{
- bool bRet = ( rLocaleLeft.Language.equals( rLocaleRight.Language ) &&
- rLocaleLeft.Country.equals( rLocaleRight.Country ) &&
- rLocaleLeft.Variant.equals( rLocaleRight.Variant ) );
+ bool bRet = ( rLocaleLeft.Language == rLocaleRight.Language &&
+ rLocaleLeft.Country == rLocaleRight.Country &&
+ rLocaleLeft.Variant == rLocaleRight.Variant );
return bRet;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 68e7f798956b..027caa17fd50 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1698,7 +1698,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass)
}
else
{
- bResult = sTypeName.equals( rClass );
+ bResult = sTypeName == rClass;
}
}
break; // finished checking automation object
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 577a74c469fd..f40c26e88eef 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -51,7 +51,7 @@ inline bool type_equals(
OUString::unacquired( &type1->pTypeName );
OUString const & name2 =
OUString::unacquired( &type2->pTypeName );
- return ((type1->eTypeClass == type2->eTypeClass) && name1.equals( name2 ));
+ return ((type1->eTypeClass == type2->eTypeClass) && name1 == name2);
}
inline bool is_XInterface( typelib_TypeDescriptionReference * type )
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index c0f57e906b16..d8eb242b5061 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -330,7 +330,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
m_aCachedImplementations.begin(),
aEnd,
[&serviceName](CachePair const& cp)
- { return serviceName.equals(cp.first); }
+ { return serviceName == cp.first; }
)) != aEnd) {
Reference<XInterface> xCanvas( use( aMatch->second, args, xContext ) );
if(xCanvas.is())
@@ -344,7 +344,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
m_aAvailableImplementations.begin(),
aAvailEnd,
[&serviceName](AvailPair const& ap)
- { return serviceName.equals(ap.first); }
+ { return serviceName == ap.first; }
)) == aAvailEnd ) {
return Reference<XInterface>();
}
@@ -355,7 +355,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
m_aAAImplementations.begin(),
aAAEnd,
[&serviceName](AvailPair const& ap)
- { return serviceName.equals(ap.first); }
+ { return serviceName == ap.first; }
)) == aAAEnd) {
return Reference<XInterface>();
}
@@ -366,7 +366,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
m_aAcceleratedImplementations.begin(),
aAccelEnd,
[&serviceName](AvailPair const& ap)
- { return serviceName.equals(ap.first); }
+ { return serviceName == ap.first; }
)) == aAccelEnd ) {
return Reference<XInterface>();
}
@@ -397,7 +397,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
std::any_of(pFirstAccelImpl,
pEndAccelImpl,
[&aCurrName](OUString const& src)
- { return aCurrName.equals(src.trim()); }
+ { return aCurrName == src.trim(); }
));
// check whether given canvas service is listed in the
@@ -406,7 +406,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
std::any_of(pFirstAAImpl,
pEndAAImpl,
[&aCurrName](OUString const& src)
- { return aCurrName.equals(src.trim()); }
+ { return aCurrName == src.trim(); }
));
// try to instantiate canvas *only* if either accel and AA
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 0e54a0096a65..ecdffda68ad3 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -178,7 +178,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName
xPropSet->setPropertyValue( "Color", rValue );
else if( rPropertyName == "LineTransparence" )
xPropSet->setPropertyValue( "Transparency", rValue );
- else if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
+ else if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() )
m_aWrappedLineJointProperty.setPropertyValue( rValue, xPropSet );
else
xPropSet->setPropertyValue( rPropertyName, rValue );
@@ -221,7 +221,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty
aRet = xPropSet->getPropertyValue( "Color" );
else if( rPropertyName == "LineTransparence" )
aRet = xPropSet->getPropertyValue( "Transparency" );
- else if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
+ else if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() )
aRet = m_aWrappedLineJointProperty.getPropertyValue( xPropSet );
else
aRet = xPropSet->getPropertyValue( rPropertyName );
@@ -301,7 +301,7 @@ void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
//XPropertyState
beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName )
{
- if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
+ if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() )
return beans::PropertyState_DEFAULT_VALUE;
uno::Any aDefault( this->getPropertyDefault( rPropertyName ) );
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index bedd47a98b2d..4d9c53c9c73f 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -110,7 +110,7 @@ bool lcl_SequenceOfSeriesIsShared(
Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( xSource->getDataSequences());
for( sal_Int32 i=0; i<aLSeq.getLength(); ++i )
- if (aLSeq[i].is() && DataSeriesHelper::getRole(aLSeq[i]).equals(aValuesRole))
+ if (aLSeq[i].is() && DataSeriesHelper::getRole(aLSeq[i]) == aValuesRole)
{
// getValues().is(), because lcl_getRole checked that already
bResult = (aValuesRep == aLSeq[i]->getValues()->getSourceRangeRepresentation());
@@ -196,7 +196,7 @@ struct lcl_RolesOfLSeqMatch
bool operator() ( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
- return DataSeriesHelper::getRole(xLSeq).equals(m_aRole);
+ return DataSeriesHelper::getRole(xLSeq) == m_aRole;
}
private:
OUString m_aRole;
@@ -868,7 +868,7 @@ void DataBrowserModel::updateFromModel()
sal_Int32 nSequenceNumberFormatKey = nYAxisNumberFormatKey;
OUString aRole = DataSeriesHelper::getRole(aLSeqs[nSeqIdx]);
- if( aRole.equals( aRoleForDataLabelNumberFormat ) )
+ if( aRole == aRoleForDataLabelNumberFormat )
{
nSequenceNumberFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ), xSeries, -1, xDiagram );
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index a9445be5d90d..ffceca3ccc00 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -220,7 +220,7 @@ struct lcl_RolesWithRangeAppend : public
tContainerType::value_type(
aRole, xSeq->getSourceRangeRepresentation()));
// label
- if( aRole.equals( m_aRoleForLabelSeq ))
+ if( aRole == m_aRoleForLabelSeq )
{
Reference< data::XDataSequence > xLabelSeq( xVal->getLabel());
if( xLabelSeq.is())
@@ -317,12 +317,12 @@ Reference< XDataSeries > lcl_CreateNewSeries(
for(nI=0; nI<aRoles.getLength(); ++nI)
{
- if( aRoles[nI].equals( lcl_aLabelRole ))
+ if( aRoles[nI] == lcl_aLabelRole )
continue;
Reference< data::XDataSequence > xSeq( ::chart::DataSourceHelper::createCachedDataSequence() );
lcl_SetSequenceRole( xSeq, aRoles[nI] );
// assert that aRoleOfSeqForSeriesLabel is part of the mandatory roles
- if( aRoles[nI].equals( aRoleOfSeqForSeriesLabel ))
+ if( aRoles[nI] == aRoleOfSeqForSeriesLabel )
{
Reference< data::XDataSequence > xLabel( ::chart::DataSourceHelper::createCachedDataSequence( aLabel ));
lcl_SetSequenceRole( xLabel, lcl_aLabelRole );
@@ -334,7 +334,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
for(nI=0; nI<aOptRoles.getLength(); ++nI)
{
- if( aOptRoles[nI].equals( lcl_aLabelRole ))
+ if( aOptRoles[nI] == lcl_aLabelRole )
continue;
Reference< data::XDataSequence > xSeq( ::chart::DataSourceHelper::createCachedDataSequence());
lcl_SetSequenceRole( xSeq, aOptRoles[nI] );
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index deac1fd39d99..b06a5fe3bdea 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -258,7 +258,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
}
// only if range is valid
- if( m_aLastValidRangeString.equals(m_pED_Range->GetText()))
+ if( m_aLastValidRangeString == m_pED_Range->GetText())
{
m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate );
aArguments.realloc( aArguments.getLength() + 1 );
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 6b516b9ced9e..531afc142b81 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -352,14 +352,14 @@ bool DataPointItemConverter::ApplySpecialItem(
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
- if( !aOldValue.equals(aNewValue) ||
+ if( aOldValue != aNewValue ||
DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::Any( aOldValue ) ) )
{
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::Any( aNewValue ) );
bChanged = true;
}
}
- else if( !aOldValue.equals(aNewValue) )
+ else if( aOldValue != aNewValue )
{
GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::Any( aNewValue ));
bChanged = true;
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 9beb4eb5f072..afcd6c2a5d97 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -312,14 +312,14 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
if (mbDataSeries)
{
Reference<chart2::XDataSeries> xSeries(GetPropertySet(), uno::UNO_QUERY);
- if (!aOldValue.equals(aNewValue) ||
+ if (aOldValue != aNewValue ||
DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelSeparator", uno::Any(aOldValue)))
{
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelSeparator", uno::Any(aNewValue));
bChanged = true;
}
}
- else if (!aOldValue.equals(aNewValue))
+ else if (aOldValue != aNewValue)
{
GetPropertySet()->setPropertyValue("LabelSeparator", uno::Any(aNewValue));
bChanged = true;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index b20645327821..83e0bb7d76a8 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -692,7 +692,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
else
{
OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) );
- if( aDragMethodServiceName.equals( ObjectIdentifier::getPieSegmentDragMethodServiceName() ) )
+ if( aDragMethodServiceName == ObjectIdentifier::getPieSegmentDragMethodServiceName() )
pDragMethod = new DragMethod_PieSegment( *pDrawViewWrapper, m_aSelection.getSelectedCID(), getModel() );
}
pDrawViewWrapper->SdrView::BegDragObj(aMPos, nullptr, pHitSelectionHdl, nDrgLog, pDragMethod);
@@ -1345,8 +1345,8 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
// pie segment dragging
// note: could also be done for data series
if( eObjectType == OBJECTTYPE_DATA_POINT &&
- ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ).equals(
- ObjectIdentifier::getPieSegmentDragMethodServiceName()))
+ ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ==
+ ObjectIdentifier::getPieSegmentDragMethodServiceName())
{
bool bDrag = false;
bool bDragInside = false;
@@ -1956,7 +1956,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
if( m_pDrawViewWrapper->IsTextEdit() )
{
- if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) )
+ if( aHitObjectCID == m_aSelection.getSelectedCID() )
{
pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
return;
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 94d6948ad12d..d77b2d6a2b7c 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -78,7 +78,7 @@ uno::Reference< drawing::XShape > Selection::getSelectedAdditionalShape()
bool Selection::setSelection( const OUString& rCID )
{
- if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) )
+ if ( rCID != m_aSelectedOID.getObjectCID() )
{
m_aSelectedOID = ObjectIdentifier( rCID );
return true;
@@ -252,7 +252,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
//check whether the diagram was hit but not selected (e.g. because it has no filling):
OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
- bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
+ bool bBackGroundHit = m_aSelectedOID.getObjectCID() == aPageCID || m_aSelectedOID.getObjectCID() == aWallCID || !m_aSelectedOID.isAutoGeneratedObject();
if( bBackGroundHit )
{
//todo: if more than one diagram is available in future do check the list of all diagrams here
@@ -266,7 +266,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
}
}
//check whether the legend was hit but not selected (e.g. because it has no filling):
- if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) )
+ if( bBackGroundHit || m_aSelectedOID.getObjectCID() == aDiagramCID )
{
OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(nullptr,nullptr) ) );//@todo read CID from model
SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID );
@@ -412,7 +412,7 @@ OUString SelectionHelper::getHitObjectCID(
//get diagram instead wall or page if hit inside diagram
if( !aRet.isEmpty() )
{
- if( aRet.equals( aPageCID ) )
+ if( aRet == aPageCID )
{
OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
//todo: if more than one diagram is available in future do check the list of all diagrams here
@@ -429,7 +429,7 @@ OUString SelectionHelper::getHitObjectCID(
{
OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
- if( aRet.equals( aWallCID ) )
+ if( aRet == aWallCID )
{
OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
aRet = aDiagramCID;
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 792e6f627687..ec3fc0a4c583 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -464,7 +464,7 @@ void ShapeController::executeDispatch_RenameObject()
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
pDlg->GetName(aName);
- if (pSelectedObj->GetName().equals(aName))
+ if (pSelectedObj->GetName() == aName)
{
pSelectedObj->SetName( aName );
}
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index c3ebd9d794b4..8918c04cc2a4 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1104,7 +1104,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
{
- return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast);
+ return aFlavor.MimeType == lcl_aGDIMetaFileMIMETypeHighContrast;
}
namespace
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 9529e4e8a1ab..fddebed2f705 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -75,7 +75,7 @@ struct lcl_PropNameEquals
{}
bool operator() ( const beans::PropertyValue & rProp )
{
- return rProp.Name.equals( m_aStr );
+ return rProp.Name == m_aStr;
}
private:
OUString m_aStr;
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 7afedc734ba3..13835141ef6e 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -346,7 +346,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
return false;
// match chart type
- bResult = bResult && aChartTypeSeq[nCTIdx]->getChartType().equals( aChartTypeToMatch );
+ bResult = bResult && aChartTypeSeq[nCTIdx]->getChartType() == aChartTypeToMatch;
bool bFound=false;
bool bAmbiguous=false;
// match stacking mode
@@ -561,7 +561,7 @@ void ChartTypeTemplate::createCoordinateSystems(
{
bool bOk = true;
for( sal_Int32 i=0; bOk && i<aCoordinateSystems.getLength(); ++i )
- bOk = bOk && ( xCooSys->getCoordinateSystemType().equals( aCoordinateSystems[i]->getCoordinateSystemType()) &&
+ bOk = bOk && ( xCooSys->getCoordinateSystemType() == aCoordinateSystems[i]->getCoordinateSystemType() &&
(xCooSys->getDimension() == aCoordinateSystems[i]->getDimension()) );
// coordinate systems are ok
if( bOk )
@@ -871,7 +871,7 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem(
for( nN=0; nN<rOldChartTypesSeq.getLength();++nN)
{
Reference< XChartType > xOldType( rOldChartTypesSeq[nN] );
- if( xOldType.is() && xOldType->getChartType().equals( aNewChartType ) )
+ if( xOldType.is() && xOldType->getChartType() == aNewChartType )
{
xSource.set( Reference< beans::XPropertySet >(xOldType, uno::UNO_QUERY ) );
if( xSource.is() )
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 0ca15b013069..31140a097cb9 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -247,9 +247,9 @@ struct lcl_LabeledSequenceEquals
bool bHasLabels = xSeqLabels.is();
return ( ( (m_bHasValues == bHasValues) &&
- (!bHasValues || m_aValuesRangeRep.equals( xSeqValues->getSourceRangeRepresentation())) ) &&
+ (!bHasValues || m_aValuesRangeRep == xSeqValues->getSourceRangeRepresentation()) ) &&
( (m_bHasLabels == bHasLabels) &&
- (!bHasLabels || m_aLabelRangeRep.equals( xSeqLabels->getSourceRangeRepresentation())) )
+ (!bHasLabels || m_aLabelRangeRep == xSeqLabels->getSourceRangeRepresentation()) )
);
}
@@ -344,7 +344,7 @@ uno::Any DataInterpreter::GetProperty(
{
for( sal_Int32 i=aArguments.getLength(); i--; )
{
- if( aArguments[i].Name.equals( rName ))
+ if( aArguments[i].Name == rName )
return aArguments[i].Value;
}
return uno::Any();
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index f292948cef37..97de8cde4f7b 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -75,7 +75,7 @@ public:
return ( xProp.is() &&
(xProp->getPropertyValue( "Role" ) >>= aRole ) &&
- m_aRole.equals( aRole ));
+ m_aRole == aRole );
}
private:
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 302350972f5d..8102c6afb8d7 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -184,7 +184,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
addStringToEquation( aBuf, nLineLength, aTmpBuf, pFormulaMaxWidth );
}
- if ( aBuf.toString().equals( OUString(mYName + " = ") ) )
+ if ( aBuf.toString() == (mYName + " = ") )
aBuf.append( "0" );
return aBuf.makeStringAndClear();
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index f24258559f24..5a5688ec7fdd 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -897,7 +897,7 @@ bool ObjectIdentifier::areSiblings( const OUString& rCID1, const OUString& rCID2
if( !aParent1.isEmpty() )
{
OUString aParent2( ObjectIdentifier::getFullParentParticle( rCID2 ) );
- bRet=aParent1.equals(aParent2);
+ bRet=aParent1 == aParent2;
}
//legend entries are special:
if(!bRet)
@@ -912,7 +912,7 @@ bool ObjectIdentifier::areSiblings( const OUString& rCID1, const OUString& rCID2
bool ObjectIdentifier::areIdenticalObjects( const OUString& rCID1, const OUString& rCID2 )
{
- if( rCID1.equals( rCID2 ) )
+ if( rCID1 == rCID2 )
return true;
//draggable pie or donut segments need special treatment, as their CIDs do change with offset
{
@@ -922,7 +922,7 @@ bool ObjectIdentifier::areIdenticalObjects( const OUString& rCID1, const OUStrin
OUString aID1( ObjectIdentifier::getObjectID( rCID1 ) );
OUString aID2( ObjectIdentifier::getObjectID( rCID2 ) );
- if( !aID1.isEmpty() && aID1.equals( aID2 ) )
+ if( !aID1.isEmpty() && aID1 == aID2 )
return true;
}
return false;
@@ -1467,7 +1467,7 @@ TitleHelper::eTitleType ObjectIdentifier::getTitleTypeForCID( const OUString& rC
tTitleMap::const_iterator aIt( rMap.begin() );
for( ;aIt != rMap.end(); ++aIt )
{
- if( aParentParticle.equals( (*aIt).second ) )
+ if( aParentParticle == (*aIt).second )
{
eRet = (*aIt).first;
break;
diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index fbafd9f9def0..fa413bf603c0 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -315,7 +315,7 @@ OUString PolynomialRegressionCurveCalculator::ImplGetRepresentation(
}
addStringToEquation( aBuf, nLineLength, aTmpBuf, pFormulaMaxWidth );
}
- if ( aBuf.toString().equals( OUString( mYName + " = ") ) )
+ if ( aBuf.toString() == ( mYName + " = ") )
aBuf.append( "0" );
return aBuf.makeStringAndClear();
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index e89b1a074f5b..7082cc0a6c1a 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -274,7 +274,7 @@ bool lcl_getCellRangeAddressFromXMLString(
}
if( bResult &&
!sTableSecondName.isEmpty() &&
- ! sTableSecondName.equals( rOutRange.aTableName ))
+ sTableSecondName != rOutRange.aTableName )
bResult = false;
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index e6d1b6711ddf..4d69b1cc6247 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1322,9 +1322,9 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aFlavor )
{
- bool bHighContrastMetaFile( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast));
+ bool bHighContrastMetaFile( aFlavor.MimeType == lcl_aGDIMetaFileMIMETypeHighContrast);
uno::Any aRet;
- if( ! (bHighContrastMetaFile || aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType)) )
+ if( ! (bHighContrastMetaFile || aFlavor.MimeType == lcl_aGDIMetaFileMIMEType) )
return aRet;
update();
@@ -1368,8 +1368,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla
}
sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
{
- return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) ||
- aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) );
+ return ( aFlavor.MimeType == lcl_aGDIMetaFileMIMEType ||
+ aFlavor.MimeType == lcl_aGDIMetaFileMIMETypeHighContrast );
}
// ____ XUnoTunnel ___
@@ -1480,7 +1480,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw
static OUString aChartCLSID = SvGlobalName( SO3_SCH_CLASSID ).GetHexName();
OUString aCLSID;
xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID;
- if( aCLSID.equals(aChartCLSID) )
+ if( aCLSID == aChartCLSID )
{
uno::Reference< text::XTextContent > xEmbeddedObject( xEmbeddedProps, uno::UNO_QUERY );
if( xEmbeddedObject.is() )
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index ec00463fe4ea..e35bd913129e 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -169,7 +169,7 @@ uno::Any* PropertyMapper::getValuePointer( tAnySequence& rPropValues
sal_Int32 nCount = rPropNames.getLength();
for( sal_Int32 nN = 0; nN < nCount; nN++ )
{
- if(rPropNames[nN].equals(rPropName))
+ if(rPropNames[nN] == rPropName)
return &rPropValues[nN];
}
return nullptr;
More information about the Libreoffice-commits
mailing list