INTEGRATION: CWS koheidatapilot01 (1.4.570); FILE MERGED

2008/04/25 20:59:25 kohei 1.4.570.6: RESYNC: (1.4-1.5); FILE MERGED
2008/04/24 23:26:38 kohei 1.4.570.5: * fixed a regression on page field filtering by the empty string value.
* fixed an incorrect drill-down table with number groups (i88531).
* moved the shared string storage out of ScDPCacheTable to make it more generic.
2008/04/17 13:10:39 kohei 1.4.570.4: Used ScDPItemData to store cell values to allow numerical comparison where appropriate.  Also fixed the regression involving drill-down on group names.
2008/04/15 15:32:05 kohei 1.4.570.3: get the "Identify categories" option to really work.  The previous commit didn't quite do the right thing.
2007/12/06 07:06:15 kohei 1.4.570.2: removed all previously invisible code.
2007/10/29 17:44:39 kohei 1.4.570.1: initial checkin

1 files changed, 17 insertions, 4 deletions

diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 65040dc1000f..ef2ae70878d5 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dpshttab.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,6 +35,14 @@
 #include "global.hxx"
 #include "address.hxx"
 
+#include <vector>
+
+namespace com { namespace sun { namespace star { namespace sheet {
+    struct DataPilotFieldFilter;
+}}}}
+
+class ScDPDimension;
+class ScDPItemData;
 
 // --------------------------------------------------------------------
 //
@@ -57,7 +65,6 @@ class ScSheetDPData : public ScDPTableData
 {
 private:
     ScSheetDPData_Impl* pImpl;
-    BOOL* pSpecial;
 
 public:
                     ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc );
@@ -72,8 +79,14 @@ public:
     virtual void                    DisposeData();
     virtual void                    SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );
 
-    virtual void                    ResetIterator();
-    virtual BOOL                    GetNextRow( const ScDPTableIteratorParam& rParam );
+    virtual bool                    IsRepeatIfEmpty();
+
+    virtual void                    CreateCacheTable();
+    virtual void                    FilterCacheTable(const ::std::vector<ScDPDimension*>& rPageDims);
+    virtual void                    GetDrillDownData(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria,
+                                                     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData);
+    virtual void                    CalcResults(CalcInfo& rInfo, bool bAutoShow);
+    virtual const ScDPCacheTable&   GetCacheTable() const;
 };