summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-13 09:56:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-13 12:05:42 +0200
commitdc63cc326ee5757124cef45e470d290e6e32002e (patch)
treee912d5e06b8602e391f3aa7e084e92c808f2fcfb /extensions
parent51a50cc95a8cb461b7026c1eb8908e17f4055076 (diff)
use more OUString::operator== in dbaccess..filter
Change-Id: Ib7b4f2b2403ce766a7db2f6ffc118468e7677776 Reviewed-on: https://gerrit.libreoffice.org/39889 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/bibconfig.cxx4
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx2
-rw-r--r--extensions/source/update/check/updatecheck.cxx4
-rw-r--r--extensions/source/update/check/updatehdl.cxx2
7 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 7eb7402429ee..ba0f0c0a960a 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -273,7 +273,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
for(std::unique_ptr<Mapping> & i : *pMappingsArr)
{
Mapping& rMapping = *i.get();
- bool bURLEqual = rDesc.sDataSource.equals(rMapping.sURL);
+ bool bURLEqual = rDesc.sDataSource == rMapping.sURL;
if(rDesc.sTableOrQuery == rMapping.sTableName && bURLEqual)
return &rMapping;
}
@@ -285,7 +285,7 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp
for(size_t i = 0; i < pMappingsArr->size(); i++)
{
Mapping& rMapping = *(*pMappingsArr)[i].get();
- bool bURLEqual = rDesc.sDataSource.equals(rMapping.sURL);
+ bool bURLEqual = rDesc.sDataSource == rMapping.sURL;
if(rDesc.sTableOrQuery == rMapping.sTableName && bURLEqual)
{
pMappingsArr->erase(pMappingsArr->begin()+i);
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index ef890085d72b..7813f16b810e 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -148,7 +148,7 @@ namespace dbp
// search the entry of the given type with the given name
for ( sal_Int32 nLookup = 0; nLookup < m_pTable->GetEntryCount(); ++nLookup )
{
- if (sCommand.equals(m_pTable->GetEntry(nLookup)))
+ if (sCommand == m_pTable->GetEntry(nLookup))
{
if ( reinterpret_cast< sal_IntPtr >( m_pTable->GetEntryData( nLookup ) ) == nCommandType )
{
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 192135b23afc..125c96519988 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -550,7 +550,7 @@ namespace pcr
OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
// Don't convert a placeholder
- if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER) ) )
+ if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue == PcrRes(RID_EMBED_IMAGE_PLACEHOLDER) )
aPropertyValue <<= sControlValue;
else
{
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index f0d4f40aa32a..f3fa6941ff2e 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1346,7 +1346,7 @@ namespace pcr
// can ignore it
OUString sVal;
_rValue >>= sVal;
- if ( sVal.equals( sPlcHolder ) )
+ if ( sVal == sPlcHolder )
bIsPlaceHolderValue = true;
}
m_sCommittingProperty = rName;
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 242074428e10..dc6e6d492b72 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -720,7 +720,7 @@ namespace pcr
OUString sSelection;
_rValue >>= sSelection;
- if ( !sSelection.equals( getTypedControlWindow()->GetSelectEntry() ) )
+ if ( sSelection != getTypedControlWindow()->GetSelectEntry() )
getTypedControlWindow()->SelectEntry( sSelection );
if ( !getTypedControlWindow()->IsEntrySelected( sSelection ) )
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 7037bf93ea29..c110656e61e0 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -113,7 +113,7 @@ inline OUString getBaseInstallation()
inline bool isObsoleteUpdateInfo(const OUString& rBuildId)
{
- return !rBuildId.equals(getBuildId()) && !rBuildId.isEmpty();
+ return rBuildId != getBuildId() && !rBuildId.isEmpty();
}
@@ -1228,7 +1228,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
{
osl::ClearableMutexGuard aGuard(m_aMutex);
- bool bSuppressBubble = aInfo.BuildId.equals(m_aUpdateInfo.BuildId);
+ bool bSuppressBubble = aInfo.BuildId == m_aUpdateInfo.BuildId;
m_aUpdateInfo = aInfo;
OSL_ASSERT(DISABLED == m_eState || CHECK_SCHEDULED == m_eState);
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 13ba54392c0f..b5dea59112d0 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -311,7 +311,7 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
DialogControls eButton = BUTTON_COUNT;
for ( int i = 0; i < BUTTON_COUNT; i++ )
{
- if ( rEvent.ActionCommand.equals( msButtonIDs[i] ) )
+ if ( rEvent.ActionCommand == msButtonIDs[i] )
{
eButton = (DialogControls) i;
break;