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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Mar 17 23:49:47 2009
New Revision: 15559
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15559&view=rev

Log:
        * patches/dev300/apply: #i96858# (according to comment in xiescher.cxx
          is upstream in m6, so fix-shape-export-i96858.diff is < ooo310-m6.
          Noel, please check.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar 17 23:49:47 2009
@@ -1758,9 +1758,11 @@
 # core changes not yet upstream
 sc-source-ui-vba-makefile-mk.diff
 
+[ VBAObjects < ooo310-m6 ]
 # fix nasty corruption of rountriped excel documents with shapes
 fix-shape-export-i96858.diff, i#96858
 
+[ VBAObjects ]
 # export of macro bindings for shapes
 sc-export-shape-macro-bindings.diff, n#304739, noelpwer