diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-23 15:14:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-24 11:48:38 +0200 |
| commit | dc1f1cde6329044611607d8bfc10203b6d83dcee (patch) | |
| tree | 9dd20b1ac2818101667ee43c3e69c22bbab0b48e /comphelper | |
| parent | 0839f90394d96cf0fe414913527b3e3e5ba3c86a (diff) | |
convert DocPasswordVerifierResult to scoped enum
Change-Id: Ib5a595819dec8511d284ed1022d8f7c624f8d8f9
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 2dd70e3271b9..301612cbaade 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -356,48 +356,48 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( bool* pbIsDefaultPassword ) { css::uno::Sequence< css::beans::NamedValue > aEncData; - DocPasswordVerifierResult eResult = DocPasswordVerifierResult_WRONG_PASSWORD; + DocPasswordVerifierResult eResult = DocPasswordVerifierResult::WrongPassword; // first, try provided default passwords if( pbIsDefaultPassword ) *pbIsDefaultPassword = false; if( pDefaultPasswords ) { - for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult_WRONG_PASSWORD) && (aIt != aEnd); ++aIt ) + for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult::WrongPassword) && (aIt != aEnd); ++aIt ) { OSL_ENSURE( !aIt->isEmpty(), "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" ); if( !aIt->isEmpty() ) { eResult = rVerifier.verifyPassword( *aIt, aEncData ); if( pbIsDefaultPassword ) - *pbIsDefaultPassword = eResult == DocPasswordVerifierResult_OK; + *pbIsDefaultPassword = eResult == DocPasswordVerifierResult::OK; } } } // try media encryption data (skip, if result is OK or ABORT) - if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD ) + if( eResult == DocPasswordVerifierResult::WrongPassword ) { if( rMediaEncData.getLength() > 0 ) { eResult = rVerifier.verifyEncryptionData( rMediaEncData ); - if( eResult == DocPasswordVerifierResult_OK ) + if( eResult == DocPasswordVerifierResult::OK ) aEncData = rMediaEncData; } } // try media password (skip, if result is OK or ABORT) - if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD ) + if( eResult == DocPasswordVerifierResult::WrongPassword ) { if( !rMediaPassword.isEmpty() ) eResult = rVerifier.verifyPassword( rMediaPassword, aEncData ); } // request a password (skip, if result is OK or ABORT) - if( (eResult == DocPasswordVerifierResult_WRONG_PASSWORD) && rxInteractHandler.is() ) try + if( (eResult == DocPasswordVerifierResult::WrongPassword) && rxInteractHandler.is() ) try { PasswordRequestMode eRequestMode = PasswordRequestMode_PASSWORD_ENTER; - while( eResult == DocPasswordVerifierResult_WRONG_PASSWORD ) + while( eResult == DocPasswordVerifierResult::WrongPassword ) { DocPasswordRequest* pRequest = new DocPasswordRequest( eRequestType, eRequestMode, rDocumentUrl ); Reference< XInteractionRequest > xRequest( pRequest ); @@ -409,7 +409,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( } else { - eResult = DocPasswordVerifierResult_ABORT; + eResult = DocPasswordVerifierResult::Abort; } eRequestMode = PasswordRequestMode_PASSWORD_REENTER; } @@ -418,7 +418,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( { } - return (eResult == DocPasswordVerifierResult_OK) ? aEncData : uno::Sequence< beans::NamedValue >(); + return (eResult == DocPasswordVerifierResult::OK) ? aEncData : uno::Sequence< beans::NamedValue >(); } } // namespace comphelper |