diff options
| author | Tomofumi Yagi <yagit@mknada.sakura.ne.jp> | 2015-02-28 17:43:00 +0900 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 09:42:13 +0000 |
| commit | 7660e4dcecfb19ad8e9e21e5fe53637bd1b9dc6c (patch) | |
| tree | 8e7ad943f635763507c3461fa86d5913c251c7c8 /sc | |
| parent | 5378963b262ade09f5a55ecb185164b2eac8c782 (diff) | |
tdf#89694 Password dialog for opening OOXML shows url-encoded path
We need to convert a path string to decoded it for OOXML with a password as ODF
is so. This patch adds the converting process for OOXML.
In addition, this patch moves the decoded-point of URL into
css.task.Document[MS]PasswordRequest ctor from the outside. This decoded-point of
URL into ctor is common for OOXML and ODF.
(notes: Strange to say, css.task.Document[MS]PasswordRequest ctor needs "aDocURL",
but methods in interaction-handler use "aDocumentName" as the parameter.
Probably this will be fixed in near future.)
Change-Id: I0ecfddf0f70ea5810df52d9ca8637f483a26df2f
Reviewed-on: https://gerrit.libreoffice.org/14677
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/ftools/fapihelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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( |