[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/source

[Kohei Yoshida]

 sc/source/core/data/documentimport.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cb217e201eb5fb8f2ce48dae4a033f0af4b56495
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Nov 17 21:37:48 2014 -0500

    Regroup formula cells in columns before initializing them.
    
    Because the initialization of area listeners now depend on the grouped
    status of formula cells.
    
    Change-Id: Idf61f57387ba62c57d87030c16544bc07836826f

diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index 02242cb..48878f5 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -604,10 +604,12 @@ void ScDocumentImport::finalize()
 
 void ScDocumentImport::initColumn(ScColumn& rCol)
 {
+    rCol.RegroupFormulaCells();
+
     CellStoreInitializer aFunc(*mpImpl, rCol.nTab, rCol.nCol);
     std::for_each(rCol.maCells.begin(), rCol.maCells.end(), aFunc);
     aFunc.swap(rCol.maCellTextAttrs);
-    rCol.RegroupFormulaCells();
+
     rCol.CellStorageModified();
 }