diff options
| author | Eike Rathke <erack@redhat.com> | 2018-12-11 17:35:00 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-01-17 13:48:35 +0100 |
| commit | 9ae27d62bdd2b0fe8bf3cefd319aaacae3dd6616 (patch) | |
| tree | b37e0e88281867a89761241fbaab183e9957d155 | |
| parent | 24912bb7fb100393659fbe314d2c553941ac9d32 (diff) | |
Correct typed_flags<PivotFunc> mask is 0x1fff
This was wrong since
commit 298ee50676b849020a8a5042e8612f71379ecf3b
CommitDate: Sun Nov 20 00:14:28 2016 +0100
PivotMedian: Implement median as a new pivot table function
and in fact in a debug build failed an assertion
soffice.bin: include/o3tl/typed_flags_set.hxx:85:
constexpr o3tl::is_typed_flags<E, M>::Wrap::Wrap(type name std::underlying_type<_Tp>::type)
[with E = PivotFunc; typename std::underlying_type<_Tp>::type M = 4607; typename std::underlying_type<_Tp>::type = int]:
Assertion `static_cast<typename std::underlying_type<E>::type>(~0) == M || (value & ~M) == 0' failed.
when one of the functions (e.g. StdVar) not included in the mask
was chosen as pivot table data function.
Change-Id: I5b9efc7d2cbcf6fece3ef228db8f6e0ffa17b510
Reviewed-on: https://gerrit.libreoffice.org/64974
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 639a401fbd910c1fede35f7106a5acf716ec5fea)
Reviewed-on: https://gerrit.libreoffice.org/64986
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit bed9e9d2a4010f9cffb48802c02cb5fa950a8293)
| -rw-r--r-- | sc/inc/dpglobal.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index 295af86db148..0a5b6e94dc6b 100644 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -39,7 +39,7 @@ enum class PivotFunc { Auto = 0x1000 }; namespace o3tl { - template<> struct typed_flags<PivotFunc> : is_typed_flags<PivotFunc, 0x11ff> {}; + template<> struct typed_flags<PivotFunc> : is_typed_flags<PivotFunc, 0x1fff> {}; } struct ScDPValue |