CWS-TOOLING: integrate CWS datapilotperf

1 files changed, 24 insertions, 9 deletions

diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index a0e67371eff1..a8d80072c68a 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -41,8 +41,10 @@ namespace com { namespace sun { namespace star { namespace sheet {
 }}}}
 
 class ScDPDimension;
-struct ScDPItemData;
-
+// Wang Xu Ming -- 2009-8-17
+// DataPilot Migration - Cache&&Performance
+class ScDPItemData;
+// End Comments
 // --------------------------------------------------------------------
 //
 //  implementation of ScDPTableData with sheet data
@@ -56,25 +58,38 @@ struct ScSheetSourceDesc
     BOOL operator== ( const ScSheetSourceDesc& rOther ) const
         { return aSourceRange == rOther.aSourceRange &&
                  aQueryParam  == rOther.aQueryParam; }
+// Wang Xu Ming - DataPilot migration
+// Buffer&&Performance
+    ScDPTableDataCache* CreateCache( ScDocument* pDoc, long nID = -1) const;
+    ULONG CheckValidate( ScDocument* pDoc  ) const;
+    ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const;
+    ScDPTableDataCache*  GetExistDPObjectCache ( ScDocument* pDoc  ) const;
+    long    GetCacheId( ScDocument* pDoc, long nID ) const;
+
+// End Comments
 };
 
-class ScSheetDPData_Impl;
-
 class SC_DLLPUBLIC ScSheetDPData : public ScDPTableData
 {
 private:
-    ScSheetDPData_Impl* pImpl;
+    ScQueryParam    aQuery;
+    BOOL*                pSpecial;
+    BOOL            bIgnoreEmptyRows;
+    BOOL            bRepeatIfEmpty;
+
+       ScDPCacheTable  aCacheTable;
 
 public:
-                    ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc );
+    // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
+    ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc, long nCacheId = -1 );
     virtual         ~ScSheetDPData();
-
+    // End Comments
     virtual long                    GetColumnCount();
-    virtual const TypedScStrCollection& GetColumnEntries(long nColumn);
     virtual String                  getDimensionName(long nColumn);
     virtual BOOL                    getIsDataLayoutDimension(long nColumn);
     virtual BOOL                    IsDateDimension(long nDim);
-    virtual UINT32                  GetNumberFormat(long nDim);
+    virtual ULONG                   GetNumberFormat(long nDim);
     virtual void                    DisposeData();
     virtual void                    SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );