[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 2ff4d03298867413a79029dee19b7377e61071f9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 17 13:42:59 2009 +0300

    Bypass ooxml03 patches for now
    
    * patches/dev300/apply: The cws-ooxml03 patches are a pain to adapt,
      and kendy says they will be upstream soon anyway, so bypass for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index de44297..6149cc3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2953,25 +2953,28 @@ mail-document-subject.diff, n#459176
 
 [ OOXMLExport ]
 SectionOwner => jholesov
+# FIXME: 2009-08-17: ooxml03 will hopefully be upstream in dev300-m56,
+# and it is a pain to adapt, so bypass it for now. --tml
+
 # OPC changes, and SVX + PPT split
-cws-ooxml03-opc-svx-and-ptt-split.diff
+# cws-ooxml03-opc-svx-and-ptt-split.diff
 
 # Fix output of dates - xsi:type=... should be there only for dcterms
-cws-ooxml03-oox-dcterms.diff
+# cws-ooxml03-oox-dcterms.diff
 
 # Snapshot of the docx export filter from ooxml03
 # Note: It creates an own filter, libdocx.  This is not what is intended
 # up-stream, there should really the doc and docx export be in one filter.
-cws-ooxml03-docx-scp2.diff
-cws-ooxml03-docx-sw.diff
+# cws-ooxml03-docx-scp2.diff
+# cws-ooxml03-docx-sw.diff
 # temp patches, created too late to be in cws-ooxml03-docx-sw.diff, will be
 # removed with the next snapshot of ooxm03 (they are committed there)
-cws-ooxml03-docx-sw-fix-gridcols.diff, n#493673
-cws-ooxml03-docx-sw-fix-section-columns.diff, n#497556
-cws-ooxml03-docx-sw-fix-table-width-height.diff, n#497554
-cws-ooxml03-docx-sw-fix-bookmarks-endless-loop.diff, n#498755
-cws-ooxml03-docx-sw-fix-spacing.diff, n#493673
-cws-ooxml03-docx-sw-fix-nested-tables.diff, n#499118
+# cws-ooxml03-docx-sw-fix-gridcols.diff, n#493673
+# cws-ooxml03-docx-sw-fix-section-columns.diff, n#497556
+# cws-ooxml03-docx-sw-fix-table-width-height.diff, n#497554
+# cws-ooxml03-docx-sw-fix-bookmarks-endless-loop.diff, n#498755
+# cws-ooxml03-docx-sw-fix-spacing.diff, n#493673
+# cws-ooxml03-docx-sw-fix-nested-tables.diff, n#499118
 
 #FIXME! kendy: is this functionalities actually needed or just cloned?
 field-patch-fix-docx.diff