sc/inc/column.hxx | 4 ++-- sc/source/core/data/column3.cxx | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 9ffb35db571f1d91bde2c8df79fbc11ddeea6497 Author: Kohei Yoshida <kohei.yosh...@collabora.com> Date: Tue Nov 18 10:26:27 2014 -0500 Rename Activate... -> Attach... Attach is the new one we are going with & offers nice contrast with 'Detach...'. Change-Id: I4578f4c7b9d989e41d433d7c8aa96a9317aa6919 diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 1e9c7d7..b276533 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -626,8 +626,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 a58cd07..86ca776 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 ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits