[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                |   10 ++++++++--
 patches/dev300/calc-dirty-cells-after-load-fix.diff |    6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 43203e8866ce0eccf696708dddda024e11516243
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 20 19:53:17 2009 +0300

    Bypass one more patch
    
    * patches/dev300/apply: Bypass calc-xls-import-array-size.diff.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 588de66..1123886 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3114,7 +3114,10 @@ calc-external-ref-modify-link-modified.diff, i#103598, kohei
 calc-xls-hyperlink-single-quote-fix.diff, n#521447, kohei
 
 # determine in-line array sizes more reliably.
-calc-xls-import-array-size.diff, kohei
+
+# FIXME: 2009-08-20: Patches files created by diffs commented out
+# above. --tml
+# calc-xls-import-array-size.diff, kohei
 
 # draw an animated dashed border around copied ranges.
 calc-copy-range-animated-border-sc.diff, kohei
commit 830c1e17342f9fa21758ae8225c21cd853113edb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 20 19:51:30 2009 +0300

    Bypass more patches
    
    * patches/dev300/apply: Bypass calc-dirty-cells-after-load-fix.diff
      for now.
    * patches/dev300/calc-dirty-cells-after-load-fix.diff: Partly adapt to
      dev300-m54.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7a61abc..588de66 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3102,7 +3102,10 @@ cws-ooxml03-enable-docx.diff
 
 # register chart listener per chart object when for xls import & don't modify
 # cell's dirty flag upon loading.
-calc-dirty-cells-after-load-fix.diff, n#491898, kohei
+
+# FIXME: 2009-08-20: Depends on xlsx-filter-as-a-separate-lib.diff
+# which is commented out. --tml
+# calc-dirty-cells-after-load-fix.diff, n#491898, kohei
 
 # set document modified when switching external link source.
 calc-external-ref-modify-link-modified.diff, i#103598, kohei
diff --git a/patches/dev300/calc-dirty-cells-after-load-fix.diff b/patches/dev300/calc-dirty-cells-after-load-fix.diff
index 4a2e9a3..8ca440b 100644
--- a/patches/dev300/calc-dirty-cells-after-load-fix.diff
+++ b/patches/dev300/calc-dirty-cells-after-load-fix.diff
@@ -64,9 +64,9 @@ index 77d9eae..6d393e5 100644
  #include "compiler.hxx"
 +#include "reftokenhelper.hxx"
 +#include "chartlis.hxx"
- 
- using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
+ #include "fprogressbar.hxx"
+ #include "xltracer.hxx"
+ #include "xistream.hxx"
 @@ -119,6 +122,8 @@ using ::com::sun::star::chart2::data::XDataSequence;
  using ::formula::FormulaToken;
  using ::formula::StackVar;