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

[pflin svn gnome org]

Author: pflin
Date: Fri Aug 15 08:23:42 2008
New Revision: 13585
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13585&view=rev

Log:
2008-08-15  Fong Lin  <pflin novell com>
	* patches/dev300/controls-with-images-import.diff:ajusted some codes.



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

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 08:23:42 2008
@@ -1,10 +1,10 @@
 --- svx/inc/svx/msocximex.hxx.orig	2008-08-15 13:27:08.000000000 +0800
-+++ svx/inc/svx/msocximex.hxx	2008-08-15 13:44:19.000000000 +0800
++++ svx/inc/svx/msocximex.hxx	2008-08-15 16:20:01.000000000 +0800
 @@ -32,6 +32,7 @@
  
  #include <sot/storage.hxx>
  #include <tools/debug.hxx>
-+#include <com/sun/star/graphic/GraphicObjectFactory.hpp>
++#include <com/sun/star/graphic/XGraphicObject.hpp>
  
  //!! no such defines in global namespaces - it will break other existing code that uses the same define!!
  //#ifndef C2U
@@ -17,16 +17,16 @@
  
  	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 14:01:20.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 <com/sun/star/graphic/GraphicObjectFactory.hpp>
 +#include <com/sun/star/graphic/XGraphicProvider.hpp>
 +#include <com/sun/star/graphic/XGraphic.hpp>
 +#include <com/sun/star/io/XInputStream.hpp>
-+#include "comphelper/componentcontext.hxx"
++#include <comphelper/componentcontext.hxx>
 +#include <unotools/streamwrap.hxx>
   
  #ifndef C2S
@@ -234,26 +234,3 @@
  	return sal_True;
  }
  
---- sc/source/filter/excel/makefile.mk.orig	2008-08-15 15:59:35.000000000 +0800
-+++ sc/source/filter/excel/makefile.mk	2008-08-15 16:00:58.000000000 +0800
-@@ -124,6 +124,7 @@ EXCEPTIONSFILES = \
- 		$(SLO)$/excimp8.obj					\
- 		$(SLO)$/excobj.obj					\
- 		$(SLO)$/excrecds.obj				\
-+		$(SLO)$/exctools.obj				\
- 		$(SLO)$/expop2.obj					\
- 		$(SLO)$/namebuff.obj				\
- 		$(SLO)$/xecontent.obj				\
---- sc/source/filter/xcl97/makefile.mk.orig	2008-08-15 16:01:45.000000000 +0800
-+++ sc/source/filter/xcl97/makefile.mk	2008-08-15 16:10:36.000000000 +0800
-@@ -56,7 +56,9 @@ SLOFILES =									\
- 		$(SLO)$/XclExpChangeTrack.obj
- 
- EXCEPTIONSFILES =							\
--		$(SLO)$/xcl97rec.obj
-+		$(SLO)$/xcl97esc.obj				\
-+		$(SLO)$/xcl97rec.obj				\
-+		$(SLO)$/XclExpChangeTrack.obj
- 
- # --- Targets -------------------------------------------------------
-