summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
Diffstat (limited to 'ucb')
-rwxr-xr-xucb/qa/complex/tdoc/interfaces/makefile.mk2
-rwxr-xr-xucb/qa/complex/tdoc/makefile.mk2
-rwxr-xr-xucb/qa/complex/ucb/makefile.mk2
-rw-r--r--ucb/source/ucp/gio/gio_mount.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx5
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx7
6 files changed, 12 insertions, 8 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 ac581fcf7581..25126f619540 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -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);
}
// -------------------------------------------------------------------