diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-07 11:58:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-07 11:58:15 +0000 |
| commit | 73f42f725fccbc37d58a87d69d1d024f686a901c (patch) | |
| tree | fd04bbf39111cca1cfffae31d52800d825e667dc | |
| parent | bd6430c5e1f68e9b2b3631baa6243fe461c627db (diff) | |
#i10000# fix by TKR, NEON_VERSION missing
| -rw-r--r-- | ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx index 76ab473b54c6..6a2a943c9a95 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.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2008-01-04 14:35:30 $ + * last change: $Author: obo $ $Date: 2008-01-07 12:58:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,11 +176,22 @@ extern "C" int NPFR_propfind_iter( void* userdata, // ------------------------------------------------------------------- extern "C" void NPFR_propfind_results( void* userdata, +#if NEON_VERSION >= 0260 const ne_uri* uri, +#else + const char* href, +#endif const NeonPropFindResultSet* set ) { + // @@@ href is not the uri! DAVResource ctor wants uri! + +#if NEON_VERSION >= 0260 DAVResource theResource( OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) ); +#else + DAVResource theResource( + OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) ); +#endif ne_propset_iterate( set, NPFR_propfind_iter, &theResource ); @@ -189,7 +200,6 @@ extern "C" void NPFR_propfind_results( void* userdata, = static_cast< vector< DAVResource > * >( userdata ); theResources->push_back( theResource ); } - // ------------------------------------------------------------------- extern "C" int NPFR_propnames_iter( void* userdata, const NeonPropName* pname, @@ -208,14 +218,23 @@ extern "C" int NPFR_propnames_iter( void* userdata, // ------------------------------------------------------------------- extern "C" void NPFR_propnames_results( void* userdata, +#if NEON_VERSION >= 0260 const ne_uri* uri, +#else + const char* href, +#endif const NeonPropFindResultSet* results ) { // @@@ href is not the uri! DAVResourceInfo ctor wants uri! - // Create entry for the resource. +#if NEON_VERSION >= 0260 DAVResourceInfo theResource( OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) ); +#else + DAVResourceInfo theResource( + OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) ); +#endif + // Fill entry. ne_propset_iterate( results, NPFR_propnames_iter, &theResource ); |