diff options
| -rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/misc/docpasswordrequest.cxx | 6 | ||||
| -rw-r--r-- | include/comphelper/docpasswordhelper.hxx | 6 | ||||
| -rw-r--r-- | include/comphelper/docpasswordrequest.hxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index f8fb3acb3b7b..c6fe94a16892 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -355,7 +355,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, const OUString& rMediaPassword, const Reference< XInteractionHandler >& rxInteractHandler, - const OUString& rDocumentName, + const OUString& rDocumentUrl, DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords, bool* pbIsDefaultPassword ) @@ -404,7 +404,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( PasswordRequestMode eRequestMode = PasswordRequestMode_PASSWORD_ENTER; while( eResult == DocPasswordVerifierResult_WRONG_PASSWORD ) { - DocPasswordRequest* pRequest = new DocPasswordRequest( eRequestType, eRequestMode, rDocumentName ); + DocPasswordRequest* pRequest = new DocPasswordRequest( eRequestType, eRequestMode, rDocumentUrl ); Reference< XInteractionRequest > xRequest( pRequest ); rxInteractHandler->handle( xRequest ); if( pRequest->isPassword() ) diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index 933e0606ad2a..e9322eb77132 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -120,21 +120,21 @@ Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType, - PasswordRequestMode eMode, const OUString& rDocumentName, bool bPasswordToModify ) + PasswordRequestMode eMode, const OUString& rDocumentUrl, bool bPasswordToModify ) { switch( eType ) { case DocPasswordRequestType_STANDARD: { DocumentPasswordRequest2 aRequest( OUString(), Reference< XInterface >(), - InteractionClassification_QUERY, eMode, rDocumentName, bPasswordToModify ); + InteractionClassification_QUERY, eMode, rDocumentUrl, bPasswordToModify ); maRequest <<= aRequest; } break; case DocPasswordRequestType_MS: { DocumentMSPasswordRequest2 aRequest( OUString(), Reference< XInterface >(), - InteractionClassification_QUERY, eMode, rDocumentName, bPasswordToModify ); + InteractionClassification_QUERY, eMode, rDocumentUrl, bPasswordToModify ); maRequest <<= aRequest; } break; diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index 6c61837c48e9..d4533c480a2c 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -259,8 +259,8 @@ public: The interaction handler that will be used to request a password from the user, e.g. by showing a password input dialog. - @param rDocumentName - The name of the related document that will be shown in the password + @param rDocumentUrl + The URL of the related document that will be shown in the password input dialog. @param eRequestType @@ -288,7 +288,7 @@ public: const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, const OUString& rMediaPassword, const css::uno::Reference< css::task::XInteractionHandler >& rxInteractHandler, - const OUString& rDocumentName, + const OUString& rDocumentUrl, DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords = 0, bool* pbIsDefaultPassword = 0 ); diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index 0d37b962ddc6..ee44897344bf 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -75,7 +75,7 @@ public: explicit DocPasswordRequest( DocPasswordRequestType eType, css::task::PasswordRequestMode eMode, - const OUString& rDocumentName, + const OUString& rDocumentUrl, bool bPasswordToModify = false ); virtual ~DocPasswordRequest(); |