[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-perf-import-dbf-sc.diff   |    8 ++++++++
 patches/dev300/xlsx-export-row-limit-fix.diff |   12 ------------
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 661fe59d2c47f13c2c5006d7fd2a62960549018b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sat Dec 12 17:35:37 2009 -0500

    Moved a hunk from one pather to another.
    
    dociter.obj needs to be added to EXCEPTIONSFILES list because of
    the change introduced by the dbf perf work, so that hunk belongs
    to that patch, not to the xlsx export patch.
    
    * patches/dev300/calc-perf-import-dbf-sc.diff:
    * patches/dev300/xlsx-export-row-limit-fix.diff:

diff --git a/patches/dev300/calc-perf-import-dbf-sc.diff b/patches/dev300/calc-perf-import-dbf-sc.diff
index c03c21d..1850664 100644
--- a/patches/dev300/calc-perf-import-dbf-sc.diff
+++ b/patches/dev300/calc-perf-import-dbf-sc.diff
@@ -613,6 +613,14 @@ index 5893136..5a08a9b 100644
          $(SLO)$/dpcachetable.obj \
          $(SLO)$/dpdimsave.obj \
          $(SLO)$/dpgroup.obj \
+@@ -124,6 +124,7 @@ EXCEPTIONSFILES= \
+     $(SLO)$/clipparam.obj \
+     $(SLO)$/column.obj \
+     $(SLO)$/column3.obj \
++    $(SLO)$/dociter.obj \
+     $(SLO)$/documen2.obj \
+     $(SLO)$/document.obj \
+     $(SLO)$/dpdimsave.obj \
 diff --git sc/source/core/data/segmenttree.cxx sc/source/core/data/segmenttree.cxx
 index 98c5032..b86aca8 100644
 --- sc/source/core/data/segmenttree.cxx
diff --git a/patches/dev300/xlsx-export-row-limit-fix.diff b/patches/dev300/xlsx-export-row-limit-fix.diff
index 53306ac..4d87b97 100644
--- a/patches/dev300/xlsx-export-row-limit-fix.diff
+++ b/patches/dev300/xlsx-export-row-limit-fix.diff
@@ -1,15 +1,3 @@
-diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index 5a08a9b..2342a88 100644
---- sc/source/core/data/makefile.mk
-+++ sc/source/core/data/makefile.mk
-@@ -124,6 +124,7 @@ EXCEPTIONSFILES= \
-     $(SLO)$/clipparam.obj \
-     $(SLO)$/column.obj \
-     $(SLO)$/column3.obj \
-+    $(SLO)$/dociter.obj \
-     $(SLO)$/documen2.obj \
-     $(SLO)$/document.obj \
-     $(SLO)$/dpdimsave.obj \
 diff --git sc/source/filter/inc/xlconst.hxx sc/source/filter/inc/xlconst.hxx
 index eeb3fb3..2a176a9 100644
 --- sc/source/filter/inc/xlconst.hxx