sc/source/core/tool/grouparealistener.cxx | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6699afb43bffb9148960cbee2013d1704e462b9e
Author: Eike Rathke <er...@redhat.com>
Date: Wed Nov 9 18:44:01 2016 +0100
assert a supposed-to-be-fixed condition, tdf#89957 related
Change-Id: Ie00840e0b8cff747e131b6bc9def0ddaf57edea7
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index 5c5b0a3..aca46a4 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -219,7 +219,7 @@ void FormulaGroupAreaListener::collectFormulaCells(
const_cast<FormulaGroupAreaListener*>(this)->mnGroupLen = nLen;
}
- /* FIXME: with tdf#89957 it happened that the actual block size in column
+ /* With tdf#89957 it happened that the actual block size in column
* AP (shifted from AO) of sheet 'w' was smaller than the remembered group
* length and correct. This is just a very ugly workaround, the real cause
* is yet unknown, but at least don't crash in such case. The intermediate
@@ -233,6 +233,14 @@ void FormulaGroupAreaListener::collectFormulaCells(
SAL_WARN("sc.core","FormulaGroupAreaListener::collectFormulaCells()
nBlockSize " <<
nBlockSize << " < " << mnGroupLen << " mnGroupLen");
const_cast<FormulaGroupAreaListener*>(this)->mnGroupLen =
static_cast<SCROW>(nBlockSize);
+
+ // erAck: 2016-11-09T18:30+01:00 XXX This doesn't occur anymore, at
+ // least not in the original bug scenario (insert a column before H on
+ // sheet w) of tdf#89957 with
+ // http://bugs.documentfoundation.org/attachment.cgi?id=114042
+ // Apparently this was fixed in the mean time, let's assume and get the
+ // assert bat out to hit us if it wasn't.
+ assert(!"something is still messing up the formula goup and block size
length");
}
ScFormulaCell* const * ppEnd = pp + mnGroupLen;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
