diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 12:43:20 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 15:20:58 +0200 |
commit | 3697b87b70c69e17e1d0398e0192a11dab179fe3 (patch) | |
tree | a498cce1f1351e6f92385aa9245c66c0724b6430 /framework | |
parent | 9bc95521aaa35b533894b3934519acdbd7a47815 (diff) |
use more OUString::operator== in forms..sal
Change-Id: I70d7e50f8c1e019524ccad915f0cca912c5035dc
Reviewed-on: https://gerrit.libreoffice.org/39899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/jobs/helponstartup.cxx | 2 | ||||
-rw-r--r-- | framework/source/jobs/jobdata.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/pathsettings.cxx | 12 | ||||
-rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 2 | ||||
-rw-r--r-- | framework/source/uifactory/uicontrollerfactory.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 9996c85f4651..ebabadf6fd7b 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -282,7 +282,7 @@ bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) OUString sHelpBaseURL; xModuleConfig->getByName("ooSetupFactoryHelpBaseURL") >>= sHelpBaseURL; OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem); - if (sHelpURL.equals(sHelpURLForModule)) + if (sHelpURL == sHelpURLForModule) return true; } catch(const css::uno::RuntimeException&) diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 5e7776b62827..13f23feafe8f 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -492,7 +492,7 @@ bool JobData::hasCorrectContext(const OUString& rModuleIdent) const if ( nIndex >= 0 && ( nIndex+nModuleIdLen <= nContextLen )) { OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen ); - return sContextModule.equals( rModuleIdent ); + return sContextModule == rModuleIdent; } } diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 0067e8cd9c3e..243e36f848ca 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -693,7 +693,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, if (rPath.bIsSinglePath) { SAL_WARN_IF(lOld.size()>1, "fwk", "PathSettings::impl_mergeOldUserPaths(): Single path has more than one path value inside old configuration (Common.xcu)!"); - if (! rPath.sWritePath.equals(sOld)) + if ( rPath.sWritePath != sOld ) rPath.sWritePath = sOld; } else @@ -701,7 +701,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, if ( ( std::find(rPath.lInternalPaths.begin(), rPath.lInternalPaths.end(), sOld) == rPath.lInternalPaths.end()) && ( std::find(rPath.lUserPaths.begin(), rPath.lUserPaths.end(), sOld) == rPath.lUserPaths.end() ) && - (! rPath.sWritePath.equals(sOld) ) + ( rPath.sWritePath != sOld ) ) rPath.lUserPaths.push_back(sOld); } @@ -840,16 +840,16 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt { const css::beans::Property& rProp = m_lPropDesc[i]; - if (rProp.Name.equals(sPath)) + if (rProp.Name == sPath) lIDs[IDGROUP_OLDSTYLE] = rProp.Handle; else - if (rProp.Name.equals(sInternalProp)) + if (rProp.Name == sInternalProp) lIDs[IDGROUP_INTERNAL_PATHS] = rProp.Handle; else - if (rProp.Name.equals(sUserProp)) + if (rProp.Name == sUserProp) lIDs[IDGROUP_USER_PATHS] = rProp.Handle; else - if (rProp.Name.equals(sWriteProp)) + if (rProp.Name == sWriteProp) lIDs[IDGROUP_WRITE_PATH] = rProp.Handle; } diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index f7646cf27a9d..8a71ebdf6c0d 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -982,7 +982,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn { for ( sal_Int32 j = 0; j < nCompareCount; j++ ) { - if ( rSeq[i].Name.equals( m_aPropArray[j] )) + if ( rSeq[i].Name == m_aPropArray[j] ) { switch ( j ) { diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 2578f40bf2dc..a13c654f19a5 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -130,7 +130,7 @@ Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithArgument // module!! for ( int i = 0; i < Arguments.getLength(); i++ ) { - if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName ))) + if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name == aPropModuleName )) { aPropValue.Value >>= aPropName; break; |