diff options
Diffstat (limited to 'svl/source')
| -rw-r--r-- | svl/source/items/itemprop.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/documentlockfile.cxx | 6 | ||||
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 6 | ||||
| -rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.cxx | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index b2b3f529fc34..5e9526fb3827 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -38,7 +38,7 @@ struct equalOUString { bool operator()(const OUString& r1, const OUString& r2) const { - return r1.equals( r2 ); + return r1 == r2; } }; diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 162b9dcab7c9..2bd806b04b0c 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -202,9 +202,9 @@ void DocumentLockFile::RemoveFile() LockFileEntry aNewEntry = GenerateOwnEntry(); LockFileEntry aFileData = GetLockData(); - if ( !aFileData[LockFileComponent::SYSUSERNAME].equals( aNewEntry[LockFileComponent::SYSUSERNAME] ) - || !aFileData[LockFileComponent::LOCALHOST].equals( aNewEntry[LockFileComponent::LOCALHOST] ) - || !aFileData[LockFileComponent::USERURL].equals( aNewEntry[LockFileComponent::USERURL] ) ) + if ( aFileData[LockFileComponent::SYSUSERNAME] != aNewEntry[LockFileComponent::SYSUSERNAME] + || aFileData[LockFileComponent::LOCALHOST] != aNewEntry[LockFileComponent::LOCALHOST] + || aFileData[LockFileComponent::USERURL] != aNewEntry[LockFileComponent::USERURL] ) throw io::IOException(); // not the owner, access denied RemoveFileDirectly(); diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index a1d8de727ade..25014fa7e0f5 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -1283,7 +1283,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType() eNewType = css::util::NumberFormat::TEXT; break; default: - if (pLoc->getTime100SecSep().equals(sStrArray[i])) + if (pLoc->getTime100SecSep() == sStrArray[i]) { bDecSep = true; // for SS,0 } @@ -1338,7 +1338,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType() { eScannedType = css::util::NumberFormat::UNDEFINED; } - else if (!pLoc->getTimeSep().equals(sStrArray[i])) + else if (pLoc->getTimeSep() != sStrArray[i]) { return nPos; } @@ -1359,7 +1359,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType() eScannedType = css::util::NumberFormat::UNDEFINED; } else if ( pFormatter->GetDateSep() != sStrArray[i] && - !pLoc->getTimeSep().equals(sStrArray[i]) ) + pLoc->getTimeSep() != sStrArray[i] ) { return nPos; } diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 8347d6a50049..a30f1052a697 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -548,7 +548,7 @@ OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, con void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) { for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter ) - if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) ) + if( aNPIter->GetUserName() == aRecord.GetUserName() ) { if( aRecord.HasPasswords( MEMORY_RECORD ) ) aNPIter->SetMemPasswords( aRecord.GetMemPasswords() ); @@ -689,7 +689,7 @@ Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& aNPIter != userlist.end(); ++aNPIter, ++nInd ) { - if( aNPIter->GetUserName().equals( aName ) ) + if( aNPIter->GetUserName() == aName ) { Sequence< UserRecord > aResult(1); bool bTryToDecode = true; @@ -853,7 +853,7 @@ OUString const & PasswordContainer::GetMasterPassword( const Reference< XInterac else { vector< OUString > aRM( DecodePasswords( aEncodedMP, aPass ) ); - if( aRM.empty() || !aPass.equals( aRM[0] ) ) + if( aRM.empty() || aPass != aRM[0] ) { bAskAgain = true; aRMode = PasswordRequestMode_PASSWORD_REENTER; @@ -896,7 +896,7 @@ void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& a if( aIter != m_aContainer.end() ) { for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); ++aNPIter ) - if( aNPIter->GetUserName().equals( aName ) ) + if( aNPIter->GetUserName() == aName ) { if( aNPIter->HasPasswords( PERSISTENT_RECORD ) && m_pStorageFile ) m_pStorageFile->remove( aURL, aName ); // remove record ( aURL, aName ) @@ -936,7 +936,7 @@ void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const O if( aIter != m_aContainer.end() ) { for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); ++aNPIter ) - if( aNPIter->GetUserName().equals( aName ) ) + if( aNPIter->GetUserName() == aName ) { if( aNPIter->HasPasswords( PERSISTENT_RECORD ) ) { @@ -1060,7 +1060,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R do { aPass = RequestPasswordFromUser( aRMode, xTmpHandler ); - bResult = ( !aPass.isEmpty() && aPass.equals( m_aMasterPasswd ) ); + bResult = ( !aPass.isEmpty() && aPass == m_aMasterPasswd ); aRMode = PasswordRequestMode_PASSWORD_REENTER; // further questions with error notification } while( !bResult && !aPass.isEmpty() ); } |