diff options
Diffstat (limited to 'sc/source/core/data')
-rw-r--r-- | sc/source/core/data/column.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/data/column4.cxx | 25 | ||||
-rw-r--r-- | sc/source/core/data/compressedarray.cxx | 19 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 20 | ||||
-rw-r--r-- | sc/source/core/data/table2.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/data/table7.cxx | 8 |
6 files changed, 0 insertions, 92 deletions
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0a5a68e24a1d..f4e00c6614c6 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -811,18 +811,6 @@ ScRefCellValue ScColumn::GetCellValue( const sc::CellStoreType::const_iterator& return aVal; } -const sc::CellTextAttr* ScColumn::GetCellTextAttr( SCROW nRow ) const -{ - sc::CellTextAttrStoreType::const_position_type aPos = maCellTextAttrs.position(nRow); - if (aPos.first == maCellTextAttrs.end()) - return NULL; - - if (aPos.first->type != sc::element_type_celltextattr) - return NULL; - - return &sc::celltextattr_block::at(*aPos.first->data, aPos.second); -} - const sc::CellTextAttr* ScColumn::GetCellTextAttr( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow ) const { sc::CellTextAttrStoreType::const_position_type aPos = maCellTextAttrs.position(rBlockPos.miCellTextAttrPos, nRow); diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index cf9cd1e2f00a..c5465c640a85 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -293,31 +293,6 @@ void ScColumn::TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rD BroadcastCells(aRows, SC_HINT_DATACHANGED); } -void ScColumn::TransferCellValuesFrom( SCROW nRow, sc::CellValues& rSrc ) -{ - if (!ValidRow(nRow)) - return; - - SCROW nLastRow = nRow + rSrc.size() - 1; - if (nLastRow > MAXROW) - // Out of bound. Do nothing - return; - - sc::CellStoreType::position_type aPos = maCells.position(nRow); - DetachFormulaCells(aPos, rSrc.size()); - - rSrc.transferTo(*this, nRow); - - CellStorageModified(); - - std::vector<SCROW> aRows; - aRows.reserve(rSrc.size()); - for (SCROW i = nRow; i <= nLastRow; ++i) - aRows.push_back(i); - - BroadcastCells(aRows, SC_HINT_DATACHANGED); -} - void ScColumn::CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc ) { if (!ValidRow(nRow)) diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index 6d4ffd3a522a..a14cd9d2bec9 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -401,25 +401,6 @@ void ScBitMaskCompressedArray<A,D>::CopyFromAnded( } template< typename A, typename D > -A ScBitMaskCompressedArray<A,D>::GetFirstForCondition( A nStart, A nEnd, - const D& rBitMask, const D& rMaskedCompare ) const -{ - size_t nIndex = this->Search( nStart); - do - { - if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) - { - A nFound = nIndex > 0 ? this->pData[nIndex-1].nEnd + 1 : 0; - return ::std::max( nFound, nStart); - } - if (this->pData[nIndex].nEnd >= nEnd) - break; // while - ++nIndex; - } while (nIndex < this->nCount); - return ::std::numeric_limits<A>::max(); -} - -template< typename A, typename D > A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( A nStart, const D& rBitMask ) const { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index bac82bd63cc9..57c82d0f7dbd 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4064,26 +4064,6 @@ sal_uInt8 ScDocument::GetRowFlags( SCROW nRow, SCTAB nTab ) const return 0; } -const ScBitMaskCompressedArray< SCROW, sal_uInt8> & ScDocument::GetRowFlagsArray( - SCTAB nTab ) const -{ - const ScBitMaskCompressedArray< SCROW, sal_uInt8> * pFlags; - if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) - pFlags = maTabs[nTab]->GetRowFlagsArray(); - else - { - OSL_FAIL("wrong sheet number"); - pFlags = 0; - } - if (!pFlags) - { - OSL_FAIL("no row flags at sheet"); - static ScBitMaskCompressedArray< SCROW, sal_uInt8> aDummy( MAXROW, 0); - pFlags = &aDummy; - } - return *pFlags; -} - void ScDocument::GetAllRowBreaks(set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 738d5e19fee6..900c29bf1ce0 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1609,14 +1609,6 @@ ScRefCellValue ScTable::GetCellValue( SCCOL nCol, SCROW nRow ) const return aCol[nCol].GetCellValue(nRow); } -const sc::CellTextAttr* ScTable::GetCellTextAttr( SCCOL nCol, SCROW nRow ) const -{ - if (!ValidColRow(nCol, nRow)) - return NULL; - - return aCol[nCol].GetCellTextAttr(nRow); -} - void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const { rCol = 0; diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx index 59d2b366550a..845c720b2147 100644 --- a/sc/source/core/data/table7.cxx +++ b/sc/source/core/data/table7.cxx @@ -73,14 +73,6 @@ void ScTable::TransferCellValuesTo( SCCOL nCol, SCROW nRow, size_t nLen, sc::Cel aCol[nCol].TransferCellValuesTo(nRow, nLen, rDest); } -void ScTable::TransferCellValuesFrom( SCCOL nCol, SCROW nRow, sc::CellValues& rSrc ) -{ - if (!ValidCol(nCol)) - return; - - aCol[nCol].TransferCellValuesFrom(nRow, rSrc); -} - void ScTable::CopyCellValuesFrom( SCCOL nCol, SCROW nRow, const sc::CellValues& rSrc ) { if (!ValidCol(nCol)) |