diff options
author | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 10:15:20 +0100 |
---|---|---|
committer | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 10:15:20 +0100 |
commit | 9f8b120b70accfd35fa603a6e8d96714d8c7f14e (patch) | |
tree | f39582efc78bc18169397049409758f0df4347df /ucb | |
parent | 02f2b669fe3d736a0d1873742ebc6feb169905f1 (diff) | |
parent | 12c7dc97e4470d70a9df30429c3dc51343682c07 (diff) |
merged with DEV300_m67
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/odma/odma_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/odma/odma_datasupplier.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/odma/odma_provider.cxx | 22 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/DAVResourceAccess.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/NeonSession.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/makefile.mk | 3 |
6 files changed, 27 insertions, 22 deletions
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx index 80d5114e09..fc4be63462 100644 --- a/ucb/source/ucp/odma/odma_content.cxx +++ b/ucb/source/ucp/odma/odma_content.cxx @@ -565,7 +565,7 @@ uno::Any SAL_CALL Content::execute( ODM_DELETE, lpszNewDocId); - delete lpszNewDocId; + delete [] lpszNewDocId; } if(bError) ucbhelper::cancelCommandExecution( diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx index ad1d6151e2..a047921752 100644 --- a/ucb/source/ucp/odma/odma_datasupplier.cxx +++ b/ucb/source/ucp/odma/odma_datasupplier.cxx @@ -329,10 +329,10 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) // now close the query odm = NODMQueryClose(ContentProvider::getHandle(), pQueryId); - delete lpszDMSList; - delete pQueryId; - delete lpszDocId; - delete lpszDocName; + delete [] lpszDMSList; + delete [] pQueryId; + delete [] lpszDocId; + delete [] lpszDocName; if ( !bFound ) m_pImpl->m_bCountFinal = sal_True; diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index a124ff077b..988af49933 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -230,7 +230,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( aProp->m_sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_TYPE)); append(aProp); } - delete lpszDocName; + delete [] lpszDocName; } else // we got an already fetched name here so look for it { @@ -298,11 +298,11 @@ void ContentProvider::saveDocument(const ::rtl::OString& _sDocumentId) OSL_ENSURE(odm == ODM_SUCCESS,"Could not save document!"); if(odm != ODM_SUCCESS) { - delete lpszDocId; + delete [] lpszDocId; throw uno::Exception(); } aIter->second->m_sDocumentId = rtl::OString(lpszDocId); - delete lpszDocId; + delete [] lpszDocId; } } // ----------------------------------------------------------------------------- @@ -414,7 +414,7 @@ void ContentProvider::fillDocumentProperties(const ::rtl::Reference<ContentPrope lpszDocInfo, ODM_DOCID_MAX); */ - delete lpszDocInfo; + delete [] lpszDocInfo; } // ----------------------------------------------------------------------------- void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp) @@ -482,16 +482,16 @@ void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp) } while(nCount > nMaxCount); - delete lpszDocInfo; - delete lpszDocId; - delete lpszDocName; + delete [] lpszDocInfo; + delete [] lpszDocId; + delete [] lpszDocName; } // now close the query odm = NODMQueryClose(ContentProvider::getHandle(), pQueryId); - delete pQueryId; + delete [] pQueryId; } - delete lpszDMSList; + delete [] lpszDMSList; return aReturn; @@ -547,11 +547,11 @@ void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp) _rProp->m_bIsOpen = sal_True; break; default: - delete pFileName; + delete [] pFileName; throw uno::Exception(); // TODO give a more precise error message here } - delete pFileName; + delete [] pFileName; } return _rProp->m_sFileURL; } diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index b2c243a6fe..00b42e24a5 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -558,8 +558,10 @@ 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(); + OSL_TRACE( "Not implemented. -> #i106766#" ); } //========================================================================= diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index c897f30234..db8b69625f 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -1662,8 +1662,12 @@ bool NeonSession::UNLOCK( NeonLock * pLock ) void NeonSession::abort() throw ( DAVException ) { - if ( 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 ( m_pHttpSession ) + // ne_close_connection( m_pHttpSession ); } // ------------------------------------------------------------------- diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 9756327c41..848cecd882 100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -127,8 +127,7 @@ SHL1STDLIBS=\ $(UCBHELPERLIB) \ $(COMPHELPERLIB) \ $(NEON3RDLIB) \ - $(LIBXML2LIB) \ - $(ZLIB3RDLIB) + $(LIBXML2LIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS+= $(WSOCK32LIB) |