summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-14 09:24:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-14 10:12:31 +0200
commitd7e06e46acc2ee17101cef63e59b9f5efcbfab14 (patch)
tree7f2ee4381babadafaaaf94e1ca210e1d98e5aa14 /sd/source/ui/view
parente47fda7d4759f4ac911c882881dba1eee539726c (diff)
use more OUString::operator== in scaddins..sdext
Change-Id: I8bc5c925f940283bc54698bbcba77efcca883273 Reviewed-on: https://gerrit.libreoffice.org/39937 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx2
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx2
-rw-r--r--sd/source/ui/view/drviews1.cxx2
-rw-r--r--sd/source/ui/view/drviewsb.cxx2
-rw-r--r--sd/source/ui/view/sdview2.cxx4
5 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index f7143d945d9d..0d9e7bd5406d 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -910,7 +910,7 @@ bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) co
}
while (false);
- if (rsName.equals(msViewerToolBar))
+ if (rsName == msViewerToolBar)
bValid = bIsPlugInMode;
else
bValid = ! bIsPlugInMode;
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 8de2540aa347..98b059e90581 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -235,7 +235,7 @@ vcl::Window* ViewTabBar::GetAnchorWindow(
void SAL_CALL ViewTabBar::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent)
{
- if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent)
+ if (rEvent.Type == FrameworkHelper::msResourceActivationEvent
&& rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix)
&& rEvent.ResourceId->isBoundTo(mxViewTabBarId->getAnchor(), AnchorBindingMode_DIRECT))
{
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 056f25ca1277..23e21891e2d2 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -843,7 +843,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
SdPage* pCurrentPage = pPV ? dynamic_cast<SdPage*>(pPV->GetPage()) : nullptr;
if (pCurrentPage
&& pNewPage == pCurrentPage
- && maTabControl->GetPageText(maTabControl->GetPageId(nSelectedPage)).equals(pNewPage->GetName()))
+ && maTabControl->GetPageText(maTabControl->GetPageId(nSelectedPage)) == pNewPage->GetName())
{
// this slide is already visible
return true;
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 6381526a08f3..c22a012ae94e 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -171,7 +171,7 @@ void DrawViewShell::ModifyLayer (
for( nPos = 0; nPos < nPageCount; nPos++ )
{
sal_uInt16 nId = GetLayerTabControl()->GetPageId( nPos );
- if (GetLayerTabControl()->GetPageText(nId).equals(pLayer->GetName()))
+ if (GetLayerTabControl()->GetPageText(nId) == pLayer->GetName())
{
nCurPage = nId;
break;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 2844da7cead8..852208426834 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -737,7 +737,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
{
const OUString aDocName( aBookmark.copy( 0, nIndex ) );
- if (mpDocSh->GetMedium()->GetName() == aDocName || aDocName.equals(mpDocSh->GetName()))
+ if (mpDocSh->GetMedium()->GetName() == aDocName || aDocName == mpDocSh->GetName())
{
// internal jump, only use the part after and including '#'
eClickAction = presentation::ClickAction_BOOKMARK;
@@ -896,7 +896,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
}
}
- bListIdentical = pIter->equals(aNewName);
+ bListIdentical = *pIter == aNewName;
rExchangeList.push_back(aNewName);
}