diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-20 14:43:53 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-22 21:49:17 -0400 |
| commit | 76c0e26b2d2906ca2199e4294d7433533c78f8e3 (patch) | |
| tree | 14464fd71fca02fe52facc61ad6b8c8878acc103 /sc/source/ui/undo | |
| parent | 8aac68741b17a1d161137b12c78d47c8b3e91c68 (diff) | |
Let's use ScTokenArray instead of ScFormulaCell.
Because we may move away from ScFormulaCell too.
Change-Id: Iafafe3c864efa73330fb8ecbb713caa903e23db5
Diffstat (limited to 'sc/source/ui/undo')
| -rw-r--r-- | sc/source/ui/undo/undocell.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 13319d8b04cf..e7fb68a6ef4b 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -502,7 +502,7 @@ ScUndoSetCell::Value::Value() : meType(CELLTYPE_NONE), mfValue(0.0) {} ScUndoSetCell::Value::Value( double fValue ) : meType(CELLTYPE_VALUE), mfValue(fValue) {} ScUndoSetCell::Value::Value( const OUString& rString ) : meType(CELLTYPE_STRING), mpString(new OUString(rString)) {} ScUndoSetCell::Value::Value( const EditTextObject& rEditText ) : meType(CELLTYPE_EDIT), mpEditText(rEditText.Clone()) {} -ScUndoSetCell::Value::Value( const ScFormulaCell& rFormula ) : meType(CELLTYPE_FORMULA), mpFormulaCell(rFormula.Clone()) {} +ScUndoSetCell::Value::Value( const ScTokenArray& rFormula ) : meType(CELLTYPE_FORMULA), mpFormula(rFormula.Clone()) {} ScUndoSetCell::Value::Value( const Value& r ) : meType(r.meType), mfValue(r.mfValue) { @@ -515,7 +515,7 @@ ScUndoSetCell::Value::Value( const Value& r ) : meType(r.meType), mfValue(r.mfVa mpEditText = r.mpEditText->Clone(); break; case CELLTYPE_FORMULA: - mpFormulaCell = r.mpFormulaCell->Clone(); + mpFormula = r.mpFormula->Clone(); default: ; } @@ -531,7 +531,7 @@ ScUndoSetCell::Value::~Value() case CELLTYPE_EDIT: delete mpEditText; case CELLTYPE_FORMULA: - mpFormulaCell->Delete(); + delete mpFormula; default: ; } @@ -594,7 +594,7 @@ void ScUndoSetCell::SetValue( const Value& rVal ) pDoc->SetEditText(maPos, rVal.mpEditText->Clone()); break; case CELLTYPE_FORMULA: - pDoc->SetFormula(maPos, *rVal.mpFormulaCell->GetCode()); + pDoc->SetFormula(maPos, *rVal.mpFormula); break; default: ; |