diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-06 23:38:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-09 12:04:11 +0100 |
| commit | 5fd6aa03c8b3964ba7ccc1cbe4d4421a500fce72 (patch) | |
| tree | aef872fdbdef2dbb0fc366d70fc8fd1ae3ea79e9 /sc/inc/formulagroup.hxx | |
| parent | pptx: import "Vortex" and "Ripple" transition + test (diff) | |
| download | core-5fd6aa03c8b3964ba7ccc1cbe4d4421a500fce72.tar.gz core-5fd6aa03c8b3964ba7ccc1cbe4d4421a500fce72.zip | |
sc: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I74440dd6d7904fe9e6a59f7ff757f202d2718b07
Diffstat (limited to 'sc/inc/formulagroup.hxx')
| -rw-r--r-- | sc/inc/formulagroup.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index 384ea0a24d3b..15c2a60ce6c5 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -23,6 +23,7 @@ #endif #include <svl/sharedstringpool.hxx> +#include <memory> #include <set> #include <unordered_map> #include <vector> @@ -57,7 +58,7 @@ struct FormulaGroupContext : boost::noncopyable typedef AlignedAllocator<double,256> DoubleAllocType; typedef std::vector<double, DoubleAllocType> NumArrayType; typedef std::vector<rtl_uString*> StrArrayType; - typedef boost::ptr_vector<NumArrayType> NumArrayStoreType; + typedef std::vector<std::unique_ptr<NumArrayType>> NumArrayStoreType; typedef boost::ptr_vector<StrArrayType> StrArrayStoreType; struct ColKey @@ -87,7 +88,7 @@ struct FormulaGroupContext : boost::noncopyable typedef std::unordered_map<ColKey, ColArray, ColKey::Hash> ColArraysType; - NumArrayStoreType maNumArrays; /// manage life cycle of numeric arrays. + NumArrayStoreType m_NumArrays; /// manage life cycle of numeric arrays. StrArrayStoreType maStrArrays; /// manage life cycle of string arrays. ColArraysType maColArrays; /// keep track of longest array for each column. |