diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-02-28 21:36:18 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-02-28 21:36:18 -0500 |
commit | a259eba2f737c5ba12c880ecd1ed959ac3a116ed (patch) | |
tree | 12f8905aedbadad9c22de53e0414f2b8506372f0 | |
parent | e7db4c4fdc5d969f59ebee8a6b7848a9dc733c71 (diff) |
More removal of cache ID related stuff.
-rw-r--r-- | sc/inc/dpsdbtab.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dpshttab.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 6 | ||||
-rw-r--r-- | sc/source/core/data/dpgroup.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dpsdbtab.cxx | 10 | ||||
-rw-r--r-- | sc/source/core/data/dpshttab.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/data/dptabdat.cxx | 10 |
7 files changed, 17 insertions, 27 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; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 456422b46133..748cda3b5730 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -1009,7 +1009,7 @@ const std::vector<SCROW>& ScDPNumGroupDimension::GetNumEntries( } ScDPGroupTableData::ScDPGroupTableData( const shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument ) : - ScDPTableData(pDocument, pSource->GetCacheId() ), + ScDPTableData(pDocument), pSourceData( pSource ), pDoc( pDocument ) { diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index 46a6977cca04..717b381af987 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -75,7 +75,7 @@ using ::com::sun::star::uno::UNO_QUERY; #define SC_DBPROP_COMMAND "Command" #define SC_DBPROP_COMMANDTYPE "CommandType" -ScDPTableDataCache* ScImportSourceDesc::CreateCache(ScDocument* pDoc , long nID) const +ScDPTableDataCache* ScImportSourceDesc::CreateCache(ScDocument* pDoc) const { if ( !pDoc ) return NULL; @@ -155,11 +155,9 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache(ScDocument* pDoc , long nID) return pCache; } -ScDatabaseDPData::ScDatabaseDPData( - ScDocument* pDoc, - const ScImportSourceDesc& rImport, long nCacheId /*=-1 */ ) : - ScDPTableData(pDoc, -1), - aCacheTable(rImport.CreateCache(pDoc, -1)) +ScDatabaseDPData::ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport) : + ScDPTableData(pDoc), + aCacheTable(rImport.CreateCache(pDoc)) { } diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 2bfee3f6f463..e547965538ee 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -60,13 +60,13 @@ using ::std::vector; // ----------------------------------------------------------------------- -ScSheetDPData::ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc , long nCacheId) : - ScDPTableData(pD, -1), +ScSheetDPData::ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc) : + ScDPTableData(pD), aQuery ( rDesc.GetQueryParam() ), pSpecial(NULL), bIgnoreEmptyRows( FALSE ), bRepeatIfEmpty(FALSE), - aCacheTable(rDesc.CreateCache(-1)) + aCacheTable(rDesc.CreateCache()) { SCSIZE nEntryCount( aQuery.GetEntryCount()); pSpecial = new bool[nEntryCount]; @@ -305,7 +305,7 @@ bool ScSheetSourceDesc::operator== (const ScSheetSourceDesc& rOther) const maQueryParam == rOther.maQueryParam; } -ScDPTableDataCache* ScSheetSourceDesc::CreateCache(long nID) const +ScDPTableDataCache* ScSheetSourceDesc::CreateCache() const { if (!mpDoc) return NULL; diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index 1742bb30276c..dab4a217cebc 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -62,9 +62,8 @@ ScDPTableData::CalcInfo::CalcInfo() : // --------------------------------------------------------------------------- -ScDPTableData::ScDPTableData(ScDocument* pDoc, long nCacheId ) : - mnCacheId( nCacheId ), - mpDoc ( pDoc ) +ScDPTableData::ScDPTableData(ScDocument* pDoc) : + mpDoc(pDoc) { nLastDateVal = nLastHier = nLastLevel = nLastRet = -1; // invalid @@ -264,11 +263,6 @@ long ScDPTableData::GetMembersCount( long nDim ) return GetCacheTable().getFieldEntries( nDim ).size(); } -long ScDPTableData::GetCacheId() const -{ - return mnCacheId; -} - const ScDPItemData* ScDPTableData::GetMemberByIndex( long nDim, long nIndex ) { if ( nIndex >= GetMembersCount( nDim ) ) |