sc/source/filter/excel/exctools.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2702c2d1eb9af2d03d5e0a1b7704ab170a5e8d31
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jul 31 14:50:34 2017 +0300
The code handles the nLevel == nCurLevel case just fine
I get the warning from such a case when loading an .xls written by
Excel 2013. I have no idea how common it is. I have no deeper
understanding of the code here. I just want to get rid of one more
unnecessary warning.
If nLevel > nCurLevel the code indeed probably will misbehave quite
badly (thanks to unsigned arithmetics).
Change-Id: I6cc5af454049e6ec054865535d2f7a54c6264613
diff --git a/sc/source/filter/excel/exctools.cxx
b/sc/source/filter/excel/exctools.cxx
index 18a1f72ca2aa..85f759859329 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -131,7 +131,7 @@ void XclImpOutlineBuffer::MakeScOutline()
}
else
{
- OSL_ENSURE(nLevel < nCurLevel,
"XclImpOutlineBuffer::MakeScOutline: unexpected level!");
+ OSL_ENSURE(nLevel <= nCurLevel,
"XclImpOutlineBuffer::MakeScOutline: unexpected level!");
for (sal_uInt8 i = 0; i < nCurLevel - nLevel; ++i)
{
if (aOutlineStack.empty())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
