diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:33:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:33:42 +0000 |
| commit | f8d9622665b57b382467c4ec19d1c30c37eabf43 (patch) | |
| tree | ae932d0b85546185cdbf99b1d405d158f5fe2442 /ucb | |
| parent | 4a09d97be99b70cc7012abb8cb271451a21c5323 (diff) | |
INTEGRATION: CWS pmladek08 (1.19.34); FILE MERGED
2007/12/10 14:15:41 pmladek 1.19.34.1: #i82569#
add back support for build with neon-0.24.X
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx index 985273fc720b..8dc5280b282f 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.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2007-07-03 12:13:17 $ + * last change: $Author: kz $ $Date: 2007-12-12 15:33:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,14 +176,19 @@ 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 ) ); @@ -213,14 +218,19 @@ 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 ) ); |