summaryrefslogtreecommitdiff
path: root/comphelper/source
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 14:09:04 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-04-08 19:24:00 +0200
commite4fb171d3ad15ae9abbc93d9db956674498c9dd5 (patch)
tree6d297c3054a7de5a8baee08db9237d0f01fffb52 /comphelper/source
parent8e5318b0b971580f8dabecc1318c74e799e84d53 (diff)
Replaced a few equal calls with ==
Diffstat (limited to 'comphelper/source')
-rw-r--r--comphelper/source/compare/AnyCompareFactory.cxx2
-rw-r--r--comphelper/source/misc/docpasswordhelper.cxx11
2 files changed, 6 insertions, 7 deletions
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index db9b1003b2ce..7573e0e15d17 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -132,7 +132,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con
// for now only OUString properties compare is implemented
// so no check for the property name is done
- if( aPropertyName.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) )
+ if( aPropertyName == "Title" )
return m_rAnyCompare;
return Reference< XAnyCompare >();
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 3619b2846a45..2be579e43086 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -116,18 +116,17 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas
for ( sal_Int32 nInd = 0; nInd < aInfo.getLength(); nInd++ )
{
- if ( aInfo[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "algorithm-name" ) ) ) )
+ if ( aInfo[nInd].Name == "algorithm-name" )
aInfo[nInd].Value >>= sAlgorithm;
- else if ( aInfo[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "salt" ) ) ) )
+ else if ( aInfo[nInd].Name == "salt" )
aInfo[nInd].Value >>= aSalt;
- else if ( aInfo[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iteration-count" ) ) ) )
+ else if ( aInfo[nInd].Name == "iteration-count" )
aInfo[nInd].Value >>= nCount;
- else if ( aInfo[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hash" ) ) ) )
+ else if ( aInfo[nInd].Name == "hash" )
aInfo[nInd].Value >>= aHash;
}
- if ( sAlgorithm.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PBKDF2" ) ) )
- && aSalt.getLength() && nCount > 0 && aHash.getLength() )
+ if ( sAlgorithm == "PBKDF2" && aSalt.getLength() && nCount > 0 && aHash.getLength() )
{
uno::Sequence< sal_Int8 > aNewHash = GeneratePBKDF2Hash( aPassword, aSalt, nCount, aHash.getLength() );
for ( sal_Int32 nInd = 0; nInd < aNewHash.getLength() && nInd < aHash.getLength() && aNewHash[nInd] == aHash[nInd]; nInd ++ )