[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit d9439d7f8738aa924c8c015a71548a8361af5403
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 14:06:08 2009 +0300

    Bypass a load of OOXMLExport patches
    
    * patches/dev300/apply: Bypass a load of OOXMLExport patches that
      don't apply at all.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 32f9060..c2ab571 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3242,16 +3242,20 @@ oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 # oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
 
 [ OOXMLExport ]
-oox-pptx-export-hyperlinks.diff, n#499124, rodo
-oox-pptx-export-vertical-text.diff, n#498737, rodo
-oox-pptx-export-para-linespacing.diff, n#498737, rodo
-oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
-oox-drawingml-fix-shapes-map-crash.diff, rodo
-oox-pptx-export-animations-filter.diff, n#497570, rodo
-oox-calc-export-export-pivot-content.diff, n#505917, janneke
-oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
-oox-pptx-export-blip-luminance.diff, n#497570, rodo
-oox-calc-export-sotstorage-init.diff, n#505917, janneke
+
+# FIXME: 2009-08-21: Do not apply. Either files being patched do not
+# exist, or hunks don't apply at all, probably due to diffs above
+# being commented out. --tml
+# oox-pptx-export-hyperlinks.diff, n#499124, rodo
+# oox-pptx-export-vertical-text.diff, n#498737, rodo
+# oox-pptx-export-para-linespacing.diff, n#498737, rodo
+# oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
+# oox-drawingml-fix-shapes-map-crash.diff, rodo
+# oox-pptx-export-animations-filter.diff, n#497570, rodo
+# oox-calc-export-export-pivot-content.diff, n#505917, janneke
+# oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
+# oox-pptx-export-blip-luminance.diff, n#497570, rodo
+# oox-calc-export-sotstorage-init.diff, n#505917, janneke
 
 [ CrossWin32Patches ]
 # Experimental patches to crosscompile OOo for Win32