diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:37:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:37:07 +0000 |
| commit | 551e515cd25789349eb0d21a721435a4345bed1f (patch) | |
| tree | ded2b7f5d9a515625d4874e097d9a9816b2356ff /ucb/source | |
| parent | 98d2ae5ab1baf6341d9d2da73db91e2cc5b2e901 (diff) | |
INTEGRATION: CWS warnings01 (1.36.8); FILE MERGED
2006/04/07 21:27:13 sb 1.36.8.5: RESYNC: (1.37-1.39); FILE MERGED
2006/03/10 15:40:14 sb 1.36.8.4: #i53898# Made code warning-free.
2006/01/25 22:19:32 sb 1.36.8.3: RESYNC: (1.36-1.37); FILE MERGED
2005/11/10 18:10:27 pl 1.36.8.2: #i55991# removed warnings
2005/11/10 17:15:27 pl 1.36.8.1: #i55991# removed warnings
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/webdav/NeonSession.cxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 655f78c40494..44e21c73df56 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -4,9 +4,9 @@ * * $RCSfile: NeonSession.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2006-02-09 14:26:15 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:37:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -378,18 +378,18 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, } // ------------------------------------------------------------------- -extern "C" void NeonSession_ProgressNotify( void * userdata, - off_t progress, - off_t total ) +extern "C" void NeonSession_ProgressNotify( void *, + off_t, + off_t ) { // progress: bytes read so far // total: total bytes to read, -1 -> total count not known } // ------------------------------------------------------------------- -extern "C" void NeonSession_StatusNotify( void * userdata, - ne_conn_status status, - const char *info ) +extern "C" void NeonSession_StatusNotify( void *, + ne_conn_status, + const char * ) { #if 0 typedef enum { @@ -549,7 +549,7 @@ NeonSession::~NeonSession( ) */ } - delete m_pRequestData; + delete static_cast<RequestDataMap*>(m_pRequestData); } // ------------------------------------------------------------------- @@ -928,9 +928,13 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, for ( n = 0; n < nPropCount; ++n ) { free( (void *)pItems[ n ].name->name ); - delete (void *)pItems[ n ].name; + delete pItems[ n ].name; free( (void *)pItems[ n ].value ); } + #if 0 + // FIXME: shouldn't we delete the list ? + delete [] pItems; + #endif HandleError( theRetVal ); } @@ -1678,7 +1682,7 @@ bool NeonSession::getDataFromInputStream( { try { - sal_Int32 nSize = xSeekable->getLength(); + sal_Int32 nSize = sal::static_int_cast<sal_Int32>(xSeekable->getLength()); sal_Int32 nRead = xStream->readBytes( rData, nSize ); if ( nRead == nSize ) |