diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 09:53:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 11:02:55 +0200 |
commit | 8a75aa52ef572655db261679da431aff84f52348 (patch) | |
tree | c1d6133b1942c756d9160c51c2f95abfbaab5780 /basctl | |
parent | 46ba298934d1765365018349f26f8a732cefba63 (diff) |
use more OUString::operator== in a*..chart2
Change-Id: Ifb5608abebffd9687ed55e8c74f9be54a749111d
Reviewed-on: https://gerrit.libreoffice.org/39887
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/bastype2.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/bastype3.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/managelang.cxx | 6 |
5 files changed, 8 insertions, 8 deletions
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; } |