diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-05-03 15:05:51 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-05-09 13:34:31 -0400 |
commit | 59f38babd074cc0b835a5d2a1c81af013dba0deb (patch) | |
tree | 6a9fd62c6b8eabe939845e85f3dd5942963cc51b /sc/source/core/data/cell.cxx | |
parent | ff4731fb89f3b9d394c3826ab8dbe9d77df90a5a (diff) |
Remove broadcaster from ScBaseCell, remove ScNoteCell and CELLTYPE_NOTE...
and Calc is now officially broken. Let's start fixing this bit by bit...
Change-Id: I383c88245fe1e573666da636c6a8ca8815352ce7
Diffstat (limited to 'sc/source/core/data/cell.cxx')
-rw-r--r-- | sc/source/core/data/cell.cxx | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 0bde4bf2080b..b5c8d33cff8e 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -29,26 +29,22 @@ #ifdef USE_MEMPOOL IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell ) IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell ) -IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell ) #endif // ============================================================================ ScBaseCell::ScBaseCell( CellType eNewType ) : - mpBroadcaster( 0 ), eCellType( sal::static_int_cast<sal_uInt8>(eNewType) ) { } ScBaseCell::ScBaseCell( const ScBaseCell& rCell ) : - mpBroadcaster( 0 ), eCellType( rCell.eCellType ) { } ScBaseCell::~ScBaseCell() { - delete mpBroadcaster; OSL_ENSURE( eCellType == CELLTYPE_DESTROYED, "BaseCell Destructor" ); } @@ -66,8 +62,6 @@ ScBaseCell* lclCloneCell( const ScBaseCell& rSrcCell, ScDocument& rDestDoc, cons return new ScEditCell(static_cast<const ScEditCell&>(rSrcCell), rDestDoc, rDestPos); case CELLTYPE_FORMULA: return new ScFormulaCell( static_cast< const ScFormulaCell& >( rSrcCell ), rDestDoc, rDestPos, nCloneFlags ); - case CELLTYPE_NOTE: - return new ScNoteCell; default:; } OSL_FAIL( "lclCloneCell - unknown cell type" ); @@ -106,9 +100,6 @@ void ScBaseCell::Delete() case CELLTYPE_FORMULA: delete (ScFormulaCell*) this; break; - case CELLTYPE_NOTE: - delete (ScNoteCell*) this; - break; default: OSL_FAIL("Attempt to Delete() an unknown CELLTYPE"); break; @@ -117,36 +108,13 @@ void ScBaseCell::Delete() bool ScBaseCell::IsBlank() const { - if(eCellType == CELLTYPE_NOTE) - return true; - return false; } -void ScBaseCell::TakeBroadcaster( SvtBroadcaster* pBroadcaster ) -{ - delete mpBroadcaster; - mpBroadcaster = pBroadcaster; -} - -SvtBroadcaster* ScBaseCell::ReleaseBroadcaster() -{ - SvtBroadcaster* pBroadcaster = mpBroadcaster; - mpBroadcaster = 0; - return pBroadcaster; -} - -void ScBaseCell::DeleteBroadcaster() -{ - DELETEZ( mpBroadcaster ); -} - bool ScBaseCell::HasEmptyData() const { switch ( eCellType ) { - case CELLTYPE_NOTE : - return true; case CELLTYPE_FORMULA : return ((ScFormulaCell*)this)->IsEmpty(); default: @@ -201,21 +169,6 @@ OUString ScBaseCell::GetStringData() const return aStr; } -ScNoteCell::ScNoteCell( SvtBroadcaster* pBC ) : - ScBaseCell( CELLTYPE_NOTE ) -{ - TakeBroadcaster( pBC ); -} - -#if OSL_DEBUG_LEVEL > 0 -ScNoteCell::~ScNoteCell() -{ - eCellType = CELLTYPE_DESTROYED; -} -#endif - -// ============================================================================ - ScValueCell::ScValueCell( double fValue ) : ScBaseCell( CELLTYPE_VALUE ), mfValue( fValue ) |