From 3afe0c79fa185a6fe01c48e427c49b12728e8c4a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 22 Nov 2018 15:51:18 +0100
Subject: --enable-dbgutil --disable-assert-always-abort fixes

...which <https://ci.libreoffice.org/job/lo_tb_random_config_linux/>
occasionally stumbles across; plus some related loplugin:staticmethods fixes

Change-Id: If6998c302cfbabfcad626d9c68d94d3368548a41
Reviewed-on: https://gerrit.libreoffice.org/63808
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 sc/source/core/data/formulacell.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sc')

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 6f82740d3b38..5b20269528a4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1457,13 +1457,13 @@ class RecursionCounter
 {
     ScRecursionHelper&  rRec;
     bool                bStackedInIteration;
-#ifdef DBG_UTIL
+#if defined DBG_UTIL && !defined NDEBUG
     const ScFormulaCell* cell;
 #endif
 public:
     RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p )
         : rRec(r)
-#ifdef DBG_UTIL
+#if defined DBG_UTIL && !defined NDEBUG
         , cell(p)
 #endif
     {
@@ -1477,7 +1477,7 @@ public:
         rRec.DecRecursionCount();
         if (bStackedInIteration)
         {
-#ifdef DBG_UTIL
+#if defined DBG_UTIL && !defined NDEBUG
             assert(rRec.GetRecursionInIterationStack().top() == cell);
 #endif
             rRec.GetRecursionInIterationStack().pop();
-- 
cgit