summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/misc/docpasswordhelper.cxx20
-rw-r--r--include/comphelper/docpasswordhelper.hxx8
-rw-r--r--oox/source/core/filterdetect.cxx4
-rw-r--r--sc/source/filter/excel/xistream.cxx4
-rw-r--r--sc/source/filter/oox/biffcodec.cxx4
-rw-r--r--sfx2/source/appl/appopen.cxx8
6 files changed, 24 insertions, 24 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
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index e1f9976d7f87..12ecb7ee6e69 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -30,11 +30,11 @@ namespace com { namespace sun { namespace star { namespace beans { struct Proper
namespace comphelper {
-enum DocPasswordVerifierResult
+enum class DocPasswordVerifierResult
{
- DocPasswordVerifierResult_OK,
- DocPasswordVerifierResult_WRONG_PASSWORD,
- DocPasswordVerifierResult_ABORT
+ OK,
+ WrongPassword,
+ Abort
};
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index ede7849c599f..02aec2bc88a6 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -283,12 +283,12 @@ comphelper::DocPasswordVerifierResult PasswordVerifier::verifyPassword( const OU
if(mDecryptor.generateEncryptionKey(rPassword))
rEncryptionData = mDecryptor.createEncryptionData(rPassword);
- return rEncryptionData.hasElements() ? comphelper::DocPasswordVerifierResult_OK : comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ return rEncryptionData.hasElements() ? comphelper::DocPasswordVerifierResult::OK : comphelper::DocPasswordVerifierResult::WrongPassword;
}
comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( const Sequence<NamedValue>& )
{
- return comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ return comphelper::DocPasswordVerifierResult::WrongPassword;
}
} // namespace
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 88448ec72032..1c9ab9cdbcf5 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -62,14 +62,14 @@ XclImpDecrypterRef XclImpDecrypter::Clone() const
{
o_rEncryptionData = OnVerifyPassword( rPassword );
mnError = o_rEncryptionData.getLength() ? ERRCODE_NONE : ERRCODE_ABORT;
- return o_rEncryptionData.getLength() ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ return o_rEncryptionData.getLength() ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword;
}
::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData )
{
bool bValid = OnVerifyEncryptionData( rEncryptionData );
mnError = bValid ? ERRCODE_NONE : ERRCODE_ABORT;
- return bValid ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ return bValid ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword;
}
void XclImpDecrypter::Update( SvStream& rStrm, sal_uInt16 nRecSize )
diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 382ac5f1b692..18b19d0e23ab 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -45,13 +45,13 @@ BiffDecoderBase::~BiffDecoderBase()
{
o_rEncryptionData = implVerifyPassword( rPassword );
mbValid = o_rEncryptionData.hasElements();
- return mbValid ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ return mbValid ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword;
}
::comphelper::DocPasswordVerifierResult BiffDecoderBase::verifyEncryptionData( const Sequence< NamedValue >& rEncryptionData )
{
mbValid = implVerifyEncryptionData( rEncryptionData );
- return mbValid ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ return mbValid ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword;
}
void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, sal_uInt16 nBytes )
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 61b7dcd3fadc..9675138dc673 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -147,7 +147,7 @@ private:
::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData )
{
- ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult::WrongPassword;
try
{
// check the encryption data
@@ -160,17 +160,17 @@ private:
embed::ElementModes::READ | embed::ElementModes::NOCREATE );
// no exception -> success
- eResult = ::comphelper::DocPasswordVerifierResult_OK;
+ eResult = ::comphelper::DocPasswordVerifierResult::OK;
}
catch( const packages::WrongPasswordException& )
{
- eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ eResult = ::comphelper::DocPasswordVerifierResult::WrongPassword;
}
catch( const uno::Exception& )
{
// unknown error, report it as wrong password
// TODO/LATER: we need an additional way to report unknown problems in this case
- eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+ eResult = ::comphelper::DocPasswordVerifierResult::WrongPassword;
}
return eResult;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 22:19:07 +0000