[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - uui/source

[Mihai Varga]

 uui/source/iahndl-authentication.cxx |   14 +++++++++++++-
 uui/source/iahndl.cxx                |    2 +-
 uui/source/iahndl.hxx                |    5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 653851c1341d02f4047ef837485d58bf74f044eb
Author: Mihai Varga <mihai.mv13 at gmail.com>
Date:   Mon Jun 30 20:24:49 2014 +0300

    Request handlers
    
    Change-Id: Id2180d7136ca6ff23de74fddae0d47720b518996

diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index dff5bc8..b2876c4 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/task/XInteractionPassword.hpp>
 #include <com/sun/star/task/XInteractionPassword2.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/ucb/XInteractionAuthFallback.hpp>
 #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
 #include <com/sun/star/ucb/URLAuthenticationRequest.hpp>
 
@@ -747,11 +748,22 @@ UUIInteractionHelper::handlePasswordRequest(
 
 bool
 UUIInteractionHelper::handleAuthFallbackRequest( OUString & instructions,
-        OUString & url )
+        OUString & url,
+        uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations )
 {
     Window * pParent = getParentProperty( );
     AuthFallbackDlg *dlg = new AuthFallbackDlg( pParent, instructions, url );
     int retCode = dlg->Execute( );
+    uno::Reference< task::XInteractionAbort > xAbort;
+    uno::Reference< ucb::XInteractionAuthFallback > xAuthFallback;
+    getContinuations(rContinuations, &xAbort, &xAuthFallback);
+
+    if( retCode == RET_OK && xAuthFallback.is( ) )
+    {
+        xAuthFallback->setCode( dlg->GetCode( ) );
+        xAuthFallback->select( );
+    }
+
     return true;
 }
 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 8ca931a..48b5d66 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -832,7 +832,7 @@ UUIInteractionHelper::handleRequest_impl(
             if ( aAnyRequest >>= anAuthFallbackRequest )
             {
                 handleAuthFallbackRequest( anAuthFallbackRequest.instructions,
-                        anAuthFallbackRequest.url );
+                        anAuthFallbackRequest.url, rRequest->getContinuations() );
                 return true;
             }
 
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index ac211f9..43f700c 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -302,7 +302,10 @@ private:
             ) const;
 
     bool
-    handleAuthFallbackRequest( OUString & instructions, OUString & url);
+    handleAuthFallbackRequest(
+            OUString & instructions,
+            OUString & url,
+            Continuations  const & rContinuations );
 };
 
 class ErrorResource: private Resource