[Libreoffice-commits] core.git: scaddins/source scripting/source sdext/source sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jul 14 08:13:06 UTC 2017
scaddins/source/analysis/analysishelper.cxx | 2 -
scripting/source/protocolhandler/scripthandler.cxx | 4 +-
scripting/source/provider/ProviderCache.hxx | 9 ++----
sd/source/core/drawdoc2.cxx | 4 +-
sd/source/core/sdpage2.cxx | 2 -
sd/source/filter/xml/sdtransform.cxx | 2 -
sd/source/ui/animations/SlideTransitionPane.cxx | 2 -
sd/source/ui/framework/configuration/ConfigurationClassifier.cxx | 4 +-
sd/source/ui/framework/configuration/ResourceId.cxx | 10 +++----
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2 -
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 2 -
sd/source/ui/framework/factories/BasicViewFactory.cxx | 14 +++++-----
sd/source/ui/framework/module/CenterViewFocusModule.cxx | 4 +-
sd/source/ui/framework/module/ResourceManager.cxx | 4 +-
sd/source/ui/framework/module/ShellStackGuard.cxx | 2 -
sd/source/ui/framework/module/SlideSorterModule.cxx | 12 ++++----
sd/source/ui/framework/module/ToolPanelModule.cxx | 2 -
sd/source/ui/framework/tools/FrameworkHelper.cxx | 4 +-
sd/source/ui/remotecontrol/ImagePreparer.cxx | 4 +-
sd/source/ui/remotecontrol/Server.cxx | 8 ++---
sd/source/ui/sidebar/DocumentHelper.cxx | 2 -
sd/source/ui/sidebar/LayoutMenu.cxx | 8 ++---
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 10 +++----
sd/source/ui/slideshow/PaneHider.cxx | 2 -
sd/source/ui/tools/EventMultiplexer.cxx | 4 +-
sd/source/ui/view/ToolBarManager.cxx | 2 -
sd/source/ui/view/ViewTabBar.cxx | 2 -
sd/source/ui/view/drviews1.cxx | 2 -
sd/source/ui/view/drviewsb.cxx | 2 -
sd/source/ui/view/sdview2.cxx | 4 +-
sdext/source/minimizer/pppoptimizeruno.cxx | 2 -
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 4 +-
sdext/source/presenter/PresenterNotesView.cxx | 4 +-
sdext/source/presenter/PresenterTheme.cxx | 4 +-
sdext/source/presenter/PresenterViewFactory.cxx | 12 ++++----
35 files changed, 79 insertions(+), 82 deletions(-)
New commits:
commit d7e06e46acc2ee17101cef63e59b9f5efcbfab14
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jul 14 09:24:17 2017 +0200
use more OUString::operator== in scaddins..sdext
Change-Id: I8bc5c925f940283bc54698bbcba77efcca883273
Reviewed-on: https://gerrit.libreoffice.org/39937
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 93707db0d0cb..6b7e3dbe8501 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2145,7 +2145,7 @@ sal_Int16 ConvertData::GetMatchingLevel( const OUString& rRef ) const
const sal_Unicode* p = aStr.getStr();
aStr = OUString( p, nLen - 2 ) + OUStringLiteral1( p[ nLen - 1 ] );
}
- if( aName.equals( aStr ) )
+ if( aName == aStr )
return 0;
else
{
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 08c226a62ad6..7fa2a3d990b9 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -490,8 +490,8 @@ extern "C"
css::uno::Reference< css::lang::XMultiServiceFactory > xServiceManager(
static_cast< css::lang::XMultiServiceFactory* >( pServiceManager ) ) ;
- if ( ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName().equals(
- OUString::createFromAscii( pImplementationName ) ) )
+ if ( ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName().equalsAscii(
+ pImplementationName ) )
{
xFactory = ::scripting_protocolhandler::ScriptProtocolHandler::impl_createFactory( xServiceManager );
}
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 48aa4828c9c6..75e062073c9f 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -71,14 +71,11 @@ private:
createProvider( ProviderDetails& details );
bool isInBlackList( const OUString& serviceName )
{
- if ( m_sBlackList.getLength() > 0 )
+ for ( sal_Int32 index = 0; index < m_sBlackList.getLength(); index++ )
{
- for ( sal_Int32 index = 0; index < m_sBlackList.getLength(); index++ )
+ if ( m_sBlackList[ index ] == serviceName )
{
- if ( m_sBlackList[ index ].equals( serviceName ) )
- {
- return true;
- }
+ return true;
}
}
return false;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 73bd440f9c54..879c21425742 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -97,7 +97,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const
{
pObj = aIter.Next();
- if( ( pObj->GetName().equals(rObjName) ) ||
+ if( ( pObj->GetName() == rObjName ) ||
( SdrInventor::Default == pObj->GetObjInventor() &&
OBJ_OLE2 == pObj->GetObjIdentifier() &&
rObjName == static_cast< SdrOle2Obj* >( pObj )->GetPersistName() ) )
@@ -122,7 +122,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const
{
pObj = aIter.Next();
- if( ( pObj->GetName().equals(rObjName) ) ||
+ if( ( pObj->GetName() == rObjName ) ||
( SdrInventor::Default == pObj->GetObjInventor() &&
OBJ_OLE2 == pObj->GetObjIdentifier() &&
rObjName == static_cast< SdrOle2Obj* >( pObj )->GetPersistName() ) )
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index f9eefaad0c5e..6fbc8be11560 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -328,7 +328,7 @@ void SdPage::ConnectLink()
**********************************************************************/
::sd::DrawDocShell* pDocSh = static_cast<SdDrawDocument*>(pModel)->GetDocSh();
- if (!pDocSh || !pDocSh->GetMedium()->GetOrigURL().equals(maFileName))
+ if (!pDocSh || pDocSh->GetMedium()->GetOrigURL() != maFileName)
{
// No links to document owned pages!
mpPageLink = new SdPageLink(this, maFileName, maBookmarkName);
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index 715789504cce..99918dae0050 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -284,7 +284,7 @@ bool SdTransformOOo2xDocument::getBulletState( const SfxItemSet& rSet, sal_uInt1
if( ( rAttr.GetAttrLName( nItem ) == msEnableNumbering ) && ( rAttr.GetAttrNamespace( nItem ) == msTextNamespace ) )
{
const OUString& sValue( rAttr.GetAttrValue( nItem ) );
- rState = sValue.equals(msTrue);
+ rState = sValue == msTrue;
return true;
}
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 7f5b85598462..2039d405659a 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1062,7 +1062,7 @@ void SlideTransitionPane::updateVariants( size_t nPresetOffset )
size_t nFirstItem = 0, nItem = 1;
for( const auto& aIt: rPresetList )
{
- if( aIt->getSetId().equals( (*pFound)->getSetId() ) )
+ if( aIt->getSetId() == (*pFound)->getSetId() )
{
if (!nFirstItem)
nFirstItem = nItem;
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index 4fd6ed2b6c4d..0f82b82f8658 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -103,7 +103,7 @@ void ConfigurationClassifier::ClassifyResources (
{
bool bFound (false);
for (sal_Int32 j=0; j<nL2 && !bFound; ++j)
- if (aA1[i]->getResourceURL().equals(aA2[j]->getResourceURL()))
+ if (aA1[i]->getResourceURL() == aA2[j]->getResourceURL())
bFound = true;
if (bFound)
@@ -119,7 +119,7 @@ void ConfigurationClassifier::ClassifyResources (
{
bool bFound (false);
for (sal_Int32 i=0; i<nL1 && !bFound; ++i)
- if (aA2[j]->getResourceURL().equals(aA1[i]->getResourceURL()))
+ if (aA2[j]->getResourceURL() == aA1[i]->getResourceURL())
bFound = true;
if ( ! bFound)
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 7eec7882c999..35a8f98821ec 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -433,8 +433,8 @@ bool ResourceId::IsBoundToAnchor (
sal_uInt32 nCount = paAnchorURLs->getLength();
while (nOffset < nCount)
{
- if ( ! maResourceURLs[nLocalAnchorURLCount - nOffset].equals(
- (*paAnchorURLs)[nCount - 1 - nOffset]))
+ if ( maResourceURLs[nLocalAnchorURLCount - nOffset] !=
+ (*paAnchorURLs)[nCount - 1 - nOffset] )
{
return false;
}
@@ -443,7 +443,7 @@ bool ResourceId::IsBoundToAnchor (
}
if (bHasFirstAnchorURL)
{
- if ( ! psFirstAnchorURL->equals(maResourceURLs[nLocalAnchorURLCount - nOffset]))
+ if ( *psFirstAnchorURL != maResourceURLs[nLocalAnchorURLCount - nOffset] )
return false;
}
@@ -468,8 +468,8 @@ bool ResourceId::IsBoundToAnchor (
// id and the given anchor.
for (sal_uInt32 nOffset=0; nOffset<nAnchorURLCount; ++nOffset)
{
- if ( ! maResourceURLs[nLocalAnchorURLCount - nOffset].equals(
- rAnchorURLs[nAnchorURLCount - 1 - nOffset]))
+ if ( maResourceURLs[nLocalAnchorURLCount - nOffset] !=
+ rAnchorURLs[nAnchorURLCount - 1 - nOffset] )
{
return false;
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index aea1f28b4811..0660bdabd107 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -72,7 +72,7 @@ public:
*/
bool mbIsReleased;
- bool CompareURL(const OUString& rsPaneURL) const { return msPaneURL.equals(rsPaneURL); }
+ bool CompareURL(const OUString& rsPaneURL) const { return msPaneURL == rsPaneURL; }
bool ComparePane(const Reference<XResource>& rxPane) const { return mxPane == rxPane; }
};
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 3dd122c4154d..8967d4b4eb72 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -126,7 +126,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource (
Reference<XResource> xToolBar;
- if (rxToolBarId->getResourceURL().equals(FrameworkHelper::msViewTabBarURL))
+ if (rxToolBarId->getResourceURL() == FrameworkHelper::msViewTabBarURL)
{
xToolBar = new ViewTabBar(rxToolBarId, mxController);
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 9eb50d7b5818..4c8cb0203a16 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -324,7 +324,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
{
std::shared_ptr<ViewShell> pViewShell;
const OUString& rsViewURL (rxViewId->getResourceURL());
- if (rsViewURL.equals(FrameworkHelper::msImpressViewURL))
+ if (rsViewURL == FrameworkHelper::msImpressViewURL)
{
pViewShell.reset(
new DrawViewShell(
@@ -334,7 +334,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
pFrameView));
pViewShell->GetContentWindow()->set_id("impress_win");
}
- else if (rsViewURL.equals(FrameworkHelper::msDrawViewURL))
+ else if (rsViewURL == FrameworkHelper::msDrawViewURL)
{
pViewShell.reset(
new GraphicViewShell (
@@ -343,7 +343,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
pFrameView));
pViewShell->GetContentWindow()->set_id("draw_win");
}
- else if (rsViewURL.equals(FrameworkHelper::msOutlineViewURL))
+ else if (rsViewURL == FrameworkHelper::msOutlineViewURL)
{
pViewShell.reset(
new OutlineViewShell (
@@ -353,7 +353,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
pFrameView));
pViewShell->GetContentWindow()->set_id("outline_win");
}
- else if (rsViewURL.equals(FrameworkHelper::msNotesViewURL))
+ else if (rsViewURL == FrameworkHelper::msNotesViewURL)
{
pViewShell.reset(
new DrawViewShell(
@@ -363,7 +363,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
pFrameView));
pViewShell->GetContentWindow()->set_id("notes_win");
}
- else if (rsViewURL.equals(FrameworkHelper::msHandoutViewURL))
+ else if (rsViewURL == FrameworkHelper::msHandoutViewURL)
{
pViewShell.reset(
new DrawViewShell(
@@ -373,7 +373,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
pFrameView));
pViewShell->GetContentWindow()->set_id("handout_win");
}
- else if (rsViewURL.equals(FrameworkHelper::msPresentationViewURL))
+ else if (rsViewURL == FrameworkHelper::msPresentationViewURL)
{
pViewShell.reset(
new PresentationViewShell(
@@ -382,7 +382,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
pFrameView));
pViewShell->GetContentWindow()->set_id("presentation_win");
}
- else if (rsViewURL.equals(FrameworkHelper::msSlideSorterURL))
+ else if (rsViewURL == FrameworkHelper::msSlideSorterURL)
{
pViewShell = ::sd::slidesorter::SlideSorterViewShell::Create (
&rFrame,
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index c8543232f538..fa097d700643 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -105,11 +105,11 @@ void SAL_CALL CenterViewFocusModule::notifyConfigurationChange (
{
if (mbValid)
{
- if (rEvent.Type.equals(FrameworkHelper::msConfigurationUpdateEndEvent))
+ if (rEvent.Type == FrameworkHelper::msConfigurationUpdateEndEvent)
{
HandleNewView(rEvent.Configuration);
}
- else if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent))
+ else if (rEvent.Type == FrameworkHelper::msResourceActivationEvent)
{
if (rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
mbNewViewCreated = true;
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index a0c77e24b83f..6ca871a0d823 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -125,8 +125,8 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
{
// A resource directly bound to the center pane has been
// requested.
- if (rEvent.ResourceId->getResourceTypePrefix().equals(
- FrameworkHelper::msViewURLPrefix))
+ if (rEvent.ResourceId->getResourceTypePrefix() ==
+ FrameworkHelper::msViewURLPrefix)
{
// The requested resource is a view. Show or hide the
// resource managed by this ResourceManager accordingly.
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index 79171d026bd2..f86d95075016 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -91,7 +91,7 @@ void SAL_CALL ShellStackGuard::disposing()
void SAL_CALL ShellStackGuard::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent)
{
- if (rEvent.Type.equals(FrameworkHelper::msConfigurationUpdateStartEvent))
+ if (rEvent.Type == FrameworkHelper::msConfigurationUpdateStartEvent)
{
if (mpUpdateLock.get() == nullptr && IsPrinting())
{
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 6315ec335a14..4ba27c0ac06b 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -88,7 +88,7 @@ void SlideSorterModule::SaveResourceState()
void SAL_CALL SlideSorterModule::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent)
{
- if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent))
+ if (rEvent.Type == FrameworkHelper::msResourceActivationEvent)
{
if (rEvent.ResourceId->compareTo(mxViewTabBarId) == 0)
{
@@ -96,11 +96,11 @@ void SAL_CALL SlideSorterModule::notifyConfigurationChange (
// become active.
UpdateViewTabBar(Reference<XTabBar>(rEvent.ResourceObject,UNO_QUERY));
}
- else if (rEvent.ResourceId->getResourceTypePrefix().equals(
- FrameworkHelper::msViewURLPrefix)
- && rEvent.ResourceId->isBoundTo(
- FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
- AnchorBindingMode_DIRECT))
+ else if (rEvent.ResourceId->getResourceTypePrefix() ==
+ FrameworkHelper::msViewURLPrefix
+ && rEvent.ResourceId->isBoundTo(
+ FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+ AnchorBindingMode_DIRECT))
{
// Update the view tab bar because the view in the center pane
// has changed.
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 5915384cfd0a..d2e5e7e09294 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -79,7 +79,7 @@ void ToolPanelModule::SaveResourceState()
void SAL_CALL ToolPanelModule::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent)
{
- if (!rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent))
+ if (rEvent.Type != FrameworkHelper::msResourceActivationEvent)
ResourceManager::notifyConfigurationChange(rEvent);
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index e6924862dc99..163ee147e400 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -620,7 +620,7 @@ void FrameworkHelper::HandleModeChangeSlot (
|| nSlotId == SID_HANDOUT_MASTER_MODE)
eEMode = EditMode::MasterPage;
// Ensure we have the expected view shell
- if (!(xView.is() && xView->getResourceId()->getResourceURL().equals(sRequestedView)))
+ if (!(xView.is() && xView->getResourceId()->getResourceURL() == sRequestedView))
{
const auto xId = CreateResourceId(sRequestedView, msCenterPaneURL);
@@ -901,7 +901,7 @@ void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent)
void SAL_CALL CallbackCaller::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent)
{
- if (rEvent.Type.equals(msEventType) && maFilter(rEvent))
+ if (rEvent.Type == msEventType && maFilter(rEvent))
{
maCallback(true);
if (mxConfigurationController.is())
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index c765ca6a0c9a..ffd019b0c128 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -230,7 +230,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
uno::Reference<lang::XServiceName> xServiceName (
xIndexAccess->getByIndex(nIndex), UNO_QUERY);
if (xServiceName.is()
- && xServiceName->getServiceName().equals(sNotesShapeName))
+ && xServiceName->getServiceName() == sNotesShapeName)
{
uno::Reference<text::XTextRange> xText (xServiceName, UNO_QUERY);
if (xText.is())
@@ -246,7 +246,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
if (xShapeDescriptor.is())
{
OUString sType (xShapeDescriptor->getShapeType());
- if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName))
+ if (sType == sNotesShapeName || sType == sTextShapeName)
{
uno::Reference<text::XTextRange> xText (
xIndexAccess->getByIndex(nIndex), UNO_QUERY);
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 7382ad00a80a..125b8d832108 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -146,14 +146,14 @@ void RemoteServer::execute()
bool aFound = false;
for ( int i = 0; i < aNames.getLength(); i++ )
{
- if ( aNames[i].equals( pClient->mName ) )
+ if ( aNames[i] == pClient->mName )
{
Reference<XNameAccess> xSetItem( xConfig->getByName(aNames[i]), UNO_QUERY );
Any axPin(xSetItem->getByName("PIN"));
OUString sPin;
axPin >>= sPin;
- if ( sPin.equals( pClient->mPin ) ) {
+ if ( sPin == pClient->mPin ) {
SAL_INFO( "sdremote", "client found on validated list -- connecting" );
connectClient( pClient, sPin );
aFound = true;
@@ -281,7 +281,7 @@ bool RemoteServer::connectClient( const std::shared_ptr< ClientInfo >& pClient,
return false;
}
- if ( apClient->mPin.equals( aPin ) )
+ if ( apClient->mPin == aPin )
{
// Save in settings first
std::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create();
@@ -298,7 +298,7 @@ bool RemoteServer::connectClient( const std::shared_ptr< ClientInfo >& pClient,
Sequence< OUString > aNames = xConfig->getElementNames();
for ( int i = 0; i < aNames.getLength(); i++ )
{
- if ( aNames[i].equals( apClient->mName ) )
+ if ( aNames[i] == apClient->mName )
{
xConfig->replaceByName( apClient->mName, makeAny( xChild ) );
aSaved = true;
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index d0588b522e69..bb2a3d853e66 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -499,7 +499,7 @@ SdPage* DocumentHelper::ProvideMasterPage (
for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex)
{
SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex));
- if (pCandidate && sMasterPageLayoutName.equals(pCandidate->GetLayoutName()))
+ if (pCandidate && sMasterPageLayoutName == pCandidate->GetLayoutName())
{
// The requested master page does already exist in the
// target document, return it.
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index c3e635a3ca87..ef39e00b5fc1 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -519,16 +519,16 @@ void LayoutMenu::Fill()
{}
const snewfoil_value_info* pInfo = nullptr;
- if (sCenterPaneViewName.equals(framework::FrameworkHelper::msNotesViewURL))
+ if (sCenterPaneViewName == framework::FrameworkHelper::msNotesViewURL)
{
pInfo = notes;
}
- else if (sCenterPaneViewName.equals(framework::FrameworkHelper::msHandoutViewURL))
+ else if (sCenterPaneViewName == framework::FrameworkHelper::msHandoutViewURL)
{
pInfo = handout;
}
- else if (sCenterPaneViewName.equals(framework::FrameworkHelper::msImpressViewURL)
- || sCenterPaneViewName.equals(framework::FrameworkHelper::msSlideSorterURL))
+ else if (sCenterPaneViewName == framework::FrameworkHelper::msImpressViewURL
+ || sCenterPaneViewName == framework::FrameworkHelper::msSlideSorterURL)
{
pInfo = standard;
}
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index c366684f4387..4426d1260092 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -292,7 +292,7 @@ bool MasterPageDescriptor::URLComparator::operator() (
if (rDescriptor.get() == nullptr)
return false;
else
- return rDescriptor->msURL.equals(msURL);
+ return rDescriptor->msURL == msURL;
}
// ===== StyleNameComparator ==================================================
@@ -308,7 +308,7 @@ bool MasterPageDescriptor::StyleNameComparator::operator() (
if (rDescriptor.get() == nullptr)
return false;
else
- return rDescriptor->msStyleName.equals(msStyleName);
+ return rDescriptor->msStyleName == msStyleName;
}
//===== PageObjectComparator ==================================================
@@ -349,11 +349,11 @@ bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDesc
mpDescriptor->meOrigin == rDescriptor->meOrigin
&& (
(!mpDescriptor->msURL.isEmpty()
- && mpDescriptor->msURL.equals(rDescriptor->msURL))
+ && mpDescriptor->msURL == rDescriptor->msURL)
|| (!mpDescriptor->msPageName.isEmpty()
- && mpDescriptor->msPageName.equals(rDescriptor->msPageName))
+ && mpDescriptor->msPageName == rDescriptor->msPageName)
|| (!mpDescriptor->msStyleName.isEmpty()
- && mpDescriptor->msStyleName.equals(rDescriptor->msStyleName))
+ && mpDescriptor->msStyleName == rDescriptor->msStyleName)
|| (mpDescriptor->mpMasterPage!=nullptr
&& mpDescriptor->mpMasterPage==rDescriptor->mpMasterPage)
|| (mpDescriptor->mpPageObjectProvider.get()!=nullptr
diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx
index 09094687b3d5..03eb26d69b87 100644
--- a/sd/source/ui/slideshow/PaneHider.cxx
+++ b/sd/source/ui/slideshow/PaneHider.cxx
@@ -65,7 +65,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
for (sal_Int32 nIndex=0; nIndex<aResources.getLength(); ++nIndex)
{
Reference<XResourceId> xPaneId (aResources[nIndex]);
- if ( ! xPaneId->getResourceURL().equals(FrameworkHelper::msCenterPaneURL))
+ if ( xPaneId->getResourceURL() != FrameworkHelper::msCenterPaneURL )
{
mxConfigurationController->requestResourceDeactivation(xPaneId);
}
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 6496ac33f805..8a7597395b09 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -531,7 +531,7 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
}
// Add selection change listener at slide sorter.
- if (rEvent.ResourceId->getResourceURL().equals(FrameworkHelper::msSlideSorterURL))
+ if (rEvent.ResourceId->getResourceURL() == FrameworkHelper::msSlideSorterURL)
{
slidesorter::SlideSorterViewShell* pViewShell
= dynamic_cast<slidesorter::SlideSorterViewShell*>(
@@ -557,7 +557,7 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
// Remove selection change listener from slide sorter. Add
// selection change listener at slide sorter.
- if (rEvent.ResourceId->getResourceURL().equals(FrameworkHelper::msSlideSorterURL))
+ if (rEvent.ResourceId->getResourceURL() == FrameworkHelper::msSlideSorterURL)
{
slidesorter::SlideSorterViewShell* pViewShell
= dynamic_cast<slidesorter::SlideSorterViewShell*>(
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);
}
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 4ad3a8592191..874010a8001b 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -39,7 +39,7 @@ extern "C"
if( pServiceManager )
{
Reference< XSingleComponentFactory > xFactory;
- if( aImplName.equals( PPPOptimizerDialog_getImplementationName() ) )
+ if( aImplName == PPPOptimizerDialog_getImplementationName() )
{
xFactory = createSingleComponentFactory(
PPPOptimizerDialog_createInstance,
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 7e2bed7b7889..541aed855a2d 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -132,7 +132,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
for(int i=0; i< elem.Text.getLength(); i++)
{
OUString strToken= str.copy(i,1) ;
- if( strSpace.equals(strToken) || strNbSpace.equals(strToken))
+ if( strSpace == strToken || strNbSpace == strToken )
{
aProps[ "text:c" ] = "1";
m_rEmitContext.rEmitter.beginTag( "text:s", aProps );
@@ -140,7 +140,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
}
else
{
- if( tabSpace.equals(strToken) )
+ if( tabSpace == strToken )
{
m_rEmitContext.rEmitter.beginTag( "text:tab", aProps );
m_rEmitContext.rEmitter.endTag( "text:tab");
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index e1fa98ce43aa..ababf72265ae 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -238,7 +238,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
Reference<lang::XServiceName> xServiceName (
xIndexAccess->getByIndex(nIndex), UNO_QUERY);
if (xServiceName.is()
- && xServiceName->getServiceName().equals(sNotesShapeName))
+ && xServiceName->getServiceName() == sNotesShapeName)
{
Reference<text::XTextRange> xText (xServiceName, UNO_QUERY);
if (xText.is())
@@ -253,7 +253,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
if (xShapeDescriptor.is())
{
OUString sType (xShapeDescriptor->getShapeType());
- if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName))
+ if (sType == sNotesShapeName || sType == sTextShapeName)
{
Reference<text::XTextRange> xText (
xIndexAccess->getByIndex(nIndex), UNO_QUERY);
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 4bdd60676853..9fdd24a0bb18 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -863,7 +863,7 @@ void PaneStyleContainer::ProcessPaneStyle(
// Find parent style.
::std::vector<SharedPaneStyle>::const_iterator iStyle;
for (iStyle=mStyles.begin(); iStyle!=mStyles.end(); ++iStyle)
- if ((*iStyle)->msStyleName.equals(sParentStyleName))
+ if ((*iStyle)->msStyleName == sParentStyleName)
{
pStyle->mpParentStyle = *iStyle;
break;
@@ -987,7 +987,7 @@ void ViewStyleContainer::ProcessViewStyle(
// Find parent style.
::std::vector<SharedViewStyle>::const_iterator iStyle;
for (iStyle=mStyles.begin(); iStyle!=mStyles.end(); ++iStyle)
- if ((*iStyle)->msStyleName.equals(sParentStyleName))
+ if ((*iStyle)->msStyleName == sParentStyleName)
{
pStyle->mpParentStyle = *iStyle;
pStyle->mpFont = (*iStyle)->mpFont;
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 2cdb935ba5e6..c471da4d71ab 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -326,27 +326,27 @@ Reference<XResource> PresenterViewFactory::CreateView(
{
const OUString sResourceURL (rxViewId->getResourceURL());
- if (sResourceURL.equals(msCurrentSlidePreviewViewURL))
+ if (sResourceURL == msCurrentSlidePreviewViewURL)
{
xView = CreateSlideShowView(rxViewId);
}
- else if (sResourceURL.equals(msNotesViewURL))
+ else if (sResourceURL == msNotesViewURL)
{
xView = CreateNotesView(rxViewId);
}
- else if (sResourceURL.equals(msNextSlidePreviewViewURL))
+ else if (sResourceURL == msNextSlidePreviewViewURL)
{
xView = CreateSlidePreviewView(rxViewId, rxAnchorPane);
}
- else if (sResourceURL.equals(msToolBarViewURL))
+ else if (sResourceURL == msToolBarViewURL)
{
xView = CreateToolBarView(rxViewId);
}
- else if (sResourceURL.equals(msSlideSorterURL))
+ else if (sResourceURL == msSlideSorterURL)
{
xView = CreateSlideSorterView(rxViewId);
}
- else if (sResourceURL.equals(msHelpViewURL))
+ else if (sResourceURL == msHelpViewURL)
{
xView = CreateHelpView(rxViewId);
}
More information about the Libreoffice-commits
mailing list