summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2016-11-09 21:00:02 -0500
committerKohei Yoshida <libreoffice@kohei.us>2016-11-10 12:17:12 +0000
commit6eb3d90aeb9438bd3249aaae32a445e81f278879 (patch)
treeff747e38ee794a2ee98aa5134e140536ce533b94 /sc/inc
parent50e9065cbbb2c62fa925cf5b561a85c715a0eb1e (diff)
Avoid writing to the log for the same group twice.
This can happen when the group calculation is disabled and falls back to non-group calculations. And we only care about the first entry in case of non-group calculation of grouped cells. Change-Id: I545980acf8e35b4d0504aa2a77f86bdc85799e29 Reviewed-on: https://gerrit.libreoffice.org/30738 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/formulalogger.hxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/inc/formulalogger.hxx b/sc/inc/formulalogger.hxx
index 0d992da8a355..626594719194 100644
--- a/sc/inc/formulalogger.hxx
+++ b/sc/inc/formulalogger.hxx
@@ -17,6 +17,7 @@
class ScFormulaCell;
class ScDocument;
class ScAddress;
+struct ScFormulaCellGroup;
namespace formula {
@@ -38,6 +39,7 @@ class FormulaLogger
std::vector<OUString> maMessages;
sal_Int32 mnNestLevel = 0;
+ const ScFormulaCellGroup* mpLastGroup = nullptr;
void writeAscii( const char* s );
void writeAscii( const char* s, size_t n );
@@ -70,7 +72,8 @@ public:
private:
GroupScope(
FormulaLogger& rLogger, const OUString& rPrefix,
- const ScDocument& rDoc, const ScFormulaCell& rCell );
+ const ScDocument& rDoc, const ScFormulaCell& rCell,
+ bool bOutputEnabled );
public:
GroupScope( GroupScope&& r );