merge with DEV300_m94

1 files changed, 9 insertions, 80 deletions

diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.cxx b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
index 2880a86a727d..1e5294882a03 100644
--- a/ucb/source/ucp/webdav/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
@@ -37,16 +37,15 @@ using namespace com::sun::star;
 
 namespace {
 
-#if NEON_VERSION >= 0x0250
-void process_headers(ne_request *req,
-                     DAVResource &rResource,
-                     const std::vector< ::rtl::OUString > &rHeaderNames)
+void process_headers( ne_request * req,
+                      DAVResource & rResource,
+                      const std::vector< ::rtl::OUString > & rHeaderNames )
 {
-    void *cursor = NULL;
-    const char *name, *value;
+    void * cursor = NULL;
+    const char * name, *value;
 
-    while ((cursor = ne_response_header_iterate(req, cursor,
-                                                &name, &value)) != NULL) {
+    while ( ( cursor = ne_response_header_iterate( req, cursor,
+                                                   &name, &value ) ) != NULL ) {
         rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) );
         rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) );
 
@@ -86,69 +85,6 @@ void process_headers(ne_request *req,
         }
     }
 }
-#else
-struct NeonHeadRequestContext
-{
-    DAVResource * pResource;
-    const std::vector< ::rtl::OUString > * pHeaderNames;
-
-    NeonHeadRequestContext( DAVResource * p,
-                            const std::vector< ::rtl::OUString > * pHeaders )
-    : pResource( p ), pHeaderNames( pHeaders ) {}
-};
-
-extern "C" void NHR_ResponseHeaderCatcher( void * userdata,
-                                           const char * value )
-{
-    rtl::OUString aHeader( rtl::OUString::createFromAscii( value ) );
-    sal_Int32 nPos = aHeader.indexOf( ':' );
-
-    if ( nPos != -1 )
-    {
-        rtl::OUString aHeaderName( aHeader.copy( 0, nPos ) );
-
-        NeonHeadRequestContext * pCtx
-            = static_cast< NeonHeadRequestContext * >( userdata );
-
-        // Note: Empty vector means that all headers are requested.
-        bool bIncludeIt = ( pCtx->pHeaderNames->size() == 0 );
-
-        if ( !bIncludeIt )
-        {
-            // Check whether this header was requested.
-            std::vector< ::rtl::OUString >::const_iterator it(
-                pCtx->pHeaderNames->begin() );
-            const std::vector< ::rtl::OUString >::const_iterator end(
-                pCtx->pHeaderNames->end() );
-
-            while ( it != end )
-            {
-                if ( (*it) == aHeaderName )
-                    break;
-
-                ++it;
-            }
-
-            if ( it != end )
-                bIncludeIt = true;
-        }
-
-        if ( bIncludeIt )
-        {
-            // Create & set the PropertyValue
-            DAVPropertyValue thePropertyValue;
-            thePropertyValue.Name = aHeaderName;
-            thePropertyValue.IsCaseSensitive = false;
-
-            if ( nPos < aHeader.getLength() )
-                thePropertyValue.Value <<= aHeader.copy( nPos + 1 ).trim();
-
-            // Add the newly created PropertyValue
-            pCtx->pResource->properties.push_back( thePropertyValue );
-        }
-    }
-}
-#endif
 
 } // namespace
 
@@ -156,7 +92,7 @@ extern "C" void NHR_ResponseHeaderCatcher( void * userdata,
 // Constructor
 // -------------------------------------------------------------------
 
-NeonHeadRequest::NeonHeadRequest( HttpSession* inSession,
+NeonHeadRequest::NeonHeadRequest( HttpSession * inSession,
                                   const rtl::OUString & inPath,
                                   const std::vector< ::rtl::OUString > &
                                     inHeaderNames,
@@ -174,16 +110,9 @@ NeonHeadRequest::NeonHeadRequest( HttpSession* inSession,
                                             inPath,
                                             RTL_TEXTENCODING_UTF8 ) );
 
-#if NEON_VERSION < 0x0250
-    NeonHeadRequestContext aCtx( &ioResource, &inHeaderNames );
-    ne_add_response_header_catcher( req, NHR_ResponseHeaderCatcher, &aCtx );
-#endif
-
     nError = ne_request_dispatch( req );
 
-#if NEON_VERSION >= 0x0250
-    process_headers(req, ioResource, inHeaderNames);
-#endif
+    process_headers( req, ioResource, inHeaderNames );
 
     if ( nError == NE_OK && ne_get_status( req )->klass != 2 )
         nError = NE_ERROR;