sc: rename ObjectSetType to ScDPObject

Change-Id: I64720c2678f702e895c9b91571d98c0059e02a27

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;

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;
 }

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));