summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2016-10-17 23:19:23 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2016-10-18 20:40:21 -0400
commitaed5e42680caf49068a3f463b571621ef0d87f86 (patch)
tree06a1c87670ef490a26db65db7e6a6f90ed32aa53 /formula
parent004ca8f6558c71909551d15e077c4e835ebd6391 (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
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/token.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 034b0d6e9df9..9808d40a9e6a 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();
}