diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-13 08:59:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-13 10:54:19 +0200 |
| commit | c2defd97cb60439fc25970c903e66fbecad148e5 (patch) | |
| tree | 5feadf33121715cb480a3e95bdf2db1c27a4e2aa /sc | |
| parent | 75aaa65a8f0f145657098278c3a7a3973b2c29df (diff) | |
sc: inline LabelsType
Change-Id: I6035b73e170664d23c706a26c1dee953cd19c518
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/dpcache.hxx | 5 | ||||
| -rw-r--r-- | sc/source/core/data/dpcache.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index e48fe4e08c89..155c969363b0 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -49,7 +49,6 @@ class SC_DLLPUBLIC ScDPCache : boost::noncopyable public: typedef std::vector<ScDPItemData> ScDPItemDataVec; typedef std::set<ScDPObject*> ScDPObjectSet; - typedef std::vector<OUString> LabelsType; typedef std::vector<SCROW> IndexArrayType; struct GroupItems : boost::noncopyable @@ -118,7 +117,7 @@ private: GroupFieldsType maGroupFields; mutable StringSetType maStringPool; - LabelsType maLabelNames; // Stores dimension names and the data layout dimension name at position 0. + std::vector<OUString> maLabelNames; // Stores dimension names and the data layout dimension name at position 0. mdds::flat_segment_tree<SCROW, bool> maEmptyRows; SCROW mnDataSize; SCROW mnRowCount; @@ -174,7 +173,7 @@ public: */ SCROW GetDataSize() const; SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) const; - OUString GetDimensionName(LabelsType::size_type nDim) const; + OUString GetDimensionName(std::vector<OUString>::size_type nDim) const; bool IsRowEmpty(SCROW nRow) const; bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const; diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index eb2bf557e672..bd04f8e8bf2b 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -679,7 +679,7 @@ const ScDPCache::GroupItems* ScDPCache::GetGroupItems(long nDim) const return nullptr; } -OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const +OUString ScDPCache::GetDimensionName(std::vector<OUString>::size_type nDim) const { OSL_ENSURE(nDim < maLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName"); OSL_ENSURE(maLabelNames.size() == static_cast <sal_uInt16> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); |