[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit 965a58cf6d53fc05baf16967a9e4a61108e90824
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 12:31:15 2009 +0300

    Bypass two more patches

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 37eb863..449ade5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -653,7 +653,8 @@ sc-extra-cell-margins.diff, n#361358, jonp
 sc-excel-chart-default-xlabels.diff, n#257079, i#83679, kohei
 
 # Fix autoshape excel hyperlink import OOo ( depends on vba-sc-handleautoshapemacro-import.diff )
-vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
+# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
+# vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
 
 # Delete Rows/Delete Columns should remember the content so that the user is
 # able to paste it elsewhere (similar to Insert Cut Cells in Excel)
@@ -1846,7 +1847,8 @@ oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 # upstream. --tml
 # oox-fix-ole2.diff, n#485418, rodo
 
-oox-custom-shape-polygons.diff, n#485418, rodo
+# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
+# oox-custom-shape-polygons.diff, n#485418, rodo
 
 # FIXME: 2009-08-12: This stuff seems to be already in dev300-m54
 # (with some stylistic differences)? --tml