summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 07:41:18 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 07:41:18 +1000
commita2709d8aafb9376d7eed940846757e6ac573af1f (patch)
treed50379a7f60a6e32c0d26fee983700b9c3620a18 /chart2
parentebe3547ea9381db2561fbb24cc27c202fff02db6 (diff)
tdf#43157: convert chart2 view source from OSL_ASSERT to assert
Change-Id: I1f4e5b0e90778697f9acf77f34206eb6dabebd71
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/charttypes/Splines.cxx4
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx6
-rw-r--r--chart2/source/view/main/ChartView.cxx10
-rw-r--r--chart2/source/view/main/VLegend.cxx2
4 files changed, 11 insertions, 11 deletions
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index b3cd9a77c67f..3d94de98e9eb 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -668,8 +668,8 @@ void SplineCalculater::CalculateBSplines(
// ODF1.2 spec variable k. Causion, k is used as index in the spec in addition.
// nDegree is ODF1.2 file format attribute chart:spline-order and
// ODF1.2 spec variable p
- OSL_ASSERT( nResolution > 1 );
- OSL_ASSERT( nDegree >= 1 );
+ assert( nResolution > 1 );
+ assert( nDegree >= 1 );
// limit the b-spline degree at 15 to prevent insanely large sets of points
sal_uInt32 p = std::min<sal_uInt32>(nDegree, 15);
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 38a6bb865730..3fee4195e507 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1218,7 +1218,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
const uno::Reference< chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator,
awt::Point aDefaultPos )
{
- OSL_ASSERT( xEquationProperties.is());
+ assert(xEquationProperties.is());
if( !xEquationProperties.is())
return;
@@ -1317,7 +1317,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
xEquationTarget, aFormula.makeStringAndClear(),
aNames, aValues, AbstractShapeFactory::makeTransformation( aScreenPosition2D ));
- OSL_ASSERT( xTextShape.is());
+ assert(xTextShape.is());
if( xTextShape.is())
{
AbstractShapeFactory::setShapeName( xTextShape, rEquationCID );
@@ -2350,7 +2350,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
if( xChild.is())
xChild->setParent( xSeriesProps );
- OSL_ASSERT( xPointSet.is());
+ assert(xPointSet.is());
xPointSet->setPropertyValue(
"Color", uno::Any( m_xColorScheme->getColorByIndex( nPointIndex )));
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index ccaa3f868444..4cd9c8362d88 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -494,7 +494,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
//iterate through all coordinate systems
uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
- OSL_ASSERT( xCooSysContainer.is());
+ assert(xCooSysContainer.is());
if( !xCooSysContainer.is())
return;
uno::Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
@@ -507,7 +507,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
//iterate through all chart types in the current coordinate system
uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
- OSL_ASSERT( xChartTypeContainer.is());
+ assert(xChartTypeContainer.is());
if( !xChartTypeContainer.is() )
continue;
uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
@@ -550,7 +550,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
- OSL_ASSERT( xDataSeriesContainer.is());
+ assert(xDataSeriesContainer.is());
if( !xDataSeriesContainer.is() )
continue;
@@ -3414,7 +3414,7 @@ void ChartView::createShapes3D()
//iterate through all chart types in the current coordinate system
uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
- OSL_ASSERT( xChartTypeContainer.is());
+ assert(xChartTypeContainer.is());
if( !xChartTypeContainer.is() )
return;
@@ -3437,7 +3437,7 @@ void ChartView::createShapes3D()
}
uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
- OSL_ASSERT( xDataSeriesContainer.is());
+ assert(xDataSeriesContainer.is());
if( !xDataSeriesContainer.is() )
return;
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index bf51d0bd64d8..effa91d53028 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -297,7 +297,7 @@ awt::Size lcl_placeLegendEntries(
std::vector< Reference< drawing::XShape > > aTextShapes;
awt::Size aMaxEntryExtent = lcl_createTextShapes( rEntries, xShapeFactory, xTarget, aTextShapes, rTextProperties );
- OSL_ASSERT( aTextShapes.size() == rEntries.size());
+ assert(aTextShapes.size() == rEntries.size());
sal_Int32 nMaxEntryWidth = nXOffset + nSymbolPlusDistanceWidth + aMaxEntryExtent.Width;
sal_Int32 nMaxEntryHeight = nYOffset + aMaxEntryExtent.Height;