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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/source/controller/sidebar/ChartAxisPanel.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 04e32abd392e..a5669926a182 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -170,7 +170,7 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) assert(aAny.hasValue()); OUString aCID; aAny >>= aCID; -#ifdef DBG_UTIL +#if defined DBG_UTIL && !defined NDEBUG ObjectType eType = ObjectIdentifier::getObjectType(aCID); assert(eType == OBJECTTYPE_AXIS); #endif diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 2d1a911f69af..4cc0d079fcd0 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -227,7 +227,7 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) assert(aAny.hasValue()); OUString aCID; aAny >>= aCID; -#ifdef DBG_UTIL +#if defined DBG_UTIL && !defined NDEBUG ObjectType eType = ObjectIdentifier::getObjectType(aCID); assert(eType == OBJECTTYPE_DATA_ERRORS_X || eType == OBJECTTYPE_DATA_ERRORS_Y || diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index ec6ddb944513..c2a6a4afade0 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -272,7 +272,7 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) if (aCID.isEmpty()) return OUString(); -#ifdef DBG_UTIL +#if defined DBG_UTIL && !defined NDEBUG ObjectType eType = ObjectIdentifier::getObjectType(aCID); assert(eType == OBJECTTYPE_DATA_SERIES); #endif |