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 /reportdesign | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 9dbbaf189a91..b3dd2f550f2d 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -1109,7 +1109,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); - assert( xReceiver.is()); + OSL_ASSERT( xReceiver.is()); if( xReceiver.is() ) { uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY); @@ -1149,7 +1149,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); - assert( xReceiver.is()); + OSL_ASSERT( xReceiver.is()); if( xReceiver.is() ) { // lock the model to suppress any internal updates diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index e61a0f93d805..0527ef79ca58 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -696,7 +696,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep }; - assert( pDefaults.size() == SAL_N_ELEMENTS(aItemInfos) ); + OSL_ASSERT( pDefaults.size() == SAL_N_ELEMENTS(aItemInfos) ); static const sal_uInt16 pRanges[] = { |