CWS-TOOLING: integrate CWS tkr20

2009-05-08 08:31:10 +0200 tkr  r271700 : ##i97329# fixed merge conflict during rebase
2009-05-07 08:30:15 +0200 tkr  r271622 : CWS-TOOLING: rebase CWS tkr20 to trunk@271427 (milestone: DEV300:m47)
2009-04-17 14:36:42 +0200 tkr  r270947 : #i73893# implemented the XCommandProcessor:Abort method
2009-03-20 14:08:15 +0100 tkr  r269806 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:15:26 +0100 tkr  r269754 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:09:04 +0100 tkr  r269753 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 15:57:05 +0100 tkr  r269752 : #i97003# Ask password container if persistent storage should be used
2009-03-19 15:53:18 +0100 tkr  r269751 : #i97003# ask if password container should use the persistent storage
2009-03-19 09:08:18 +0100 tkr  r269726 : #i99774# ucb: patch to silence warnings in gcc 4.4
2009-03-19 09:05:38 +0100 tkr  r269725 : #i99046# remove mime-type
2009-03-19 09:04:56 +0100 tkr  r269724 : #i97329# fixed truncated text on buttons
2009-03-19 09:03:50 +0100 tkr  r269723 : #i97542# Warning errors in uui / empty bodys in for loops

1 files changed, 60 insertions, 0 deletions

diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
index e4190da641e5..ddb2e655de8b 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
@@ -33,6 +33,7 @@
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/interactionrequest.hxx>
+#include <com/sun/star/ucb/AuthenticationRequest.hpp>
 #include "ucbhelper/ucbhelperdllapi.h"
 
 namespace ucbhelper {
@@ -61,6 +62,14 @@ class UCBHELPER_DLLPUBLIC SimpleAuthenticationRequest : public ucbhelper::Intera
     rtl::Reference<
         ucbhelper::InteractionSupplyAuthentication > m_xAuthSupplier;
 
+private:
+    void initialize( ::com::sun::star::ucb::AuthenticationRequest aRequest,
+                const sal_Bool &  bCanSetRealm,
+                const sal_Bool &  bCanSetUserName,
+                const sal_Bool &  bCanSetPassword,
+                const sal_Bool &  bCanSetAccount,
+                 const sal_Bool &  bAllowPersistentStoring );
+
 public:
     /** Specification whether some entity (realm, username, password, account)
         is either not applicable at all, has a fixed value, or is modifiable.
@@ -94,6 +103,26 @@ public:
       * Constructor.
       *
       * @param rServerName contains a server name.
+      * @param rRealm contains a realm, if applicable.
+      * @param rUserName contains a username, if available (for instance from
+      *        a previous try).
+      * @param rPassword contains a password, if available (for instance from
+      *        a previous try).
+      * @param rAccount contains an account, if applicable.
+      * @param bAllowPersistentStoring specifies if the credentials should stored in the passowrd container persistently
+      */
+    SimpleAuthenticationRequest( const rtl::OUString & rServerName,
+                                 const rtl::OUString & rRealm,
+                                 const rtl::OUString & rUserName,
+                                 const rtl::OUString & rPassword,
+                                 const rtl::OUString & rAccount,
+                                 const sal_Bool & bAllowPersistentStoring);
+
+
+    /**
+      * Constructor.
+      *
+      * @param rServerName contains a server name.
       * @param eRealmType specifies whether a realm is applicable and
                modifiable.
       * @param rRealm contains a realm, if applicable.
@@ -120,6 +149,37 @@ public:
                                  const rtl::OUString & rAccount
                                     = rtl::OUString() );
 
+     /**
+      * Constructor.
+      *
+      * @param rServerName contains a server name.
+      * @param eRealmType specifies whether a realm is applicable and
+               modifiable.
+      * @param rRealm contains a realm, if applicable.
+      * @param eUserNameType specifies whether a username is applicable and
+               modifiable.
+      * @param rUserName contains a username, if available (for instance from
+      *        a previous try).
+      * @param ePasswordType specifies whether a password is applicable and
+               modifiable.
+      * @param rPassword contains a password, if available (for instance from
+      *        a previous try).
+      * @param eAccountType specifies whether an account is applicable and
+               modifiable.
+      * @param rAccount contains an account, if applicable.
+      * @param bAllowPersistentStoring specifies if the credentials should stored in the passowrd container persistently
+      */
+    SimpleAuthenticationRequest( const rtl::OUString & rServerName,
+                                 EntityType eRealmType,
+                                 const rtl::OUString & rRealm,
+                                 EntityType eUserNameType,
+                                 const rtl::OUString & rUserName,
+                                 EntityType ePasswordType,
+                                 const rtl::OUString & rPassword,
+                                 EntityType eAccountType,
+                                 const rtl::OUString & rAccount,
+                                 const sal_Bool & bAllowPersistentStoring);
+
     /**
       * This method returns the supplier for the missing authentication data,
       * that, for instance can be used to query the password supplied by the