[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit 40dc473bcfbfd4a118e88ec770e867b86ca114f3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 15:33:45 2009 +0300

    Bypass two more patches

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 449ade5..bdb9d63 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1840,7 +1840,8 @@ oox-import-chart-externalref.diff, n#480868, janneke
 # understanding of the code needed. --tml
 # oox-import-table-autofilter.diff, n#479381, janneke
 
-oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
+# FIXME_ 2009-09-02: Applies but causes compilation errors. --tml
+# oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 
 # FIXME: 2009-08-12: Like docx-import-fixes.diff, this is related to
 # the vml shape code which has been significantly restructured
@@ -1861,14 +1862,21 @@ oox-import-sheet-protect.diff, n#481317, janneke
 # oox-fix-slide-background-gradients.diff, n#383555, rodo
 
 oox-import-drawing-font-spacing.diff, n#479822, rodo
-oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
+
+# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
+# oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
+
 oox-pptx-import-fix-layout.diff, n#480223, rodo
 oox-pptx-import-fix-wipe-transition.diff, n#480243, rodo
 oox-pptx-import-fix-transition-auto-advance.diff, n#480243, rodo
 oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
 oox-pptx-import-fix-header-footer-visibility.diff, n#480243, rodo
 oox-pptx-import-fix-hidden-slides.diff, n#480229, rodo
-oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
+
+# FIXME: 2009-09-02: Does not apply when
+# oox-import-text-vert-anchor-and-anchorctr.diff has been commented
+# out. --tml
+# oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
 
 [ CalcFixes ]
 # Support PHONETIC function to display asian phonetic guide.