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

[tml svn gnome org]

Author: tml
Date: Tue Jun 10 12:27:41 2008
New Revision: 12849
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12849&view=rev

Log:
2008-06-10  Tor Lillqvist  <tml novell com>

	* patches/dev300/webdav-locking.diff
	* patches/dev300/cjk-character-units-ui.diff: Remove fuzz 2.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cjk-character-units-ui.diff
   trunk/patches/dev300/webdav-locking.diff

Modified: trunk/patches/dev300/cjk-character-units-ui.diff
==============================================================================
--- trunk/patches/dev300/cjk-character-units-ui.diff	(original)
+++ trunk/patches/dev300/cjk-character-units-ui.diff	Tue Jun 10 12:27:41 2008
@@ -201,8 +201,8 @@
 --- sw/source/ui/config/optload.cxx	2007-12-16 23:23:01.000000000 +0800
 +++ sw/source/ui/config/optload.cxx	2007-12-17 01:41:54.000000000 +0800
 @@ -112,6 +112,10 @@
+ #include <doc.hxx>
  #include <svtools/cjkoptions.hxx>
- #endif
  
 +#ifndef _SFXENUMITEM_HXX //autogen
 +#include <svtools/eitem.hxx>

Modified: trunk/patches/dev300/webdav-locking.diff
==============================================================================
--- trunk/patches/dev300/webdav-locking.diff	(original)
+++ trunk/patches/dev300/webdav-locking.diff	Tue Jun 10 12:27:41 2008
@@ -21,8 +21,8 @@
 --- ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
 +++ ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
 @@ -45,6 +45,10 @@
+ #include <rtl/ref.hxx>
  #include "DAVAuthListener.hxx"
- #endif
  
 +#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_
 +#include <com/sun/star/ucb/XCommandEnvironment.hpp>