From c503b5600f4d5c23521d386da1c61039676a44fb Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Tue, 3 Jul 2007 11:13:17 +0000
Subject: INTEGRATION: CWS neonupdate (1.17.54); FILE MERGED 2007/06/22
 12:29:22 kso 1.17.54.2: RESYNC: (1.17-1.18); FILE MERGED 2007/06/21 15:15:26
 kso 1.17.54.1: #i77023# - Removed support for neon < 0.26.

---
 ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 4bf3b0cee981..985273fc720b 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: NeonPropFindRequest.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2007-06-19 16:12:48 $
+ *  last change: $Author: rt $ $Date: 2007-07-03 12:13:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -176,19 +176,14 @@ extern "C" int NPFR_propfind_iter( void* userdata,
 
 // -------------------------------------------------------------------
 extern "C" void NPFR_propfind_results( void* userdata,
-#if NEON_VERSION >= 0260
                                        const ne_uri* href_uri,
-#else
-                                       const char* href,
-#endif
                                        const NeonPropFindResultSet* set )
 {
     // @@@ href is not the uri! DAVResource ctor wants uri!
 
-#if NEON_VERSION >= 0260
     // href should be free'd? says header ...
     char* href = ne_uri_unparse(href_uri);
-#endif
+
     DAVResource theResource(
                         OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) );
 
@@ -218,19 +213,14 @@ extern "C" int NPFR_propnames_iter( void* userdata,
 
 // -------------------------------------------------------------------
 extern "C" void NPFR_propnames_results( void* userdata,
-#if NEON_VERSION >= 0260
                                         const ne_uri* href_uri,
-#else
-                                        const char* href,
-#endif
                                         const NeonPropFindResultSet* results )
 {
     // @@@ href is not the uri! DAVResourceInfo ctor wants uri!
 
-#if NEON_VERSION >= 0260
     // href should be free'd? says header ...
     char* href = ne_uri_unparse(href_uri);
-#endif
+
     // Create entry for the resource.
     DAVResourceInfo theResource(
                         OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) );
-- 
cgit