[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                  |    3 ++
 patches/dev300/calc-perf-import-xls-extref-cache.diff |   22 ++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 258125484f65458528d3598f1a53a815ed56df7c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Sep 28 16:45:44 2010 -0400

    Fix poor performance on external ref cache from Excel documents.
    
    * patches/dev300/apply:
    * patches/dev300/calc-perf-import-xls-extref-cache.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f1b2b37..cacb7ed 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3917,6 +3917,9 @@ dde-reconnect-on-load-sfx2.diff, n#618846, n#618864, kohei
 # Properly display data field names in the data field options dialog.
 calc-dp-sort-fix.diff, n#629920, kohei
 
+# Fix poor performance in importing external ref cache from xls.
+calc-perf-import-xls-extref-cache.diff, kohei
+
 [ GentooExperimental ]
 SectionOwner => hmth
 # jemalloc, FreeBSD 7 allocator
diff --git a/patches/dev300/calc-perf-import-xls-extref-cache.diff b/patches/dev300/calc-perf-import-xls-extref-cache.diff
new file mode 100644
index 0000000..9a12600
--- /dev/null
+++ b/patches/dev300/calc-perf-import-xls-extref-cache.diff
@@ -0,0 +1,22 @@
+diff --git sc/source/filter/excel/xilink.cxx sc/source/filter/excel/xilink.cxx
+index 9f730b2..76204a6 100644
+--- sc/source/filter/excel/xilink.cxx
++++ sc/source/filter/excel/xilink.cxx
+@@ -418,7 +418,7 @@ void XclImpSupbookTab::LoadCachedValues(ScExternalRefCache::TableTypeRef pCacheT
+             {
+                 double f = p->GetValue();
+                 ScExternalRefCache::TokenRef pToken(new formula::FormulaDoubleToken(f));
+-                pCacheTable->setCell(rAddr.mnCol, rAddr.mnRow, pToken);
++                pCacheTable->setCell(rAddr.mnCol, rAddr.mnRow, pToken, 0, false);
+             }
+             break;
+             case EXC_CACHEDVAL_EMPTY:
+@@ -429,7 +429,7 @@ void XclImpSupbookTab::LoadCachedValues(ScExternalRefCache::TableTypeRef pCacheT
+             {
+                 const String& rStr = p->GetString();
+                 ScExternalRefCache::TokenRef pToken(new formula::FormulaStringToken(rStr));
+-                pCacheTable->setCell(rAddr.mnCol, rAddr.mnRow, pToken);
++                pCacheTable->setCell(rAddr.mnCol, rAddr.mnRow, pToken, 0, false);
+             }
+             break;
+             default: