Kaydet (Commit) ece725d7 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Kohei Yoshida

Convert dptabres.cxx in SC module from SV_DECL_PTRARR_DEL to std::vector.

üst d8c9f36e
...@@ -221,8 +221,6 @@ public: ...@@ -221,8 +221,6 @@ public:
// results for a hierarchy dimension // results for a hierarchy dimension
// //
#define SC_DP_RES_GROW 16
class ScDPResultDimension; class ScDPResultDimension;
class ScDPDataDimension; class ScDPDataDimension;
class ScDPDataMember; class ScDPDataMember;
...@@ -494,10 +492,7 @@ public: ...@@ -494,10 +492,7 @@ public:
ScDPDataDimension* GetChildDimension() { return pChildDimension; } ScDPDataDimension* GetChildDimension() { return pChildDimension; }
}; };
//! replace PtrArr with 32-bit array ???? typedef std::vector<ScDPDataMember*> ScDPDataMembers;
typedef ScDPDataMember* ScDPDataMemberPtr;
SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW)
// result dimension contains only members // result dimension contains only members
...@@ -615,7 +610,7 @@ class ScDPDataDimension ...@@ -615,7 +610,7 @@ class ScDPDataDimension
private: private:
const ScDPResultData* pResultData; const ScDPResultData* pResultData;
const ScDPResultDimension* pResultDimension; // column const ScDPResultDimension* pResultDimension; // column
ScDPDataMembers aMembers; ScDPDataMembers maMembers;
sal_Bool bIsDataLayout; //! or ptr to IntDimension? sal_Bool bIsDataLayout; //! or ptr to IntDimension?
public: public:
...@@ -646,7 +641,8 @@ public: ...@@ -646,7 +641,8 @@ public:
void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const; void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const;
long GetMemberCount() const; long GetMemberCount() const;
ScDPDataMember* GetMember(long n) const; const ScDPDataMember* GetMember(long n) const;
ScDPDataMember* GetMember(long n);
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
......
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