More removal of cache ID related stuff.

3 files changed, 6 insertions, 8 deletions

diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index a35b9ce9c3d2..5c2608e75edc 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -59,7 +59,7 @@ struct ScImportSourceDesc
                  nType   == rOther.nType &&
                  bNative == rOther.bNative; }
 
-    ScDPTableDataCache* CreateCache(  ScDocument* pDoc , long nID  ) const;
+    ScDPTableDataCache* CreateCache(ScDocument* pDoc) const;
 };
 
 class ScDatabaseDPData : public ScDPTableData
@@ -67,7 +67,7 @@ class ScDatabaseDPData : public ScDPTableData
 private:
      ScDPCacheTable      aCacheTable;
 public:
-                    ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport, long nCacheId = -1);
+                    ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport);
     virtual         ~ScDatabaseDPData();
 
     virtual long                    GetColumnCount();
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 601271e72e90..a9d9529adcb3 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -78,7 +78,7 @@ public:
     const ScQueryParam& GetQueryParam() const;
 
     bool operator== ( const ScSheetSourceDesc& rOther ) const;
-    ScDPTableDataCache* CreateCache(long nID = -1) const;
+    ScDPTableDataCache* CreateCache() const;
 
     /**
      * Check the sanity of the data source range.
@@ -113,7 +113,7 @@ private:
     ScDPCacheTable  aCacheTable;
 
 public:
-    ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc, long nCacheId = -1 );
+    ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc);
     virtual ~ScSheetDPData();
 
     virtual long                    GetColumnCount();
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 82672202a91b..5ab7768563bb 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -97,8 +97,7 @@ class SC_DLLPUBLIC ScDPTableData
     long    nLastHier;
     long    nLastLevel;
     long    nLastRet;
-    long                          mnCacheId;
-    const ScDocument*   mpDoc;
+    const ScDocument* mpDoc;
 public:
 
     /** This structure stores dimension information used when calculating
@@ -124,7 +123,7 @@ public:
         CalcInfo();
     };
 
-    ScDPTableData(ScDocument* pDoc, long nCacheId );
+    ScDPTableData(ScDocument* pDoc);
     virtual     ~ScDPTableData();
 
     long        GetDatePart( long nDateVal, long nHierarchy, long nLevel );
@@ -134,7 +133,6 @@ public:
 
     virtual long                    GetColumnCount() = 0;
     virtual   const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
-    long                                                     GetCacheId() const;
     virtual String                  getDimensionName(long nColumn) = 0;
     virtual BOOL                    getIsDataLayoutDimension(long nColumn) = 0;
     virtual BOOL                    IsDateDimension(long nDim) = 0;