[Libreoffice-commits] core.git: comphelper/source include/comphelper

[Stephan Bergmann]

 comphelper/source/misc/docpasswordhelper.cxx  |    4 ++--
 comphelper/source/misc/docpasswordrequest.cxx |    6 +++---
 include/comphelper/docpasswordhelper.hxx      |    6 +++---
 include/comphelper/docpasswordrequest.hxx     |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 1579dcb11efa99d8b76223e5f9803a4ebd715417
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 20 15:18:26 2015 +0200

    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

diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index f8fb3ac..c6fe94a 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 933e060..e9322eb 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 6c61837..d4533c4 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 0d37b96..ee44897 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();