diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /chart2/source/controller/chartapiwrapper | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 4d3b90e6c0a9..4493a48c647d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -582,7 +582,7 @@ void ChartDataWrapper::fireChartDataChangeEvent( css::chart::ChartDataChangeEven return; uno::Reference< uno::XInterface > xSrc( static_cast< cppu::OWeakObject* >( this )); - assert(xSrc.is()); + OSL_ASSERT( xSrc.is()); if( xSrc.is() ) aEvent.Source = xSrc; @@ -625,7 +625,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) bool bPercent = false; bool bDeep = false; uno::Reference< css::chart::XChartDocument > xOldDoc( xChartDoc, uno::UNO_QUERY ); - assert(xOldDoc.is()); + OSL_ASSERT( xOldDoc.is()); uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY ); if( xDiaProp.is()) { @@ -659,7 +659,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) switchToInternalDataProvider(); rDataOperator.apply(m_xDataAccess); uno::Reference< chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() ); - assert(xDataProvider.is()); + OSL_ASSERT( xDataProvider.is() ); if( !xDataProvider.is() ) return; uno::Reference< chart2::data::XDataSource > xSource( xDataProvider->createDataSource( aArguments ) ); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 8cc1550658b7..5c03301bb21c 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -273,8 +273,8 @@ Reference< beans::XPropertySet > TitleWrapper::getFirstCharacterPropertySet() void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue ) { - assert( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && - nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); + OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && + nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); Reference< beans::XPropertySet > xProp( getFirstCharacterPropertySet(), uno::UNO_QUERY ); Reference< beans::XFastPropertySet > xFastProp( xProp, uno::UNO_QUERY ); @@ -296,8 +296,8 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue void TitleWrapper::setFastCharacterPropertyValue( sal_Int32 nHandle, const Any& rValue ) { - assert( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && - nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); + OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && + nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); Reference< chart2::XTitle > xTitle( this->getTitleObject() ); if( xTitle.is()) |