[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit 58361d6edf258d1aaae4f065c75412da7ec86a94
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 13:12:37 2009 +0300

    Bypass two more patches
    
    * patches/dev300/apply: Bypass calc-perf-table-hidden-flags.diff and
      calc-perf-copy-table-flags.diff for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7038754..51d560b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3154,7 +3154,9 @@ calc-row-limit-bad-ushort.diff, n#509768, kohei
 # calc-perf-page-and-manual-breaks.diff, n#503482, kohei
 
 # refactor to store hidden and filtered flags in flat_segment_tree structure.
-calc-perf-table-hidden-flags.diff, n#495140, kohei
+# FIXME: 2009-08-21: Partly patches files created by diffs commented
+# out above. --tml
+# calc-perf-table-hidden-flags.diff, n#495140, kohei
 
 # type cast to SCROW and SCCOL for row and column, not to USHORT!
 calc-ods-export-no-more-ushort.diff, n#501029, kohei
@@ -3166,7 +3168,11 @@ calc-perf-sort.diff, n#504827, kohei
 calc-perf-lazy-overlay-objects.diff, n#511006, kohei
 
 # Better algorithm for row flag copying.
-calc-perf-copy-table-flags.diff, n#514156, kohei
+
+# FIXME: 2009-08-21: Doesn't apply, presumably because some earlier
+# patch has been commented out, might apply once they are used
+# again. --tml
+# calc-perf-copy-table-flags.diff, n#514156, kohei
 
 # don't show progress bar during row height adjustment if the row count is 
 # less than 1000.