[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sfx2/source

[Stephan Bergmann]

 sfx2/source/appl/appopen.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 443e1b1566d678c79658f2a48aa4b088ed914fa3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 9 08:37:56 2011 +0100

    Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5).
    
    This backports the reading half of CWS mav60 plus <http://cgit.freedesktop.org/
    libreoffice/core/commit/?id=2d775f593abd9bc487ccc60f06aa5a3ca9632056> "Produce
    correct sha256 uri, consume correct uri and original spec typo."  It spans the
    repos components, libs-core, libs-gui, and ure.

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 6ec4645..84f0cef 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;
 }