diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 15:18:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 15:18:26 +0200 |
| commit | 1579dcb11efa99d8b76223e5f9803a4ebd715417 (patch) | |
| tree | 8863e031549dfd76bea69daf6e59e5ddccbb6744 /comphelper | |
| parent | Gracefully handle URLs INetURLObject refuses to parse (diff) | |
| download | core-1579dcb11efa99d8b76223e5f9803a4ebd715417.tar.gz core-1579dcb11efa99d8b76223e5f9803a4ebd715417.zip | |
Rename some "document name" params to "document URL"
...to match reality, cf. 7660e4dcecfb19ad8e9e21e5fe53637bd1b9dc6c
"tdf#89694 Password dialog for opening OOXML shows url-encoded path"
Change-Id: I9fdd204494374770186347e92aa0bd6e7093ffaa
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/misc/docpasswordrequest.cxx | 6 |
2 files changed, 5 insertions, 5 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; |