diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-14 20:22:53 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-14 20:58:32 -0500 |
| commit | c669d9e645b7600cf8ed0cc696e99f4552b167a4 (patch) | |
| tree | 4b40d2482407918e31979d83db0969a1e1102bd5 /sc/inc | |
| parent | edbf1da237b3f276495637b477113618a7b8453b (diff) | |
Use std::vector instead of C-style arrays.
Change-Id: I593c6c50aeb4ead723076d01e7113de154e2557d
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/dptabres.hxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index dda33f681f45..989e8d377446 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -289,11 +289,11 @@ class ScDPResultData ScDPSource& mrSource; //! keep things like measure lists here - long nMeasCount; - ScSubTotalFunc* pMeasFuncs; - ::com::sun::star::sheet::DataPilotFieldReference* pMeasRefs; - sal_uInt16* pMeasRefOrient; + std::vector<ScSubTotalFunc> maMeasureFuncs; + std::vector<com::sun::star::sheet::DataPilotFieldReference> maMeasureRefs; + std::vector<sal_uInt16> maMeasureRefOrients; std::vector<rtl::OUString> maMeasureNames; + bool bLateInit:1; bool bDataAtCol:1; bool bDataAtRow:1; @@ -310,7 +310,7 @@ public: void SetDataLayoutOrientation( sal_uInt16 nOrient ); void SetLateInit( bool bSet ); - long GetMeasureCount() const { return nMeasCount; } + long GetMeasureCount() const { return maMeasureFuncs.size(); } ScSubTotalFunc GetMeasureFunction(long nMeasure) const; rtl::OUString GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; rtl::OUString GetMeasureDimensionName(long nMeasure) const; @@ -324,8 +324,7 @@ public: long GetColStartMeasure() const; long GetRowStartMeasure() const; - long GetCountForMeasure( long nMeas ) const - { return ( nMeas == SC_DPMEASURE_ALL ) ? nMeasCount : 1; } + long GetCountForMeasure( long nMeas ) const { return (nMeas == SC_DPMEASURE_ALL) ? maMeasureFuncs.size() : 1; } bool IsBaseForGroup( long nDim ) const; // any group long GetGroupBase( long nGroupDim ) const; |