tkr32: rebase from m65 to m70

6 files changed, 14 insertions, 10 deletions

diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk
index 4656c805fd34..e62ec14be250 100755
--- a/ucb/qa/complex/tdoc/interfaces/makefile.mk
+++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/tdoc$/interfaces
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES = _XChild.java                         \
             _XCommandInfoChangeNotifier.java     \
             _XCommandProcessor.java              \
diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk
index 50aada12e72a..5a25db74cfd0 100755
--- a/ucb/qa/complex/tdoc/makefile.mk
+++ b/ucb/qa/complex/tdoc/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex.tdoc
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES = CheckContentProvider.java \
             CheckTransientDocumentsContent.java \
             CheckTransientDocumentsContentProvider.java \
diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk
index 147b1b306454..e0285e70d362 100755
--- a/ucb/qa/complex/ucb/makefile.mk
+++ b/ucb/qa/complex/ucb/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/ucb
 
 #----- compile .java files -----------------------------------------
 
-JARFILES 		= mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES 		= mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = UCB.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 2756262ce91d..7360304e8328 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -68,7 +68,7 @@ static void ooo_mount_operation_class_init (OOoMountOperationClass *klass)
 using namespace com::sun::star;
 
 static void ooo_mount_operation_ask_password (GMountOperation *op,
-    const char *message, const char *default_user,
+    const char * /*message*/, const char *default_user,
     const char *default_domain, GAskPasswordFlags flags)
 {
     uno::Reference< task::XInteractionHandler > xIH;
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 67f8e5a386f0..140b3dd3af94 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -555,8 +555,9 @@ void DAVResourceAccess::GET(
 void DAVResourceAccess::ABORT()
   throw( DAVException )
 {
-    initialize();
-    m_xSession->ABORT();
+   // 17.11.09 (tkr): abort currently disabled caused by issue i106766
+   // initialize();
+   // m_xSession->ABORT();
 }
 //=========================================================================
 namespace {
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index b455ffebbb9b..25126f619540 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -329,8 +329,8 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
 #ifdef NE_FEATURE_SSPI
     bCanUseSystemCreds = (attempt == 0) && // avoid endless loops
                          ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
-                         ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
-                         ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 );
+                         ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
+                           ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
 #endif
 
     // #i97003# (tkr): Ask XMasterPasswordHandling if we should store the
@@ -1319,8 +1319,11 @@ void NeonSession::POST( const rtl::OUString & inPath,
 void NeonSession::ABORT()
     throw ( DAVException )
 {
-    if (NULL !=m_pHttpSession)
-        ne_close_connection(m_pHttpSession);
+    // 11.11.09 (tkr): The following code lines causing crashes if closing a ongoing connection. It turned out that this existing solution doesn't work in multi-threading environments.
+    // So I disabled them in 3.2. . Issue #73893# should fix it in OOo 3.3.
+
+    //if (NULL !=m_pHttpSession)
+    //  ne_close_connection(m_pHttpSession);
 }
 
 // -------------------------------------------------------------------