diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 09:55:21 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 11:03:14 +0200 |
commit | a394d67f374e1b253f288a58113a3cfc8d301743 (patch) | |
tree | 91190e8212fc72b1c91a0e629c3504f59095d71b /cui/source/dialogs | |
parent | 8a75aa52ef572655db261679da431aff84f52348 (diff) |
use more OUString::operator== comphelper..cui
Change-Id: Ib5f3037249152be2b66acf347d1a0c236dc7adfa
Reviewed-on: https://gerrit.libreoffice.org/39888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 092fdc5e46d2..3ce4048d4021 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -75,15 +75,15 @@ struct SpellErrorDescription bool operator==( const SpellErrorDescription& rDesc ) const { return bIsGrammarError == rDesc.bIsGrammarError && - sErrorText.equals( rDesc.sErrorText ) && - aLocale.Language.equals( rDesc.aLocale.Language ) && - aLocale.Country.equals( rDesc.aLocale.Country ) && - aLocale.Variant.equals( rDesc.aLocale.Variant ) && + sErrorText == rDesc.sErrorText && + aLocale.Language == rDesc.aLocale.Language && + aLocale.Country == rDesc.aLocale.Country && + aLocale.Variant == rDesc.aLocale.Variant && aSuggestions == rDesc.aSuggestions && xGrammarChecker == rDesc.xGrammarChecker && - sDialogTitle.equals( rDesc.sDialogTitle ) && - sExplanation.equals( rDesc.sExplanation ) && - sExplanationURL.equals( rDesc.sExplanationURL ) && + sDialogTitle == rDesc.sDialogTitle && + sExplanation == rDesc.sExplanation && + sExplanationURL == rDesc.sExplanationURL && sRuleId == rDesc.sRuleId; } }; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 1fb06ab73da0..d36cd93a4fed 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -467,7 +467,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void ) //if it's not the 'no suggestions' entry if(sWrong == sCurrentErrorText && m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 && - !m_sNoSuggestionsST.equals(m_pSuggestionLB->GetSelectEntry())) + m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry()) { sCurrentErrorText = m_pSuggestionLB->GetSelectEntry(); } @@ -538,7 +538,7 @@ OUString SpellDialog::getReplacementString() const if(m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount()>0 && - !m_sNoSuggestionsST.equals(m_pSuggestionLB->GetSelectEntry())) + m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry()) sReplacement = m_pSuggestionLB->GetSelectEntry(); return getDotReplacementString(sOrigString, sReplacement); @@ -711,7 +711,7 @@ void SpellDialog::Impl_Restore(bool bUseSavedSentence) IMPL_LINK_NOARG(SpellDialog, IgnoreHdl, Button*, void) { - if (m_sResumeST.equals(m_pIgnorePB->GetText())) + if (m_sResumeST == m_pIgnorePB->GetText()) { Impl_Restore(false); } @@ -1727,7 +1727,7 @@ void SentenceEditWindow_Impl::RestoreCurrentError() if( pAttrib ) { const SpellErrorDescription& rDesc = pAttrib->GetErrorDescription(); - if( !rDesc.sErrorText.equals( GetErrorText() ) ) + if( rDesc.sErrorText != GetErrorText() ) ChangeMarkedWord(rDesc.sErrorText, LanguageTag::convertToLanguageType( rDesc.aLocale )); } } diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 44c3d21c742b..1b07b528665f 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1468,11 +1468,11 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a { for( sal_Int32 n = 0; n < aProps.getLength(); n++ ) { - if( aProps[n].Name.equals( msColorKey ) ) + if( aProps[n].Name == msColorKey ) { aProps[n].Value >>= mnColor; } - else if( aProps[n].Name.equals( msModeKey ) ) + else if( aProps[n].Name == msModeKey ) { aProps[n].Value >>= mnMode; } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 82c3000d21f2..fd3d9b3ba8df 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -262,7 +262,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni // control characters, as can be the case with memo fields), I use // an empty OUString. OUString sRealSetText = m_pcmbSearchText->GetText(); - if (!sRealSetText.equals(sInitialText)) + if (sRealSetText != sInitialText) m_pcmbSearchText->SetText(OUString()); LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 1e3860d71456..ec0f4e4c1f1e 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -192,10 +192,10 @@ void SFTreeListBox::Init( const OUString& language ) bool app = false; OUString uiName = children[ n ]->getName(); OUString factoryURL; - if ( uiName.equals( userStr ) || uiName.equals( shareStr ) ) + if ( uiName == userStr || uiName == shareStr ) { app = true; - if ( uiName.equals( userStr ) ) + if ( uiName == userStr ) { uiName = m_sMyMacros; } @@ -261,7 +261,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, OUString& if ( model.is() ) { OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model ); - if( sTdocUrl.equals( docName ) ) + if( sTdocUrl == docName ) { xModel = model; break; @@ -281,7 +281,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo Sequence < Reference< browse::XBrowseNode > > children = rootNode->getChildNodes(); for ( sal_Int32 n = 0; n < children.getLength(); n++ ) { - if ( children[ n ]->getName().equals( language ) ) + if ( children[ n ]->getName() == language ) { langNode = children[ n ]; break; |