Kaydet (Commit) 1579dcb1 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Rename some "document name" params to "document URL"

...to match reality, cf. 7660e4dc
"tdf#89694 Password dialog for opening OOXML shows url-encoded path"

Change-Id: I9fdd204494374770186347e92aa0bd6e7093ffaa
üst 9bcc09dc
...@@ -355,7 +355,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( ...@@ -355,7 +355,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData,
const OUString& rMediaPassword, const OUString& rMediaPassword,
const Reference< XInteractionHandler >& rxInteractHandler, const Reference< XInteractionHandler >& rxInteractHandler,
const OUString& rDocumentName, const OUString& rDocumentUrl,
DocPasswordRequestType eRequestType, DocPasswordRequestType eRequestType,
const ::std::vector< OUString >* pDefaultPasswords, const ::std::vector< OUString >* pDefaultPasswords,
bool* pbIsDefaultPassword ) bool* pbIsDefaultPassword )
...@@ -404,7 +404,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( ...@@ -404,7 +404,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
PasswordRequestMode eRequestMode = PasswordRequestMode_PASSWORD_ENTER; PasswordRequestMode eRequestMode = PasswordRequestMode_PASSWORD_ENTER;
while( eResult == DocPasswordVerifierResult_WRONG_PASSWORD ) while( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
{ {
DocPasswordRequest* pRequest = new DocPasswordRequest( eRequestType, eRequestMode, rDocumentName ); DocPasswordRequest* pRequest = new DocPasswordRequest( eRequestType, eRequestMode, rDocumentUrl );
Reference< XInteractionRequest > xRequest( pRequest ); Reference< XInteractionRequest > xRequest( pRequest );
rxInteractHandler->handle( xRequest ); rxInteractHandler->handle( xRequest );
if( pRequest->isPassword() ) if( pRequest->isPassword() )
......
...@@ -120,21 +120,21 @@ Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest ...@@ -120,21 +120,21 @@ Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest
DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType, DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType,
PasswordRequestMode eMode, const OUString& rDocumentName, bool bPasswordToModify ) PasswordRequestMode eMode, const OUString& rDocumentUrl, bool bPasswordToModify )
{ {
switch( eType ) switch( eType )
{ {
case DocPasswordRequestType_STANDARD: case DocPasswordRequestType_STANDARD:
{ {
DocumentPasswordRequest2 aRequest( OUString(), Reference< XInterface >(), DocumentPasswordRequest2 aRequest( OUString(), Reference< XInterface >(),
InteractionClassification_QUERY, eMode, rDocumentName, bPasswordToModify ); InteractionClassification_QUERY, eMode, rDocumentUrl, bPasswordToModify );
maRequest <<= aRequest; maRequest <<= aRequest;
} }
break; break;
case DocPasswordRequestType_MS: case DocPasswordRequestType_MS:
{ {
DocumentMSPasswordRequest2 aRequest( OUString(), Reference< XInterface >(), DocumentMSPasswordRequest2 aRequest( OUString(), Reference< XInterface >(),
InteractionClassification_QUERY, eMode, rDocumentName, bPasswordToModify ); InteractionClassification_QUERY, eMode, rDocumentUrl, bPasswordToModify );
maRequest <<= aRequest; maRequest <<= aRequest;
} }
break; break;
......
...@@ -259,8 +259,8 @@ public: ...@@ -259,8 +259,8 @@ public:
The interaction handler that will be used to request a password The interaction handler that will be used to request a password
from the user, e.g. by showing a password input dialog. from the user, e.g. by showing a password input dialog.
@param rDocumentName @param rDocumentUrl
The name of the related document that will be shown in the password The URL of the related document that will be shown in the password
input dialog. input dialog.
@param eRequestType @param eRequestType
...@@ -288,7 +288,7 @@ public: ...@@ -288,7 +288,7 @@ public:
const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData,
const OUString& rMediaPassword, const OUString& rMediaPassword,
const css::uno::Reference< css::task::XInteractionHandler >& rxInteractHandler, const css::uno::Reference< css::task::XInteractionHandler >& rxInteractHandler,
const OUString& rDocumentName, const OUString& rDocumentUrl,
DocPasswordRequestType eRequestType, DocPasswordRequestType eRequestType,
const ::std::vector< OUString >* pDefaultPasswords = 0, const ::std::vector< OUString >* pDefaultPasswords = 0,
bool* pbIsDefaultPassword = 0 ); bool* pbIsDefaultPassword = 0 );
......
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
explicit DocPasswordRequest( explicit DocPasswordRequest(
DocPasswordRequestType eType, DocPasswordRequestType eType,
css::task::PasswordRequestMode eMode, css::task::PasswordRequestMode eMode,
const OUString& rDocumentName, const OUString& rDocumentUrl,
bool bPasswordToModify = false ); bool bPasswordToModify = false );
virtual ~DocPasswordRequest(); virtual ~DocPasswordRequest();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment