5 files changed, 9 insertions, 6 deletions
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index 9df88fab0f3b..a7a95a9afc26 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module task {
 */
 published exception DocumentMSPasswordRequest: PasswordRequest
 {
-    /** the name of the document
+    /** the name of the document (more properly, the URL of the document)
     */
     string Name;
 
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest.idl b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
index 762dd4a9cfbb..0829d24ab6e1 100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module task {
 */
 published exception DocumentPasswordRequest: PasswordRequest
 {
-    /** the name of the document
+    /** the name of the document (more properly, the URL of the document)
     */
     string Name;
 
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 210215cf47db..121491ad0520 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -114,7 +114,7 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S
     if ( pPasswordItem )
         aPassword = pPasswordItem->GetValue();
 
-    OUString aDocName = INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET );
+    OUString aDocName = rMedium.GetOrigURL();
 
     bool bIsDefaultPassword = false;
     aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 3cddd76ee9a0..04c729ef6dad 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -241,7 +241,7 @@ sal_uInt32 CheckPasswd_Impl
                             if ( pEncryptionDataItem )
                                 pEncryptionDataItem->GetValue() >>= aEncryptionData;
 
-                            OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+                            OUString aDocumentName = pFile->GetOrigURL();
 
                             SfxDocPasswordVerifier aVerifier( xStorage );
                             aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 3485a3cbf3b4..4831bd38df28 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -20,6 +20,7 @@
 #include "passworddlg.hxx"
 #include "ids.hrc"
 
+#include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 
 using namespace ::com::sun::star;
@@ -71,8 +72,10 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
     SetText( aTitle );
 
     sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
-    m_pFTPassword->SetText(ResId(nStrId, *pResourceMgr).toString());
-    m_pFTPassword->SetText( m_pFTPassword->GetText() + aDocURL );
+    OUString aMessage(ResId(nStrId, *pResourceMgr).toString());
+    aMessage += INetURLObject(aDocURL).GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS);
+    m_pFTPassword->SetText(aMessage);
+
     if (bIsSimplePasswordRequest)
     {
         DBG_ASSERT( aDocURL.isEmpty(), "A simple password request should not have a document URL! Use document password request instead." );