diff options
Diffstat (limited to 'sc/source/core/data/dpcachetable.cxx')
| -rw-r--r-- | sc/source/core/data/dpcachetable.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx index b371a30b7542..a87bd803e596 100644 --- a/sc/source/core/data/dpcachetable.cxx +++ b/sc/source/core/data/dpcachetable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ bool ScDPCacheTable::FilterItem::match( const ScDPItemData& rCellData ) const } // ---------------------------------------------------------------------------- -ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue) +ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue) { maItem.maString = aString; maItem.mfValue = fValue; @@ -118,7 +118,7 @@ bool ScDPCacheTable::SingleFilter::hasValue() const // ---------------------------------------------------------------------------- -ScDPCacheTable::GroupFilter::GroupFilter() +ScDPCacheTable::GroupFilter::GroupFilter() { } @@ -158,8 +158,8 @@ ScDPCacheTable::Criterion::Criterion() : // ---------------------------------------------------------------------------- -ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) : - mpCache( NULL ), +ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) : + mpCache( NULL ), mpNoneCache( NULL ) { if ( nId >= 0 ) @@ -190,7 +190,7 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, if ( mpCache == NULL ) InitNoneCache( NULL ); //check cache - const SCROW nRowCount = getRowSize(); + const SCROW nRowCount = getRowSize(); const SCCOL nColCount = (SCCOL) getColSize(); if ( nRowCount <= 0 || nColCount <= 0) return; @@ -202,7 +202,7 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, // Initialize field entries container. maFieldEntries.clear(); maFieldEntries.reserve(nColCount); - + // Data rows for (SCCOL nCol = 0; nCol < nColCount; ++nCol) { @@ -215,11 +215,11 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, { SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, bRepeatIfEmpty ); SCROW nOrder = GetCache()->GetOrder( nCol, nIndex ); - + if ( nCol == 0 ) maRowsVisible.push_back(false); - if ( lcl_HasQueryEntry(rQuery) && + if ( lcl_HasQueryEntry(rQuery) && !GetCache()->ValidQuery( nRow , rQuery, pSpecial ) ) continue; if ( bIgnoreEmptyRows && GetCache()->IsRowEmpty( nRow ) ) @@ -245,7 +245,7 @@ void ScDPCacheTable::fillTable() if ( mpCache == NULL ) InitNoneCache( NULL ); //check cache - const SCROW nRowCount = getRowSize(); + const SCROW nRowCount = getRowSize(); const SCCOL nColCount = (SCCOL) getColSize(); if ( nRowCount <= 0 || nColCount <= 0) return; @@ -257,7 +257,7 @@ void ScDPCacheTable::fillTable() // Initialize field entries container. maFieldEntries.clear(); maFieldEntries.reserve(nColCount); - + // Data rows for (SCCOL nCol = 0; nCol < nColCount; ++nCol) { @@ -270,7 +270,7 @@ void ScDPCacheTable::fillTable() { SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, false ); SCROW nOrder = GetCache()->GetOrder( nCol, nIndex ); - + if ( nCol == 0 ) maRowsVisible.push_back(true); @@ -311,7 +311,7 @@ void ScDPCacheTable::filterByPageDimension(const vector<Criterion>& rCriteria, c } const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const -{ +{ SCROW nId= GetCache()->GetItemDataId(nCol, nRow, bRepeatIfEmpty); return GetCache()->GetItemDataById( nCol, nId ); } @@ -319,7 +319,7 @@ const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeat void ScDPCacheTable::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const { const ScDPItemData* pData = getCell( nCol, nRow, bRepeatIfEmpty ); - + if (pData) { rVal.fValue = pData->IsValue() ? pData->GetValue() : 0.0; @@ -349,7 +349,7 @@ const ::std::vector<SCROW>& ScDPCacheTable::getFieldEntries( sal_Int32 nColumn return maFieldEntries[nColumn]; } -void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData, +void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData, const hash_set<sal_Int32>& rRepeatIfEmptyDims) { sal_Int32 nRowSize = getRowSize(); |