CWS-TOOLING: integrate CWS kso44

4 files changed, 2 insertions, 27 deletions

diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx
index c092f9fd311f..71bed1c0a14d 100644
--- a/ucb/source/ucp/webdav/DAVAuthListener.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx
@@ -30,9 +30,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ustring.hxx>
 
-#ifndef _COM_SUN_STAR_UCB_XREFERENCE_HPP_
 #include <com/sun/star/uno/XReference.hpp>
-#endif
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
 namespace webdav_ucp
@@ -46,7 +44,6 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject
             const ::rtl::OUString & inHostName,
             ::rtl::OUString & inoutUserName,
             ::rtl::OUString & outPassWord,
-            sal_Bool bAllowPersistentStoring,
             sal_Bool bCanUseSystemCredentials ) = 0;
 };
 
diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
index 3d03cc63952b..c0c9968613af 100644
--- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
@@ -61,7 +61,6 @@ namespace webdav_ucp
                                   const ::rtl::OUString & inHostName,
                                   ::rtl::OUString & inoutUserName,
                                   ::rtl::OUString & outPassWord,
-                                  sal_Bool bAllowPersistentStoring,
                                   sal_Bool bCanUseSystemCredentials );
     private:
 
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 4ffc8dd88cf5..872d45405735 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -57,7 +57,6 @@ int DAVAuthListener_Impl::authenticate(
     const ::rtl::OUString & inHostName,
     ::rtl::OUString & inoutUserName,
     ::rtl::OUString & outPassWord,
-    sal_Bool bAllowPersistentStoring,
     sal_Bool bCanUseSystemCredentials )
 {
     if ( m_xEnv.is() )
@@ -79,7 +78,8 @@ int DAVAuthListener_Impl::authenticate(
                 = new ucbhelper::SimpleAuthenticationRequest(
                     m_aURL, inHostName, inRealm, inoutUserName,
                     outPassWord, ::rtl::OUString(),
-                    bAllowPersistentStoring, bCanUseSystemCredentials );
+                    true /*bAllowPersistentStoring*/,
+                    bCanUseSystemCredentials );
             xIH->handle( xRequest.get() );
 
             rtl::Reference< ucbhelper::InteractionContinuation > xSelection
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 8fc1730ba018..254fae546940 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/security/CertificateContainerStatus.hpp>
 #include <com/sun/star/security/CertificateContainer.hpp>
 #include <com/sun/star/security/XCertificateContainer.hpp>
-#include <com/sun/star/task/XMasterPasswordHandling.hpp>
 #include <com/sun/star/ucb/Lock.hpp>
 #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
 
@@ -330,31 +329,11 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
             ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
 #endif
 
-    // #i97003# (tkr): Ask XMasterPasswordHandling if we should store the
-    // credentials persistently and give this information to the auth listener
-    uno::Reference< task::XMasterPasswordHandling > xMasterPasswordHandling;
-    try
-    {
-        xMasterPasswordHandling =
-            uno::Reference< task::XMasterPasswordHandling >(
-                theSession->getMSF()->createInstance(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.task.PasswordContainer" ) ),
-                uno::UNO_QUERY );
-    }
-    catch ( uno::Exception const & )
-    {
-    }
-
     int theRetVal = pListener->authenticate(
                             rtl::OUString::createFromAscii( inRealm ),
                             theSession->getHostName(),
                             theUserName,
                             thePassWord,
-                            xMasterPasswordHandling.is()
-                                ? xMasterPasswordHandling->
-                                    isPersistentStoringAllowed()
-                                : sal_False,
                             bCanUseSystemCreds);
 
     rtl::OString aUser(