From 3697b87b70c69e17e1d0398e0192a11dab179fe3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 13 Jul 2017 12:43:20 +0200 Subject: use more OUString::operator== in forms..sal Change-Id: I70d7e50f8c1e019524ccad915f0cca912c5035dc Reviewed-on: https://gerrit.libreoffice.org/39899 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/source/services/pathsettings.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'framework/source/services') 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; } -- cgit