diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:36:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:36:06 +0000 |
| commit | 4e00b2a799fccdef586bbdab486e68334068e948 (patch) | |
| tree | 88af4632872b6ec754f4f45054afb1caacee1e57 /ucb/source/ucp/webdav/NeonUri.cxx | |
| parent | 4ddddc2769a0c34032878d2a0bb6d42486c5ae26 (diff) | |
INTEGRATION: CWS configure18 (1.15.6); FILE MERGED
2006/07/13 15:18:20 rene 1.15.6.1: #i64798# system neon 0.26.x support, by geki
Diffstat (limited to 'ucb/source/ucp/webdav/NeonUri.cxx')
| -rw-r--r-- | ucb/source/ucp/webdav/NeonUri.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx index 23a522c20b56..129ff120bc0a 100644 --- a/ucb/source/ucp/webdav/NeonUri.cxx +++ b/ucb/source/ucp/webdav/NeonUri.cxx @@ -4,9 +4,9 @@ * * $RCSfile: NeonUri.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2006-06-20 05:37:31 $ + * last change: $Author: kz $ $Date: 2006-07-19 09:36:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,9 +59,15 @@ using namespace webdav_ucp; // the string fields of ne_uri are char*, not const char* # pragma disable_warn # endif +#if NEON_VERSION >= 0260 +ne_uri NeonUri::sUriDefaultsHTTP = { "http", NULL, NULL, DEFAULT_HTTP_PORT }; +ne_uri NeonUri::sUriDefaultsHTTPS = { "https", NULL, NULL, DEFAULT_HTTPS_PORT }; +ne_uri NeonUri::sUriDefaultsFTP = { "ftp", NULL, NULL, DEFAULT_FTP_PORT }; +#else ne_uri NeonUri::sUriDefaultsHTTP = { "http", NULL, DEFAULT_HTTP_PORT, NULL, NULL }; ne_uri NeonUri::sUriDefaultsHTTPS = { "https", NULL, DEFAULT_HTTPS_PORT, NULL, NULL }; ne_uri NeonUri::sUriDefaultsFTP = { "ftp", NULL, DEFAULT_FTP_PORT, NULL, NULL }; +#endif # if defined __SUNPRO_CC # pragma enable_warn #endif @@ -140,7 +146,11 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) pUri->scheme ? pUri->scheme : pUriDefs->scheme, RTL_TEXTENCODING_UTF8 ); mUserInfo = rtl::OStringToOUString( +#if NEON_VERSION >= 0260 + pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo, +#else pUri->authinfo ? pUri->authinfo : pUriDefs->authinfo, +#endif RTL_TEXTENCODING_UTF8 ); mHostName = rtl::OStringToOUString( pUri->host ? pUri->host : pUriDefs->host, |