include/ucbhelper/authenticationfallback.hxx | 13 ++++++++----- ucbhelper/source/provider/authenticationfallback.cxx | 7 +++---- 2 files changed, 11 insertions(+), 9 deletions(-)
New commits: commit fde54c22eab44a33599d067c838508ac1ac0055e Author: Mihai Varga <[email protected]> Date: Mon Jun 30 20:24:16 2014 +0300 Continuations are set in the request diff --git a/include/ucbhelper/authenticationfallback.hxx b/include/ucbhelper/authenticationfallback.hxx index 19a6b7f..c73383a 100644 --- a/include/ucbhelper/authenticationfallback.hxx +++ b/include/ucbhelper/authenticationfallback.hxx @@ -23,6 +23,8 @@ #include <rtl/ref.hxx> #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/ucbhelperdllapi.h> +#include <com/sun/star/ucb/AuthenticationFallbackRequest.hpp> + namespace ucbhelper { @@ -35,10 +37,9 @@ namespace ucbhelper { */ class UCBHELPER_DLLPUBLIC AuthenticationFallbackRequest : public ucbhelper::InteractionRequest { +private: + rtl::Reference< ucbhelper::InteractionAuthFallback > m_xAuthFallback; - OUString m_Instructions; - OUString m_Url; - OUString m_Code; public: /** * Constructor. @@ -48,8 +49,10 @@ public: */ AuthenticationFallbackRequest( const OUString & rInstructions, const OUString & rURL ); - void setCode( const OUString & code ) { m_Code = code; } - OUString getCode( ) { return m_Code; } + + const rtl::Reference< ucbhelper::InteractionAuthFallback >& + getAuthFallbackInter( ) const { return m_xAuthFallback; } + }; } // namespace ucbhelper diff --git a/ucbhelper/source/provider/authenticationfallback.cxx b/ucbhelper/source/provider/authenticationfallback.cxx index 8171cc2..7f47b09 100644 --- a/ucbhelper/source/provider/authenticationfallback.cxx +++ b/ucbhelper/source/provider/authenticationfallback.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/ucb/AuthenticationFallbackRequest.hpp> #include <ucbhelper/authenticationfallback.hxx> using namespace com::sun::star; @@ -33,12 +32,12 @@ AuthenticationFallbackRequest::AuthenticationFallbackRequest( aRequest.url = rURL; setRequest( uno::makeAny( aRequest ) ); + m_xAuthFallback = new InteractionAuthFallback( this ); uno::Sequence< - uno::Reference< task::XInteractionContinuation > > aContinuations( 3 ); + uno::Reference< task::XInteractionContinuation > > aContinuations( 2 ); aContinuations[ 0 ] = new InteractionAbort( this ); - aContinuations[ 1 ] = new InteractionRetry( this ); - aContinuations[ 2 ] = new InteractionApprove( this ); + aContinuations[ 1 ] = m_xAuthFallback.get( ); setContinuations( aContinuations ); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
