Kaydet (Commit) c2defd97 authored tarafından Noel Grandin's avatar Noel Grandin

sc: inline LabelsType

Change-Id: I6035b73e170664d23c706a26c1dee953cd19c518
üst 75aaa65a
...@@ -49,7 +49,6 @@ class SC_DLLPUBLIC ScDPCache : boost::noncopyable ...@@ -49,7 +49,6 @@ class SC_DLLPUBLIC ScDPCache : boost::noncopyable
public: public:
typedef std::vector<ScDPItemData> ScDPItemDataVec; typedef std::vector<ScDPItemData> ScDPItemDataVec;
typedef std::set<ScDPObject*> ScDPObjectSet; typedef std::set<ScDPObject*> ScDPObjectSet;
typedef std::vector<OUString> LabelsType;
typedef std::vector<SCROW> IndexArrayType; typedef std::vector<SCROW> IndexArrayType;
struct GroupItems : boost::noncopyable struct GroupItems : boost::noncopyable
...@@ -118,7 +117,7 @@ private: ...@@ -118,7 +117,7 @@ private:
GroupFieldsType maGroupFields; GroupFieldsType maGroupFields;
mutable StringSetType maStringPool; 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; mdds::flat_segment_tree<SCROW, bool> maEmptyRows;
SCROW mnDataSize; SCROW mnDataSize;
SCROW mnRowCount; SCROW mnRowCount;
...@@ -174,7 +173,7 @@ public: ...@@ -174,7 +173,7 @@ public:
*/ */
SCROW GetDataSize() const; SCROW GetDataSize() const;
SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) 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 IsRowEmpty(SCROW nRow) const;
bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const; bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const;
......
...@@ -679,7 +679,7 @@ const ScDPCache::GroupItems* ScDPCache::GetGroupItems(long nDim) const ...@@ -679,7 +679,7 @@ const ScDPCache::GroupItems* ScDPCache::GetGroupItems(long nDim) const
return nullptr; 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(nDim < maLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName");
OSL_ENSURE(maLabelNames.size() == static_cast <sal_uInt16> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); OSL_ENSURE(maLabelNames.size() == static_cast <sal_uInt16> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment