diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-22 15:51:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-22 21:02:07 +0100 |
| commit | 3afe0c79fa185a6fe01c48e427c49b12728e8c4a (patch) | |
| tree | 6d27b17a476ca075f04d2ea419f3441988601e19 /forms | |
| parent | f19dfaf817556ba28d68c000f3561a2752635727 (diff) | |
--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>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/model.cxx | 4 | ||||
| -rw-r--r-- | forms/source/xforms/model.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 2d90be996619..f0051df277ba 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -65,7 +65,7 @@ using namespace com::sun::star::xml::dom; using namespace xforms; -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG #define DBG_INVARIANT_TYPE(TYPE) class DBG_##TYPE { const TYPE* mpT; void check() { mpT->dbg_assertInvariant(); } public: DBG_##TYPE(const TYPE* pT) : mpT(pT) { check(); } ~DBG_##TYPE() { check(); } } _DBG_##TYPE(this); #define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model) @@ -177,7 +177,7 @@ void Model::setExternalData( bool _bData ) mbExternalData = _bData; } -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG void Model::dbg_assertInvariant() const { assert(mxInstances && "no instances found"); diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index d64f28e01853..df08dee8ab48 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -139,7 +139,7 @@ public: void setExternalData( bool _bData ); -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG void dbg_assertInvariant() const; #endif |