From 443e1b1566d678c79658f2a48aa4b088ed914fa3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 9 Nov 2011 08:37:56 +0100 Subject: Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5). This backports the reading half of CWS mav60 plus "Produce correct sha256 uri, consume correct uri and original spec typo." It spans the repos components, libs-core, libs-gui, and ure. --- sfx2/source/appl/appopen.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 6ec464554f..84f0cef239 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -288,8 +288,9 @@ private: } catch( const uno::Exception& ) { - // unknown error, do not try to ask again - eResult = ::comphelper::DocPasswordVerifierResult_ABORT; + // unknown error, report it as wrong password + // TODO/LATER: we need an additional way to report unknown problems in this case + eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; } return eResult; } -- cgit v1.2.3