[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5e442c9047dea8953f14cb83dd7f9eb32e0dd1f9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 16:01:03 2009 +0300

    Bypass two more patches

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 274a9b5..198c7bc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1832,7 +1832,9 @@ buildfix-oox-depends-on-unotools.diff
 
 oox-fix-placeholder-layout.diff, n#485316, n#480223, rodo
 oox-fix-list-style-apply.diff, n#485417, rodo
-oox-import-chart-externalref.diff, n#480868, janneke
+
+# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
+# oox-import-chart-externalref.diff, n#480868, janneke
 
 # FIXME: 2009-08-12: The patch to tablefragment.cxx doesn't apply and
 # it isn't trivial to make it apply. I am unsure whether the expected
@@ -1855,7 +1857,8 @@ oox-import-chart-externalref.diff, n#480868, janneke
 # (with some stylistic differences)? --tml
 # oox-import-comments-fix-add-annotation.diff, n#480876, janneke
 
-oox-import-sheet-protect.diff, n#481317, janneke
+# FIXME_ 2009-09-02: Applies but causes compilation errors. --tml
+# oox-import-sheet-protect.diff, n#481317, janneke
 
 # FIXME: 2009-08-12: Does not apply. Upstream code has been
 # significantly restructured. --tml