[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

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

New commits:
commit 51810d3294ac8eb0efaaceffc75f95891d75f0d9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 13 14:49:29 2011 +0300

    Bypass also oox-xlsx-import-fix-connector-shape.diff for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a2f3197..1386369 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1007,7 +1007,9 @@ buildfix-oox-depends-on-unotools.diff
 # FIXME: 2009-09-02: Applies but causes compilation errors. --tml
 # oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 
-oox-xlsx-import-fix-connector-shape.diff, n#549331, Fong
+# FIXME 2011-04-13: Depends on stuff introduced by oox-smartart-import.diff
+# which is bypassed for now.
+# oox-xlsx-import-fix-connector-shape.diff, n#549331, Fong
 
 # FIXME dev300-m83 oox-custom-shape-polygons.diff, n#485418, rodo
 
@@ -1572,7 +1574,9 @@ SectionOwner => cbosdo
 
 [ OOXML ]
 oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
-# FIXME 2011-04-07: thorsten is working on making this apply
+# FIXME 2011-04-07: thorsten is working on making this apply.
+# When that is ready and this is uncommented, please uncomment
+# oox-xlsx-import-fix-connector-shape.diff, too
 # oox-smartart-import.diff, thorsten
 
 [ NovellOnlyWin32 ]