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/accessibility | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'chart2/source/controller/accessibility')
3 files changed, 6 insertions, 6 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index fdfbc5b19ad7..832f48bac59d 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -87,7 +87,7 @@ AccessibleBase::AccessibleBase( m_bStateSetInitialized( false ) { // initialize some states - assert(m_xStateSetHelper.is()); + OSL_ASSERT( m_xStateSetHelper.is() ); m_xStateSetHelper->AddState( AccessibleStateType::ENABLED ); m_xStateSetHelper->AddState( AccessibleStateType::SHOWING ); m_xStateSetHelper->AddState( AccessibleStateType::VISIBLE ); @@ -97,7 +97,7 @@ AccessibleBase::AccessibleBase( AccessibleBase::~AccessibleBase() { - assert(m_bIsDisposed); + OSL_ASSERT( m_bIsDisposed ); } bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const @@ -177,14 +177,14 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId void AccessibleBase::AddState( sal_Int16 aState ) { CheckDisposeState(); - assert(m_xStateSetHelper.is()); + OSL_ASSERT( m_xStateSetHelper.is() ); m_xStateSetHelper->AddState( aState ); } void AccessibleBase::RemoveState( sal_Int16 aState ) { CheckDisposeState(); - assert(m_xStateSetHelper.is()); + OSL_ASSERT( m_xStateSetHelper.is() ); m_xStateSetHelper->RemoveState( aState ); } diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 6f113bf7fec8..b231b030c56a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -55,7 +55,7 @@ AccessibleChartElement::AccessibleChartElement( AccessibleChartElement::~AccessibleChartElement() { - assert(CheckDisposeState(false /* don't throw exceptions */)); + OSL_ASSERT( CheckDisposeState( false /* don't throw exceptions */ ) ); } // ________ protected ________ diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index c12a8f59a974..2757cef19cb2 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -65,7 +65,7 @@ AccessibleChartShape::AccessibleChartShape( AccessibleChartShape::~AccessibleChartShape() { - assert(CheckDisposeState(false /* don't throw exceptions */)); + OSL_ASSERT( CheckDisposeState( false /* don't throw exceptions */ ) ); if ( m_pAccShape.is() ) { |