INTEGRATION: CWS pflin11 (1.3.104); FILE MERGED

2008/08/06 01:52:42 pflin 1.3.104.1: fix for i90022

1 files changed, 6 insertions, 2 deletions

diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 150460428d34..4d89dd333979 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: dpcachetable.hxx,v $
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -198,7 +198,7 @@ public:
 
     /** Set filter on/off flag to each row to control visibility.  The caller
         must ensure that the table is filled before calling this function. */
-    void filterByPageDimension(const ::std::vector<ScDPDimension*>& rPageDims);
+    void filterByPageDimension(const ::std::vector<Criterion>& rCriteria, bool bRepeatIfEmpty = false);
 
     /** Get the cell instance at specified location within the data grid. Note
         that the data grid doesn't include the header row.  Don't delete the
@@ -229,6 +229,10 @@ public:
     bool empty() const;
 
 private:
+    /**
+     * Check if a given row meets all specified criteria.
+     */
+    bool isRowQualified(sal_Int32 nRow, const ::std::vector<Criterion>& rCriteria, bool bRepeatIfEmpty) const;
     void getValueData(ScDocument* pDoc, const ScAddress& rPos, Cell& rCell);
     ScDPCacheTable::Cell getSelectedDimension(ScDPDimension* pDim) const;