datapilotperf: manual migration of changes by Wang Xu Ming from svn to hg

1 files changed, 10 insertions, 30 deletions

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 2dc8829485c8..40f8e75676d5 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -110,8 +110,18 @@ private:
 
     SC_DLLPRIVATE void              CreateObjects();
     SC_DLLPRIVATE void              CreateOutput();
+    BOOL                    bRefresh;
+    long                        mnCacheId;
 
 public:
+    // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
+    inline void SetRefresh() { bRefresh = TRUE; }
+    const        ScDPTableDataCache* GetCache() const;
+    long          GetCacheId() const;
+    void          SetCacheId( long nCacheId );
+    ULONG RefreshCache();
+    // End Comments
                 ScDPObject( ScDocument* pD );
                 ScDPObject(const ScDPObject& r);
     virtual     ~ScDPObject();
@@ -237,19 +247,6 @@ public:
                             PivotField* pRefPageFields = NULL, SCSIZE nRefPageCount = 0 );
 };
 
-// ============================================================================
-
-struct ScDPCacheCell
-{
-    sal_Int32   mnStrId;
-    sal_uInt8   mnType;
-    double      mfValue;
-    bool        mbNumeric;
-
-    ScDPCacheCell();
-    ScDPCacheCell(const ScDPCacheCell& r);
-    ~ScDPCacheCell();
-};
 
 // ============================================================================
 
@@ -257,20 +254,6 @@ class ScDPCollection : public ScCollection
 {
 private:
     ScDocument* pDoc;
-    ScSimpleSharedString maSharedString;
-
-    struct CacheCellHash
-    {
-        size_t operator()(const ScDPCacheCell* pCell) const;
-    };
-    struct CacheCellEqual
-    {
-        bool operator()(const ScDPCacheCell* p1, const ScDPCacheCell* p2) const;
-    };
-    typedef ::std::hash_set<ScDPCacheCell*, CacheCellHash, CacheCellEqual> CacheCellPoolType;
-
-    CacheCellPoolType maCacheCellPool;
-
 public:
                 ScDPCollection(ScDocument* pDocument);
                 ScDPCollection(const ScDPCollection& r);
@@ -289,10 +272,7 @@ public:
 
     String      CreateNewName( USHORT nMin = 1 ) const;
 
-    ScSimpleSharedString& GetSharedString();
 
-    ScDPCacheCell* getCacheCellFromPool(const ScDPCacheCell& rCell);
-    void clearCacheCellPool();
 };