summaryrefslogtreecommitdiff
path: root/sc/source/core/data/documentimport.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-05-09 20:36:49 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-05-20 20:13:04 -0400
commit0fb3bfcae4da8e6e056a05ec0ec351cc908c7192 (patch)
tree101060d1124656f1b8820035c87a54f97b036937 /sc/source/core/data/documentimport.cxx
parentc9bfa396e32b07d88eec742232636a517032b108 (diff)
Consolidate the text width and script type arrays into one.
Since they are always in sync... Change-Id: Ic07f57e1804d76ae801c7947d18df5fd0d729632
Diffstat (limited to 'sc/source/core/data/documentimport.cxx')
-rw-r--r--sc/source/core/data/documentimport.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index bb638af52dcb..0b68fedf71c7 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -109,14 +109,10 @@ void ScDocumentImport::finalize()
// Column has no cells. Skip it.
continue;
- ScColumn::TextWidthType::iterator itWidthPos = rCol.maTextWidths.begin();
- ScColumn::ScriptType::iterator itScriptPos = rCol.maScriptTypes.begin();
+ ScColumn::CTAttrStoreType::iterator itCTAPos = rCol.maCellTextAttrs.begin();
std::vector<ColEntry>::iterator itCell = rCol.maItems.begin(), itCellEnd = rCol.maItems.end();
for (; itCell != itCellEnd; ++itCell)
- {
- itWidthPos = rCol.maTextWidths.set<unsigned short>(itWidthPos, itCell->nRow, TEXTWIDTH_DIRTY);
- itScriptPos = rCol.maScriptTypes.set<unsigned char>(itScriptPos, itCell->nRow, SC_SCRIPTTYPE_UNKNOWN);
- }
+ itCTAPos = rCol.maCellTextAttrs.set<sc::CellTextAttr>(itCTAPos, itCell->nRow, sc::CellTextAttr());
}
}
}