[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 61ee24292b998de45e7f82c94ef482cf3d79e670
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 11:37:03 2009 +0300

    Bypass oox-fix-slide-background-gradients.diff for now
    
    * patches/dev300/apply: Bypass oox-fix-slide-background-gradients.diff
      for now. Does not apply in dev300-m54 with easy changes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 592e22e..4288b6b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1850,7 +1850,11 @@ oox-custom-shape-polygons.diff, n#485418, rodo
 # oox-import-comments-fix-add-annotation.diff, n#480876, janneke
 
 oox-import-sheet-protect.diff, n#481317, janneke
-oox-fix-slide-background-gradients.diff, n#383555, rodo
+
+# FIXME: 2009-08-12: Does not apply. Upstream code has been
+# significantly restructured. --tml
+# 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
 oox-pptx-import-fix-layout.diff, n#480223, rodo