summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/misc/docpasswordrequest.cxx4
-rw-r--r--include/comphelper/docpasswordrequest.hxx6
-rw-r--r--oox/source/core/filterdetect.cxx2
-rw-r--r--sc/source/filter/ftools/fapihelper.cxx2
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx4
-rw-r--r--sfx2/source/view/viewfrm.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx2
9 files changed, 13 insertions, 13 deletions
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index ba3f6997d163..306175783469 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -120,14 +120,14 @@ DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType,
{
switch( eType )
{
- case DocPasswordRequestType_STANDARD:
+ case DocPasswordRequestType::Standard:
{
DocumentPasswordRequest2 aRequest( OUString(), Reference< XInterface >(),
InteractionClassification_QUERY, eMode, rDocumentUrl, bPasswordToModify );
maRequest <<= aRequest;
}
break;
- case DocPasswordRequestType_MS:
+ case DocPasswordRequestType::MS:
{
DocumentMSPasswordRequest2 aRequest( OUString(), Reference< XInterface >(),
InteractionClassification_QUERY, eMode, rDocumentUrl, bPasswordToModify );
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 31e2aad7482c..3dce6c94d18f 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -32,10 +32,10 @@ class PasswordContinuation;
/** Selects which UNO document password request type to use. */
-enum DocPasswordRequestType
+enum class DocPasswordRequestType
{
- DocPasswordRequestType_STANDARD, /// Uses the standard com.sun.star.task.DocumentPasswordRequest request.
- DocPasswordRequestType_MS /// Uses the com.sun.star.task.DocumentMSPasswordRequest request.
+ Standard, /// Uses the standard com.sun.star.task.DocumentPasswordRequest request.
+ MS /// Uses the com.sun.star.task.DocumentMSPasswordRequest request.
};
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 02aec2bc88a6..66d581a5a6d5 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -334,7 +334,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
Sequence<NamedValue> aEncryptionData;
aEncryptionData = rMediaDescriptor.requestAndVerifyDocPassword(
aVerifier,
- comphelper::DocPasswordRequestType_MS,
+ comphelper::DocPasswordRequestType::MS,
&aDefaultPasswords );
if( aEncryptionData.getLength() == 0 )
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index e874405f7e54..cd317c48b22c 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -117,7 +117,7 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S
bool bIsDefaultPassword = false;
aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
rVerifier, aEncryptionData, aPassword, rMedium.GetInteractionHandler(), rMedium.GetOrigURL(),
- ::comphelper::DocPasswordRequestType_MS, pDefaultPasswords, &bIsDefaultPassword );
+ ::comphelper::DocPasswordRequestType::MS, pDefaultPasswords, &bIsDefaultPassword );
rMedium.GetItemSet()->ClearItem( SID_PASSWORD );
rMedium.GetItemSet()->ClearItem( SID_ENCRYPTIONDATA );
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 9675138dc673..dd8b20024c98 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -239,7 +239,7 @@ sal_uInt32 CheckPasswd_Impl
SfxDocPasswordVerifier aVerifier( xStorage );
aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
- aVerifier, aEncryptionData, aPassword, xInteractionHandler, pFile->GetOrigURL(), comphelper::DocPasswordRequestType_STANDARD );
+ aVerifier, aEncryptionData, aPassword, xInteractionHandler, pFile->GetOrigURL(), comphelper::DocPasswordRequestType::Standard );
pSet->ClearItem( SID_PASSWORD );
pSet->ClearItem( SID_ENCRYPTIONDATA );
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index ed5b0556c60b..ba34cbcb95e8 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2607,8 +2607,8 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItem
// for now MS-filters are the only alien filters that support encryption
bool bMSType = !pCurrentFilter->IsOwnFormat();
::comphelper::DocPasswordRequestType eType = bMSType ?
- ::comphelper::DocPasswordRequestType_MS :
- ::comphelper::DocPasswordRequestType_STANDARD;
+ ::comphelper::DocPasswordRequestType::MS :
+ ::comphelper::DocPasswordRequestType::Standard;
::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( eType, css::task::PasswordRequestMode_PASSWORD_CREATE, aURL, bool( pCurrentFilter->GetFilterFlags() & SfxFilterFlags::PASSWORDTOMODIFY ) ) );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0f49b8cc9628..5b1e61315799 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -172,7 +172,7 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa
::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest(
new ::comphelper::DocPasswordRequest(
- bMSType ? ::comphelper::DocPasswordRequestType_MS : ::comphelper::DocPasswordRequestType_STANDARD,
+ bMSType ? ::comphelper::DocPasswordRequestType::MS : ::comphelper::DocPasswordRequestType::Standard,
bFirstTime ? css::task::PasswordRequestMode_PASSWORD_ENTER : css::task::PasswordRequestMode_PASSWORD_REENTER,
aPath,
true ) );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b40c2f96515e..be8df2362dbc 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5530,7 +5530,7 @@ namespace
if( xHandler.is() )
{
::comphelper::DocPasswordRequest* pRequest = new ::comphelper::DocPasswordRequest(
- ::comphelper::DocPasswordRequestType_MS, task::PasswordRequestMode_PASSWORD_ENTER,
+ ::comphelper::DocPasswordRequestType::MS, task::PasswordRequestMode_PASSWORD_ENTER,
INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET ) );
uno::Reference< task::XInteractionRequest > xRequest( pRequest );
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 2b6bd5507ca5..bfee17606d19 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -85,7 +85,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER;
::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest(
- ::comphelper::DocPasswordRequestType_STANDARD, eMode, OUString::createFromAscii(PK11_GetTokenName(pSlot)) );
+ ::comphelper::DocPasswordRequestType::Standard, eMode, OUString::createFromAscii(PK11_GetTokenName(pSlot)) );
uno::Reference< task::XInteractionRequest > xRequest( pPasswordRequest );
xInteractionHandler->handle( xRequest );
generated by cgit (git 2.34.1) at 2025-01-22 20:52:34 +0000