diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2016-10-17 23:19:23 -0400 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-10-19 23:20:17 +0000 |
| commit | e3789123da397c82109a5fcead3d49f803ba6aad (patch) | |
| tree | 3641c3318ac6a0221d7be8241ab7eff81dc40fc9 /formula/source | |
| parent | 4969015d138cbd9b20bf3a9bee0af9d6222f1a68 (diff) | |
tdf#93894: Prohibit grouping when certain token types are present.
For instance, column / row label tokens don't work correctly in
grouped cells with the current implementation.
Change-Id: Idf86312ef15fbfd4382aa90ee6d131c671a80683
(cherry picked from commit e944d9510404d8c67b3867d7cd9f313fd5091004)
Reviewed-on: https://gerrit.libreoffice.org/30027
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'formula/source')
| -rw-r--r-- | formula/source/core/api/token.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 29ac8a1f912f..713998c546a7 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -712,7 +712,8 @@ FormulaTokenArray::FormulaTokenArray() : nError(0), nMode(ScRecalcMode::NORMAL), bHyperLink(false), - mbFromRangeName(false) + mbFromRangeName(false), + mbShareable(true) { } @@ -735,6 +736,7 @@ void FormulaTokenArray::Assign( const FormulaTokenArray& r ) nMode = r.nMode; bHyperLink = r.bHyperLink; mbFromRangeName = r.mbFromRangeName; + mbShareable = r.mbShareable; pCode = nullptr; pRPN = nullptr; FormulaToken** pp; @@ -846,6 +848,7 @@ void FormulaTokenArray::Clear() nError = nLen = nIndex = nRPN = 0; bHyperLink = false; mbFromRangeName = false; + mbShareable = true; ClearRecalcMode(); } |