summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2017-11-30 00:56:43 -0500
committerAshod Nakashian <ashnakash@gmail.com>2017-11-30 07:03:30 +0100
commitdc773e81bd360316a96b1b61c552d263e1d87e89 (patch)
treeed5e5c15c71e2b2f4dc2f4a39e40e3036c627175
parent551543bf359f644f727fd1aa86e2c5ae499f88ce (diff)
LOK: support password-protected PDF docs
Change-Id: I1a1177ae7eb5af4ade2863dedf8bab7188152c5e Reviewed-on: https://gerrit.libreoffice.org/45547 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
-rw-r--r--desktop/source/lib/lokinteractionhandler.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index 58d4052324d7..b4fef17266c5 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -250,14 +250,22 @@ bool LOKInteractionHandler::handlePasswordRequest(const uno::Sequence<uno::Refer
OString sUrl;
- task::DocumentPasswordRequest2 passwordRequest;
+ task::DocumentPasswordRequest passwordRequest;
if (rRequest >>= passwordRequest)
{
- bIsRequestPasswordToModify = passwordRequest.IsRequestPasswordToModify;
+ bIsRequestPasswordToModify = false;
sUrl = passwordRequest.Name.toUtf8();
bPasswordRequestFound = true;
}
+ task::DocumentPasswordRequest2 passwordRequest2;
+ if (rRequest >>= passwordRequest2)
+ {
+ bIsRequestPasswordToModify = passwordRequest2.IsRequestPasswordToModify;
+ sUrl = passwordRequest2.Name.toUtf8();
+ bPasswordRequestFound = true;
+ }
+
task::DocumentMSPasswordRequest2 passwordMSRequest;
if (rRequest >>= passwordMSRequest)
{