desktop/source/lib/lokinteractionhandler.cxx | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 82fb0abc37320fb1157b21efbf31954190353d41
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Thu Nov 30 00:56:43 2017 -0500
LOK: support password-protected PDF docs
Change-Id: I1a1177ae7eb5af4ade2863dedf8bab7188152c5e
Reviewed-on: https://gerrit.libreoffice.org/45547
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit dc773e81bd360316a96b1b61c552d263e1d87e89)
Reviewed-on: https://gerrit.libreoffice.org/45563
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
