From 07b66cd3ac1a9f6c7b61a1d7da6e9d266e6de92d Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 31 Oct 2013 17:53:02 -0400 Subject: Insert matrix formula vis ScDocumentImport, and more formula imorts. Now SetGroupFormulaCell() is no longer used. Change-Id: I10a387da04724794974eaf491a8efa4cda09d82a --- sc/source/core/data/column3.cxx | 15 --------------- sc/source/core/data/documen2.cxx | 8 -------- sc/source/core/data/table2.cxx | 8 -------- 3 files changed, 31 deletions(-) (limited to 'sc/source/core/data') diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 991039c1e19b..ece9035d094e 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1769,21 +1769,6 @@ ScFormulaCell* ScColumn::SetFormulaCell( sc::ColumnBlockPosition& rBlockPos, SCR return pCell; } -bool ScColumn::SetGroupFormulaCell( SCROW nRow, ScFormulaCell* pCell ) -{ - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); - sal_uInt32 nCellFormat = GetNumberFormat(nRow); - if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0) - pCell->SetNeedNumberFormat(true); - it = maCells.set(it, nRow, pCell); - maCellTextAttrs.set(nRow, sc::CellTextAttr()); - - CellStorageModified(); - - ActivateNewFormulaCell(it, nRow, *pCell, false); - return true; -} - svl::SharedString ScColumn::GetSharedString( SCROW nRow ) const { sc::CellStoreType::const_position_type aPos = maCells.position(nRow); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 930c8d103ee9..1e0bb87c9a12 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1093,14 +1093,6 @@ ScFormulaCell* ScDocument::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* return maTabs[rPos.Tab()]->SetFormulaCell(rPos.Col(), rPos.Row(), pCell); } -bool ScDocument::SetGroupFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell ) -{ - if (!TableExists(rPos.Tab())) - return false; - - return maTabs[rPos.Tab()]->SetGroupFormulaCell(rPos.Col(), rPos.Row(), pCell); -} - void ScDocument::SetConsolidateDlgData( const ScConsolidateParam* pData ) { delete pConsolidateDlgData; diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5295af6c5e5c..c94d66a87c88 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1383,14 +1383,6 @@ ScFormulaCell* ScTable::SetFormulaCell( SCCOL nCol, SCROW nRow, ScFormulaCell* p return aCol[nCol].SetFormulaCell(nRow, pCell); } -bool ScTable::SetGroupFormulaCell( SCCOL nCol, SCROW nRow, ScFormulaCell* pCell ) -{ - if (!ValidColRow(nCol, nRow)) - return false; - - return aCol[nCol].SetGroupFormulaCell(nRow, pCell); -} - svl::SharedString ScTable::GetSharedString( SCCOL nCol, SCROW nRow ) const { if (!ValidColRow(nCol, nRow)) -- cgit v1.2.3