diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-04-12 11:31:44 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-04-14 09:25:38 +0000 |
| commit | 81c9d54db34647fb1db311b228de6749c089dcf8 (patch) | |
| tree | 06235038e56d20e27548afdb2bf143aa42e75b26 /chart2/source/model | |
| parent | eec11a3064e40c810971350223a6b42cc150bc4c (diff) | |
tdf#91794 removed OSL_DEBUG_LEVEL > 1 conditionals
Removed OSL_DEBUG_LEVEL > 1 conditionals to reduce the
problem of multiple debug levels
Change-Id: I453f74198e08308c3891e923ebaee58a276e34ad
Reviewed-on: https://gerrit.libreoffice.org/22616
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'chart2/source/model')
4 files changed, 9 insertions, 12 deletions
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index cbd9f7d44261..6eb5caea9390 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -30,9 +30,6 @@ #include <algorithm> #include <iterator> -#if OSL_DEBUG_LEVEL > 1 -#include <rtl/math.hxx> -#endif #include <com/sun/star/beans/PropertyAttribute.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 2465041abc65..910430ad8cff 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -250,11 +250,11 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences()); if( aSeqs.getLength() != aNewSequences.getLength() ) { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 sal_Int32 j=0; for( ; j<aSeqs.getLength(); ++j ) { - OSL_ENSURE( aSeqs[j] == xValuesY || aSeqs[j] == xValuesX || aSeqs[j] == xValuesSize, "All sequences should be used" ); + assert( (aSeqs[j] == xValuesY || aSeqs[j] == xValuesX || aSeqs[j] == xValuesSize) && "All sequences should be used" ); } #endif Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW ); diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 25a1c8b40661..d8ea1c46ce85 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -40,7 +40,7 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_CHART2_TEMPLATE namespace { void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ); @@ -68,7 +68,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( if( ! xSource.is()) return InterpretedData(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_CHART2_TEMPLATE lcl_ShowDataSource( xSource ); #endif @@ -172,11 +172,11 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences()); if( aSeqs.getLength() != aNewSequences.getLength() ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_CHART2_TEMPLATE sal_Int32 j=0; for( ; j<aSeqs.getLength(); ++j ) { - OSL_ENSURE( aSeqs[j] == xValuesY, "All sequences should be used" ); + assert( aSeqs[j] == xValuesY && "All sequences should be used" ); } #endif Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW ); @@ -413,7 +413,7 @@ css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceName } // namespace chart -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_CHART2_TEMPLATE namespace { diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index a30a4459e4fa..e291eafefd16 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -211,11 +211,11 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences()); if( aSeqs.getLength() != aNewSequences.getLength() ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_Int32 j=0; for( ; j<aSeqs.getLength(); ++j ) { - OSL_ENSURE( aSeqs[j] == xValuesY || aSeqs[j] == xValuesX, "All sequences should be used" ); + SAL_WARN_IF((aSeqs[j] == xValuesY || aSeqs[j] == xValuesX), "chart2.template", "All sequences should be used" ); } #endif Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW ); |