diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-13 08:57:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-13 10:54:19 +0200 |
| commit | 75aaa65a8f0f145657098278c3a7a3973b2c29df (patch) | |
| tree | 60009f7cd47675c459360272ceac452639b98d70 | |
| parent | a029ab3d480c97313dc88dc6e1fbc0f3a900fb09 (diff) | |
sc: rename ObjectSetType to ScDPObject
Change-Id: I64720c2678f702e895c9b91571d98c0059e02a27
| -rw-r--r-- | sc/inc/dpcache.hxx | 6 | ||||
| -rw-r--r-- | sc/source/core/data/dpcache.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xepivotxml.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index bbaa220bdbf5..e48fe4e08c89 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -48,7 +48,7 @@ class SC_DLLPUBLIC ScDPCache : boost::noncopyable public: typedef std::vector<ScDPItemData> ScDPItemDataVec; - typedef std::set<ScDPObject*> ObjectSetType; + typedef std::set<ScDPObject*> ScDPObjectSet; typedef std::vector<OUString> LabelsType; typedef std::vector<SCROW> IndexArrayType; @@ -109,7 +109,7 @@ private: /** * All pivot table objects that references this cache. */ - mutable ObjectSetType maRefObjects; + mutable ScDPObjectSet maRefObjects; typedef boost::ptr_vector<Field> FieldsType; typedef boost::ptr_vector<GroupItems> GroupFieldsType; @@ -129,7 +129,7 @@ public: const OUString* InternString(const OUString& rStr) const; void AddReference(ScDPObject* pObj) const; void RemoveReference(ScDPObject* pObj) const; - const ObjectSetType& GetAllReferences() const; + const ScDPObjectSet& GetAllReferences() const; SCROW GetIdByItemData(long nDim, const ScDPItemData& rItem) const; OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 3a2fbc53a5f5..eb2bf557e672 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -930,7 +930,7 @@ void ScDPCache::RemoveReference(ScDPObject* pObj) const mpDoc->GetDPCollection()->RemoveCache(this); } -const ScDPCache::ObjectSetType& ScDPCache::GetAllReferences() const +const ScDPCache::ScDPObjectSet& ScDPCache::GetAllReferences() const { return maRefObjects; } diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx index 92d79bc53187..23e010e9c509 100644 --- a/sc/source/filter/excel/xepivotxml.cxx +++ b/sc/source/filter/excel/xepivotxml.cxx @@ -316,8 +316,8 @@ void XclExpXmlPivotTableManager::Initialize() // Get all pivot objects that reference this cache, and set up an // object to cache ID mapping. - const ScDPCache::ObjectSetType& rRefs = pCache->GetAllReferences(); - ScDPCache::ObjectSetType::const_iterator it = rRefs.begin(), itEnd = rRefs.end(); + const ScDPCache::ScDPObjectSet& rRefs = pCache->GetAllReferences(); + ScDPCache::ScDPObjectSet::const_iterator it = rRefs.begin(), itEnd = rRefs.end(); for (; it != itEnd; ++it) maCacheIdMap.insert(CacheIdMapType::value_type(*it, aCaches.size()+1)); |