diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-18 10:26:27 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-18 10:27:54 -0500 |
| commit | 9ffb35db571f1d91bde2c8df79fbc11ddeea6497 (patch) | |
| tree | 60085bf244dae6aa99fa7273994a04915403d50a /sc/source/core/data/column3.cxx | |
| parent | f542ad9f3022dae7439856dadb0130d66f51929a (diff) | |
Rename Activate... -> Attach...
Attach is the new one we are going with & offers nice contrast with
'Detach...'.
Change-Id: I4578f4c7b9d989e41d433d7c8aa96a9317aa6919
Diffstat (limited to 'sc/source/core/data/column3.cxx')
| -rw-r--r-- | sc/source/core/data/column3.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index a58cd074f31d..86ca77650bef 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -374,13 +374,13 @@ sc::CellStoreType::iterator ScColumn::GetPositionToInsert( const sc::CellStoreTy return itRet; } -void ScColumn::ActivateNewFormulaCell( +void ScColumn::AttachNewFormulaCell( const sc::CellStoreType::iterator& itPos, SCROW nRow, ScFormulaCell& rCell, bool bJoin ) { - ActivateNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin); + AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin); } -void ScColumn::ActivateNewFormulaCell( +void ScColumn::AttachNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, bool bJoin ) { if (bJoin) @@ -1817,7 +1817,7 @@ void ScColumn::SetFormula( SCROW nRow, const ScTokenArray& rArray, formula::Form CellStorageModified(); - ActivateNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell); } void ScColumn::SetFormula( SCROW nRow, const OUString& rFormula, formula::FormulaGrammar::Grammar eGram ) @@ -1834,7 +1834,7 @@ void ScColumn::SetFormula( SCROW nRow, const OUString& rFormula, formula::Formul CellStorageModified(); - ActivateNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell); } ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell ) @@ -1848,7 +1848,7 @@ ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell ) CellStorageModified(); - ActivateNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell); return pCell; } @@ -1864,7 +1864,7 @@ ScFormulaCell* ScColumn::SetFormulaCell( sc::ColumnBlockPosition& rBlockPos, SCR CellStorageModified(); - ActivateNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell); + AttachNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell); return pCell; } @@ -2324,7 +2324,7 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError) CellStorageModified(); - ActivateNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell); } void ScColumn::SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast ) |