INTEGRATION: CWS cmcfixes42 (1.22.12); FILE MERGED

2008/02/15 10:51:05 cmc 1.22.12.1: #i86123# use hex prefix to avoid octal problem

2 files changed, 16 insertions, 16 deletions

diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 6a2a943c9a95..4eb84b9919f8 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.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: obo $ $Date: 2008-01-07 12:58:15 $
+ *  last change: $Author: rt $ $Date: 2008-02-19 12:34:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -176,7 +176,7 @@ extern "C" int NPFR_propfind_iter( void* userdata,
 
 // -------------------------------------------------------------------
 extern "C" void NPFR_propfind_results( void* userdata,
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                        const ne_uri* uri,
 #else
                                        const char* href,
@@ -185,7 +185,7 @@ extern "C" void NPFR_propfind_results( void* userdata,
 {
     // @@@ href is not the uri! DAVResource ctor wants uri!
 
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
     DAVResource theResource(
                         OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) );
 #else
@@ -218,7 +218,7 @@ extern "C" int NPFR_propnames_iter( void* userdata,
 
 // -------------------------------------------------------------------
 extern "C" void NPFR_propnames_results( void* userdata,
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                         const ne_uri* uri,
 #else
                                         const char* href,
@@ -227,7 +227,7 @@ extern "C" void NPFR_propnames_results( void* userdata,
 {
     // @@@ href is not the uri! DAVResourceInfo ctor wants uri!
     // Create entry for the resource.
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
     DAVResourceInfo theResource(
                         OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) );
 #else
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index 35fc6525d2f1..20fa193b6946 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.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: obo $ $Date: 2008-01-04 14:32:03 $
+ *  last change: $Author: rt $ $Date: 2008-02-19 12:35:33 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -73,34 +73,34 @@ using namespace webdav_ucp;
 namespace {
 
 const ne_uri g_sUriDefaultsHTTP  = { "http",
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                      NULL,
 #endif
                                      NULL,
                                      DEFAULT_HTTP_PORT,
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                      NULL,
 #endif
                                      NULL,
                                      NULL };
 const ne_uri g_sUriDefaultsHTTPS = { "https",
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                      NULL,
 #endif
                                      NULL,
                                      DEFAULT_HTTPS_PORT,
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                      NULL,
 #endif
                                      NULL,
                                      NULL };
 const ne_uri g_sUriDefaultsFTP   = { "ftp",
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                      NULL,
 #endif
                                      NULL,
                                      DEFAULT_FTP_PORT,
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
                                      NULL,
 #endif
                                      NULL,
@@ -188,7 +188,7 @@ 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
+#if NEON_VERSION >= 0x0260
                     pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo,
 #else
                     pUri->authinfo ? pUri->authinfo : pUriDefs->authinfo,
@@ -202,7 +202,7 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri )
                     pUri->path ? pUri->path : pUriDefs->path,
                     RTL_TEXTENCODING_UTF8 );
 
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
     if ( pUri->query )
     {
         mPath += rtl::OUString::createFromAscii( "?" );