[ooo-build-commit] .: patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Fri Jul 30 11:05:42 PDT 2010


 patches/dev300/xlsx-shared-xlsx-snapshot.diff |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 03161673bd39ce640251ae501aa2442e01cde892
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Jul 30 20:04:27 2010 +0200

    enabled the needed hunk in xlsx-shared-xlsx-snapshot.diff
    
    * patches/dev300/xlsx-shared-xlsx-snapshot.diff: added alternative hunk
      to be applied without the vba diffs

diff --git a/patches/dev300/xlsx-shared-xlsx-snapshot.diff b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
index 4b51173..ac3a570 100644
--- a/patches/dev300/xlsx-shared-xlsx-snapshot.diff
+++ b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
@@ -273,6 +273,7 @@
      if( rAddrConv.IsColTruncated() || rAddrConv.IsRowTruncated() || rAddrConv.IsTabTruncated() )
 --- sc/source/filter/excel/xeescher.cxx.old	2010-03-03 17:00:05.000000000 +0100
 +++ sc/source/filter/excel/xeescher.cxx	2010-03-03 17:00:06.000000000 +0100
+# FIXME ooo330-m2: this versions of the hunk depends on the vba diffs
 #@@ -71,6 +71,7 @@
 # #include "svx/unoapi.hxx"
 # 
@@ -281,6 +282,14 @@
 # 
 # using ::rtl::OString;
 # using ::rtl::OUString;
+@@ -50,6 +50,7 @@
+ #include <editeng/outlobj.hxx>
+ #include <editeng/editobj.hxx>
+ #include <unotools/tempfile.hxx>
++#include <oox/export/drawingml.hxx>
+ #include <unotools/ucbstreamhelper.hxx>
+ 
+ #include "editutil.hxx"
 @@ -91,6 +92,7 @@ using ::com::sun::star::form::binding::X
  using ::com::sun::star::script::ScriptEventDescriptor;
  using ::com::sun::star::table::CellAddress;


More information about the ooo-build-commit mailing list