ooo-build r15446 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Mar  3 18:58:46 2009
New Revision: 15446
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15446&view=rev

Log:
2009-03-03  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/ucb-neon-different-name-m2.diff:
	* patches/dev300/ucb-neon-different-name.diff:
	* patches/dev300/apply: adjusted for ooo310-m3.



Added:
   trunk/patches/dev300/ucb-neon-different-name-m2.diff
      - copied unchanged from r15445, /trunk/patches/dev300/ucb-neon-different-name.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ucb-neon-different-name.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar  3 18:58:46 2009
@@ -447,10 +447,17 @@
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
 
+[ Fixes < dev300-m42 < ooo310-m3 ]
+# some versions of neon report DAV:Collection instead of Collection
+# thanks Caolan for the fix
+ucb-neon-different-name-m2.diff, i#98288, pmladek
+
+[ Fixes >= dev300-m42 >= ooo310-m3 ]
 # some versions of neon report DAV:Collection instead of Collection
 # thanks Caolan for the fix
 ucb-neon-different-name.diff, i#98288, pmladek
 
+[ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 

Modified: trunk/patches/dev300/ucb-neon-different-name.diff
==============================================================================
--- trunk/patches/dev300/ucb-neon-different-name.diff	(original)
+++ trunk/patches/dev300/ucb-neon-different-name.diff	Tue Mar  3 18:58:46 2009
@@ -1,16 +1,13 @@
-Index: source/ucp/webdav/NeonPropFindRequest.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonPropFindRequest.cxx,v
-retrieving revision 1.24
-diff -u -r1.24 NeonPropFindRequest.cxx
---- ucb/source/ucp/webdav/NeonPropFindRequest.cxx	10 Apr 2008 15:40:55 -0000	1.24
-+++ ucb/source/ucp/webdav/NeonPropFindRequest.cxx	20 Jan 2009 16:21:07 -0000
-@@ -103,8 +104,12 @@
+diff --git ucb/source/ucp/webdav/NeonPropFindRequest.cxx ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+index ae9f022..33b0cbc 100644
+--- ucb/source/ucp/webdav/NeonPropFindRequest.cxx
++++ ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+@@ -103,8 +103,12 @@ extern "C" int NPFR_propfind_iter( void* userdata,
  			if ( aValue.getLength() )
  			{
                  aValue = aValue.toAsciiLowerCase();
 -				if ( aValue.compareTo(
--						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
+-					RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
 +				if (
 +				    ( aValue.compareTo(
 +						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||