ooo-build r13594 - in trunk: . doc patches/dev300

[michael svn gnome org]

Author: michael
Date: Fri Aug 15 14:42:25 2008
New Revision: 13594
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13594&view=rev

Log:
2008-08-15  Michael Meeks  <michael meeks novell com>

        * patches/dev300/controls-with-images-import.diff: fix
        first fragment so it applies to m1.



Modified:
   trunk/ChangeLog
   trunk/doc/split.txt
   trunk/patches/dev300/controls-with-images-import.diff

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Fri Aug 15 14:42:25 2008
@@ -85,6 +85,10 @@
 		+ then we could drop the rsc2 patch to not check
 		  for icons' existence.
 
+	+ FIXME: accelerate the sloppy patching stuff - merge it
+	  into apply.pl ? - no need to fork things we don't want
+	  to execute.
+
 	+ drop a 'Makefile' from the system in each top-level as
 	  we unpack it, that will do all the build goodness (?)
 

Modified: trunk/patches/dev300/controls-with-images-import.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-import.diff	(original)
+++ trunk/patches/dev300/controls-with-images-import.diff	Fri Aug 15 14:42:25 2008
@@ -16,12 +16,14 @@
          sal_Bool Read(SotStorageStream *pS);
  
  	using OCX_Control::Import; // to not hide the other two import methods
+
+
 --- svx/source/msfilter/msocximex.cxx.orig	2008-08-15 06:28:07.000000000 +0800
 +++ svx/source/msfilter/msocximex.cxx	2008-08-15 16:25:46.000000000 +0800
 @@ -90,6 +90,12 @@
- #include <com/sun/star/table/CellAddress.hpp>
- #include <com/sun/star/sheet/XSpreadsheetView.hpp>
- #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+ 
+ #include <algorithm>
+ #include <memory>
 +#include <com/sun/star/graphic/GraphicObjectFactory.hpp>
 +#include <com/sun/star/graphic/XGraphicProvider.hpp>
 +#include <com/sun/star/graphic/XGraphic.hpp>