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

[Mihai Varga]

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

New commits:
commit b2aa6454f605adf6f79ea8db854c96bb0213aae1
Author: Mihai Varga <mihai.mv13 at gmail.com>
Date:   Thu Jun 26 20:08:28 2014 +0300

    AuthDialog request handler - doesn't work well yet
    
    Change-Id: Ib6b9cd1969ab06e49d3f57f3f1e85660e97d8ca7

diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index fbb1dba..d1c2393 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -39,6 +39,7 @@
 #include <vcl/abstdlg.hxx>
 #include <vcl/svapp.hxx>
 
+#include "authfallbackdlg.hxx"
 #include "ids.hrc"
 #include "getcontinuations.hxx"
 #include "passwordcontainer.hxx"
@@ -744,4 +745,14 @@ UUIInteractionHelper::handlePasswordRequest(
     return false;
 }
 
+bool
+UUIInteractionHelper::handleAuthFallbackRequest(
+    uno::Reference< task::XInteractionRequest > const & rRequest)
+{
+    Window * pParent = getParentProperty();
+    AuthFallbackDlg *dlg = new AuthFallbackDlg(pParent, "instructions", "url");
+    dlg->Execute( );
+    return true;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index de4e70c..6f7f26c 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -447,6 +447,10 @@ UUIInteractionHelper::handleRequest_impl(
 
         uno::Any aAnyRequest(rRequest->getRequest());
 
+        // TODO delete
+        if ( handleAuthFallbackRequest( rRequest ) )
+            return true;
+
         script::ModuleSizeExceededRequest aModSizeException;
         if (aAnyRequest >>= aModSizeException )
         {
@@ -823,12 +827,13 @@ UUIInteractionHelper::handleRequest_impl(
             return true;
         }
 
-
-
         // Handle requests which do not have a plain string representation.
 
         if (!bObtainErrorStringOnly)
         {
+            if ( handleAuthFallbackRequest( rRequest ) )
+                return true;
+
             if ( handleAuthenticationRequest( rRequest ) )
                 return true;
 
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 3333e87..fad1d23 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -300,6 +300,11 @@ private:
                 const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest,
                 const OUString& i_rServiceName
             ) const;
+
+    bool
+    handleAuthFallbackRequest(
+        com::sun::star::uno::Reference<
+            com::sun::star::task::XInteractionRequest > const & rRequest);
 };
 
 class ErrorResource: private Resource