diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-09 18:00:08 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-10 11:47:45 -0400 |
commit | 7d0f3695a20df18f5f6e609f70b8d1ef7825302b (patch) | |
tree | 914a0de4fd1792e7cdd3baa55ea7e630569847c1 /sc/inc | |
parent | 6dd0d051e986b868bf2225c16137e72d6e2dd3b6 (diff) |
Correctly handle empty cells for string arrays too.
Because we need to make a distinction between an empty cell and a string
cell containing zero-length string, I decided to switch to using
rtl_uString* array and use NULL values as empty cells.
Change-Id: I5bedb593507f34782e41a8a900602d445e5b1f6f
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/formulagroup.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index 776b24d9b348..f57b23722940 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -15,6 +15,7 @@ #include <boost/noncopyable.hpp> #include <boost/ptr_container/ptr_vector.hpp> +#include <boost/unordered_set.hpp> class ScDocument; class ScTokenArray; @@ -23,13 +24,17 @@ namespace sc { struct FormulaGroupContext : boost::noncopyable { + typedef boost::unordered_set<OUString, OUStringHash> StrHashType; typedef std::vector<double> NumArrayType; - typedef std::vector<OUString> StrArrayType; + typedef std::vector<rtl_uString*> StrArrayType; typedef boost::ptr_vector<NumArrayType> NumArrayStoreType; typedef boost::ptr_vector<StrArrayType> StrArrayStoreType; + StrHashType maStrPool; NumArrayStoreType maNumArrays; StrArrayStoreType maStrArrays; + + rtl_uString* intern( const OUString& rStr ); }; /** |