[Libreoffice-commits] core.git: svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jul 14 09:31:14 UTC 2017
svx/source/dialog/srchdlg.cxx | 2 +-
svx/source/dialog/txenctab.cxx | 2 +-
svx/source/form/fmexpl.cxx | 2 +-
svx/source/form/fmundo.cxx | 2 +-
svx/source/form/formcontroller.cxx | 2 +-
svx/source/smarttags/SmartTagMgr.cxx | 2 +-
svx/source/svdraw/svdibrow.cxx | 6 +++---
svx/source/svdraw/svdobj.cxx | 4 ++--
svx/source/tbxctrls/extrusioncontrols.cxx | 4 ++--
svx/source/tbxctrls/fontworkgallery.cxx | 6 +++---
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 6 +++---
svx/source/toolbars/fontworkbar.cxx | 2 +-
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 6 +++---
svx/source/unodraw/UnoNameItemTable.cxx | 10 +++++-----
svx/source/unodraw/XPropertyTable.cxx | 8 ++++----
svx/source/xoutdev/xtable.cxx | 2 +-
16 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 4ccd802d9a0530ec74b52d2ad7fbaa2d085223cb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jul 14 10:34:38 2017 +0200
use more OUString::operator== in svx
Change-Id: Ice996c741e239767a7a15fe9b11147f5384150ba
Reviewed-on: https://gerrit.libreoffice.org/39940
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 03a07d5a7dad..8eb35e60fa15 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1594,7 +1594,7 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch )
// ignore identical strings
for (std::vector<OUString>::const_iterator i = pArr->begin(); i != pArr->end(); ++i)
{
- if ((*i).equals(rStr))
+ if ((*i) == rStr)
return;
}
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 497acba45171..e60e497c455a 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -48,7 +48,7 @@ rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) c
for ( sal_uInt32 i = 0; i < nCount; ++i )
{
- if (ResStringArray::GetString( i ).equals(rStr))
+ if (ResStringArray::GetString( i ) == rStr)
return rtl_TextEncoding( GetValue( i ) );
}
return RTL_TEXTENCODING_DONTKNOW;
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index c95c39856b8c..39be171835b2 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -229,7 +229,7 @@ bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
if( !pEntryData )
return false;
- if( !aText.equals(pEntryData->GetText()))
+ if( aText != pEntryData->GetText() )
return false;
if( !pEntryData->GetParent() && pParent )
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 4a0022e59674..dd149236bfe3 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -631,7 +631,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
OUString sControlSourceProperty;
aControlSourceProperty >>= sControlSourceProperty;
- aNewEntry.bIsValueProperty = (sControlSourceProperty.equals(evt.PropertyName));
+ aNewEntry.bIsValueProperty = (sControlSourceProperty == evt.PropertyName);
}
}
catch(const Exception&)
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 7c3d2d6f840f..37e4bb1b3676 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3912,7 +3912,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent&
#ifdef DBG_UTIL
OUString sName;
xParam->getPropertyValue(FM_PROP_NAME) >>= sName;
- DBG_ASSERT(sName.equals(pFinalValues->Name), "FormController::approveParameter: suspicious value names!");
+ DBG_ASSERT(sName == pFinalValues->Name, "FormController::approveParameter: suspicious value names!");
#endif
try { xParam->setPropertyValue(FM_PROP_VALUE, pFinalValues->Value); }
catch(Exception&)
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 410a26fa6eff..26234e7e4505 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -517,7 +517,7 @@ void SmartTagMgr::AssociateActionsWithRecognizers()
for ( sal_uInt32 l = 0; l < nSmartTagCountInActionLib; ++l )
{
const OUString aSmartTagNameInActionLib = xActionLib->getSmartTagName(l);
- if ( aSmartTagName.equals( aSmartTagNameInActionLib ) )
+ if ( aSmartTagName == aSmartTagNameInActionLib )
{
// found actions and recognizer for same smarttag
ActionReference aActionRef( xActionLib, l );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index ba60711d711f..495bf3781b3d 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -145,8 +145,8 @@ OUString ImpItemListRow::GetItemTypeStr() const
bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
{
- return (aName.equals(rEntry.aName)
- && aValue.equals(rEntry.aValue)
+ return (aName == rEntry.aName
+ && aValue == rEntry.aValue
&& eState==rEntry.eState
&& nWhichId==rEntry.nWhichId
&& bComment==rEntry.bComment
@@ -546,7 +546,7 @@ void SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, std::size_
ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum);
if (*pAktEntry!=rEntry) {
bool bStateDiff=rEntry.eState!=pAktEntry->eState;
- bool bValueDiff=!rEntry.aValue.equals(pAktEntry->aValue);
+ bool bValueDiff=rEntry.aValue != pAktEntry->aValue;
bool bAllDiff = true;
if (bStateDiff || bValueDiff) {
// check whether only state and/or value have changed
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 863329b4ed2d..310eb2834556 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -638,7 +638,7 @@ void SdrObject::SetName(const OUString& rStr)
ImpForcePlusData();
}
- if(pPlusData && !pPlusData->aObjName.equals(rStr))
+ if(pPlusData && pPlusData->aObjName != rStr)
{
// Undo/Redo for setting object's name (#i73249#)
bool bUndo( false );
@@ -726,7 +726,7 @@ void SdrObject::SetDescription(const OUString& rStr)
ImpForcePlusData();
}
- if(pPlusData && !pPlusData->aObjDescription.equals(rStr))
+ if(pPlusData && pPlusData->aObjDescription != rStr)
{
// Undo/Redo for setting object's description (#i73249#)
bool bUndo( false );
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4b25c99c98cd..400bc0f72a45 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -435,7 +435,7 @@ void ExtrusionDepthWindow::statusChanged(
const css::frame::FeatureStateEvent& Event
)
{
- if( Event.FeatureURL.Main.equals( msExtrusionDepth ) )
+ if( Event.FeatureURL.Main == msExtrusionDepth )
{
if( !Event.IsEnabled )
{
@@ -448,7 +448,7 @@ void ExtrusionDepthWindow::statusChanged(
implSetDepth( fValue );
}
}
- else if( Event.FeatureURL.Main.equals( msMetricUnit ) )
+ else if( Event.FeatureURL.Main == msMetricUnit )
{
if( Event.IsEnabled )
{
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index f5e4a426156d..d86c84067e57 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -301,7 +301,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event )
{
- if( Event.FeatureURL.Main.equals( msFontworkAlignment ) )
+ if( Event.FeatureURL.Main == msFontworkAlignment )
{
if( !Event.IsEnabled )
{
@@ -483,7 +483,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool bEnabled )
void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event )
{
- if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) )
+ if( Event.FeatureURL.Main == msFontworkCharacterSpacing )
{
if( !Event.IsEnabled )
{
@@ -496,7 +496,7 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta
implSetCharacterSpacing( nValue, true );
}
}
- else if( Event.FeatureURL.Main.equals( msFontworkKernCharacterPairs ) )
+ else if( Event.FeatureURL.Main == msFontworkKernCharacterPairs )
{
if( !Event.IsEnabled )
{
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index c50add3bfed1..91347d99cad5 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -367,7 +367,7 @@ void SearchToolbarControllersManager::registryController( const css::uno::Refere
sal_Int32 nSize = pIt->second.size();
for (sal_Int32 i=0; i<nSize; ++i)
{
- if (pIt->second[i].Name.equals(sCommandURL))
+ if (pIt->second[i].Name == sCommandURL)
return;
}
@@ -384,7 +384,7 @@ void SearchToolbarControllersManager::freeController( const css::uno::Reference<
{
for (SearchToolbarControllersVec::iterator pItCtrl=pIt->second.begin(); pItCtrl!=pIt->second.end(); ++pItCtrl)
{
- if (pItCtrl->Name.equals(sCommandURL))
+ if (pItCtrl->Name == sCommandURL)
{
pIt->second.erase(pItCtrl);
break;
@@ -405,7 +405,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag
{
for (SearchToolbarControllersVec::iterator pItCtrl =pIt->second.begin(); pItCtrl != pIt->second.end(); ++pItCtrl)
{
- if (pItCtrl->Name.equals(sCommandURL))
+ if (pItCtrl->Name == sCommandURL)
{
pItCtrl->Value >>= xStatusListener;
break;
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index e92a65e9dfe1..7919070045e3 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -154,7 +154,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
{
if ( !aFontWorkShapeType.isEmpty() )
{
- if ( !aFontWorkShapeType.equals( aType ) ) // different FontWorkShapeTypes selected ?
+ if ( aFontWorkShapeType != aType ) // different FontWorkShapeTypes selected ?
{
aFontWorkShapeType.clear();
break;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 906b21a25e58..997a12d5a7c4 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -213,7 +213,7 @@ DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const
for( sal_Int32 nN=GetRowCount(); nN--; )
{
DictionaryEntry* pE = getEntryOnPos( nN );
- if( pE && rTerm.equals( pE->m_aTerm ) )
+ if( pE && rTerm == pE->m_aTerm )
return pE;
}
return nullptr;
@@ -257,7 +257,7 @@ sal_uIntPtr DictionaryList::deleteEntries( const OUString& rTerm )
for( sal_Int32 nN=GetRowCount(); nN--; )
{
DictionaryEntry* pCurEntry = getEntryOnPos( nN );
- if( rTerm.equals( pCurEntry->m_aTerm ) )
+ if( rTerm == pCurEntry->m_aTerm )
{
nPos = nN;
SvTreeListEntry* pCurLBEntry = GetEntryOnPos( nN );
@@ -697,7 +697,7 @@ void ChineseDictionaryDialog::updateButtons()
{
DictionaryEntry* pFirstSelectedEntry = getActiveDictionary().getFirstSelectedEntry();
bModify = !bAdd && getActiveDictionary().GetSelectedRowCount()==1
- && pFirstSelectedEntry && pFirstSelectedEntry->m_aTerm.equals( m_pED_Term->GetText() );
+ && pFirstSelectedEntry && pFirstSelectedEntry->m_aTerm == m_pED_Term->GetText();
if( bModify && isEditFieldsContentEqualsSelectedListContent() )
bModify = false;
}
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 93b1a51988c5..64c2947d5df7 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -126,7 +126,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
while( aIter != aEnd )
{
const NameOrIndex *pItem = static_cast<const NameOrIndex *>(&((*aIter)->Get( mnWhich ) ));
- if (sName.equals(pItem->GetName()))
+ if (sName == pItem->GetName())
{
maItemSetVector.erase( aIter );
return;
@@ -151,7 +151,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
while( aIter != aEnd )
{
const NameOrIndex *pItem = static_cast<const NameOrIndex *>(&((*aIter)->Get( mnWhich ) ));
- if (aName.equals(pItem->GetName()))
+ if (aName == pItem->GetName())
{
NameOrIndex* pNewItem = createItem();
pNewItem->SetName(aName);
@@ -172,7 +172,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
NameOrIndex *pItem = const_cast<NameOrIndex*>(static_cast<const NameOrIndex*>(mpModelPool->GetItem2( mnWhich, nSurrogate)));
- if (pItem && aName.equals(pItem->GetName()))
+ if (pItem && aName == pItem->GetName())
{
pItem->PutValue( aElement, mnMemberId );
bFound = true;
@@ -208,7 +208,7 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
{
const NameOrIndex *pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( mnWhich, nSurrogate ));
- if (isValid(pItem) && aName.equals(pItem->GetName()))
+ if (isValid(pItem) && aName == pItem->GetName())
{
pItem->QueryValue( aAny, mnMemberId );
return aAny;
@@ -258,7 +258,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
const NameOrIndex *pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( mnWhich, nSurrogate ));
- if (isValid(pItem) && aName.equals(pItem->GetName()))
+ if (isValid(pItem) && aName == pItem->GetName())
return true;
}
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 8a21c0c6e06b..92bf5d6e396b 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -128,7 +128,7 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
for( i = 0; i < nCount; i++ )
{
const XPropertyEntry* pEntry = get(i);
- if (pEntry && aInternalName.equals(pEntry->GetName()))
+ if (pEntry && aInternalName == pEntry->GetName())
{
mpList->Remove(i);
return;
@@ -150,7 +150,7 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const
for( i = 0; i < nCount; i++ )
{
const XPropertyEntry* pEntry = get(i);
- if (pEntry && aInternalName.equals(pEntry->GetName()))
+ if (pEntry && aInternalName == pEntry->GetName())
{
std::unique_ptr<XPropertyEntry> pNewEntry(createEntry(aInternalName, aElement));
if (!pNewEntry)
@@ -177,7 +177,7 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName )
{
const XPropertyEntry* pEntry = get(i);
- if (pEntry && aInternalName.equals(pEntry->GetName()))
+ if (pEntry && aInternalName == pEntry->GetName())
return getAny( pEntry );
}
@@ -214,7 +214,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName )
for( i = 0; i < nCount; i++ )
{
const XPropertyEntry* pEntry = get(i);
- if (pEntry && aInternalName.equals(pEntry->GetName()))
+ if (pEntry && aInternalName == pEntry->GetName())
return true;
}
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index e80016640775..fbaba94c97e1 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -166,7 +166,7 @@ long XPropertyList::GetIndex(const OUString& rName) const
}
for( long i = 0, n = maList.size(); i < n; ++i ) {
- if (rName.equals(maList[ i ]->GetName())) {
+ if (rName == maList[ i ]->GetName()) {
return i;
}
}
More information about the Libreoffice-commits
mailing list