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 11:49:28 -0500 |
| commit | 756d4765104dfab1a49dde07d5425774feda54ed (patch) | |
| tree | 93bda20b172dc29d3d58f51bf00ed773ae9d8149 /sc | |
| parent | d1ed0f696d0f8f6c1360086577c12161abb9d569 (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')
| -rw-r--r-- | sc/inc/column.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/column3.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index f268c5c516d3..440a95bfb497 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -628,8 +628,8 @@ private: sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow ); sc::CellStoreType::iterator GetPositionToInsert( const sc::CellStoreType::iterator& it, SCROW nRow ); - void ActivateNewFormulaCell( const sc::CellStoreType::iterator& itPos, SCROW nRow, ScFormulaCell& rCell, bool bJoin = true ); - void ActivateNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, bool bJoin = true ); + void AttachNewFormulaCell( const sc::CellStoreType::iterator& itPos, SCROW nRow, ScFormulaCell& rCell, bool bJoin = true ); + void AttachNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, bool bJoin = true ); void AttachNewFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength ); void BroadcastNewCell( SCROW nRow ); bool UpdateScriptType( sc::CellTextAttr& rAttr, SCROW nRow, const sc::CellStoreType::iterator& itr ); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 97af751d0b2f..ec0dd45a6622 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 ) |