diff options
author | Daniel Bankston <daniel.e.bankston@gmail.com> | 2012-05-10 15:10:01 -0500 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-15 11:28:07 +0200 |
commit | 5057c65fed7e55982de5bda9626fe863b7316c64 (patch) | |
tree | 764458cef5f56df6e5958eb0ae8b5b688e1d9100 /sc | |
parent | Remove extra XCell call and pass cell value directly to ScDocument. (diff) | |
download | core-5057c65fed7e55982de5bda9626fe863b7316c64.tar.gz core-5057c65fed7e55982de5bda9626fe863b7316c64.zip |
Remove getCellBlock() code that always returns null.
- Removed CellBlockBuffer::getCellBlock() method that always returns null as per my IRC convo yesterday with Kohei.
Change-Id: If57429c8cf48d309a610c703d97b53406653a767
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/inc/sheetdatabuffer.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/oox/sheetdatabuffer.cxx | 27 |
2 files changed, 4 insertions, 27 deletions
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 65612bc3f32b..c8dc45103596 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -152,10 +152,6 @@ public: /** Sets column span information for a row. */ void setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpans ); - /** Tries to find a cell block. Recalculates the map of cell blocks, if the - passed cell address is located in another row than the last cell. */ - CellBlock* getCellBlock( const ::com::sun::star::table::CellAddress& rCellAddr ); - /** Inserts all cells of all open cell blocks into the Calc document. */ void finalizeImport(); diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 245b1674f34b..6d4e305dcf25 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -211,13 +211,6 @@ void CellBlockBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpan maColSpans[ nRow ] = rColSpans.getRanges(); } -CellBlock* CellBlockBuffer::getCellBlock( const CellAddress& rCellAddr ) -{ - (void) rCellAddr; - // TODO: Fix this. - return NULL; -} - void CellBlockBuffer::finalizeImport() { maCellBlocks.forEachMem( &CellBlock::finalizeImport ); @@ -244,19 +237,13 @@ void SheetDataBuffer::setBlankCell( const CellModel& rModel ) void SheetDataBuffer::setValueCell( const CellModel& rModel, double fValue ) { - if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rModel.maCellAddr ) ) - pCellBlock->getCellAny( rModel.maCellAddr.Column ) <<= fValue; - else - putValue( rModel.maCellAddr, fValue ); + putValue( rModel.maCellAddr, fValue ); setCellFormat( rModel ); } void SheetDataBuffer::setStringCell( const CellModel& rModel, const OUString& rText ) { - if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rModel.maCellAddr ) ) - pCellBlock->getCellAny( rModel.maCellAddr.Column ) <<= rText; - else - putString( rModel.maCellAddr, rText ); + putString( rModel.maCellAddr, rText ); setCellFormat( rModel ); } @@ -271,10 +258,7 @@ void SheetDataBuffer::setStringCell( const CellModel& rModel, const RichStringRe } else { - if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rModel.maCellAddr ) ) - pCellBlock->insertRichString( rModel.maCellAddr, rxString, pFirstPortionFont ); - else - putRichString( rModel.maCellAddr, *rxString, pFirstPortionFont ); + putRichString( rModel.maCellAddr, *rxString, pFirstPortionFont ); setCellFormat( rModel ); } } @@ -574,10 +558,7 @@ void SheetDataBuffer::setCellFormula( const CellAddress& rCellAddr, const ApiTok { if( rTokens.hasElements() ) { - if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rCellAddr ) ) - pCellBlock->getCellAny( rCellAddr.Column ) <<= rTokens; - else - putFormulaTokens( rCellAddr, rTokens ); + putFormulaTokens( rCellAddr, rTokens ); } } |