diff options
487 files changed, 1484 insertions, 1486 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 67b2526eee62..dd96005ee3dd 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -156,7 +156,7 @@ namespace accessibility MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry); if(mi != m_mapEntry.end()) { - assert(mi->second.get() != nullptr); + OSL_ASSERT(mi->second.get() != nullptr); m_xFocusedChild = mi->second; } else diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 8383d3f3cae6..26b712441692 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -910,7 +910,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co rArguments[ 2 ] >>= pIntPtr; SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr ); const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : nullptr; - assert(pEnvData); + OSL_ASSERT(pEnvData); if (pEnvData) { #if defined(ENABLE_GTKSINK) diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index b5fe12db1a39..d1c44306834f 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -56,7 +56,7 @@ Player::~Player() QTMovie* Player::getMovie() { - assert( mpMovie ); + OSL_ASSERT( mpMovie ); return mpMovie; } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 8e30691a7093..550bcd3637e9 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -891,7 +891,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script {} } bool bValidName = !aXmlDlgName.isEmpty(); - assert( bValidName ); + OSL_ASSERT( bValidName ); if( !bValidName ) return bDone; @@ -934,7 +934,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script Shell* pShell = GetShell(); if (!pShell) { - assert(pShell); + OSL_ASSERT(pShell); return bDone; } diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index c4fdd5a57075..41dfb46585a0 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -737,7 +737,7 @@ namespace basegfx if( nCurrPolyIdx == -1 ) nCurrPolyIdx=first->getTargetPolygonIndex(); - assert(nCurrPolyIdx != -1); + OSL_ASSERT(nCurrPolyIdx != -1); // second encounter of my rect -> second edge // encountered, done diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 5ebf732eabe9..fdfcb75ccf5c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -754,7 +754,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) typelib_TypeDescription * pTD = nullptr; aType.getDescription( &pTD ); - assert( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE ); + OSL_ASSERT( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE ); Type aElementType( reinterpret_cast<typelib_IndirectTypeDescription *>(pTD)->pType ); ::typelib_typedescription_release( pTD ); @@ -1321,7 +1321,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper OUString aClassName = xIdlTargetClass->getName(); typelib_TypeDescription * pSeqTD = nullptr; typelib_typedescription_getByName( &pSeqTD, aClassName.pData ); - assert( pSeqTD ); + OSL_ASSERT( pSeqTD ); Type aElemType( reinterpret_cast<typelib_IndirectTypeDescription *>(pSeqTD)->pType ); // convert all array member and register them @@ -1362,7 +1362,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper { OUString aTypeName = aCurType.getTypeName(); typelib_typedescription_getByName( &pSeqTD, aTypeName.pData ); - assert( pSeqTD ); + OSL_ASSERT( pSeqTD ); if( pSeqTD->eTypeClass == typelib_TypeClass_SEQUENCE ) { aCurType = Type( reinterpret_cast<typelib_IndirectTypeDescription *>(pSeqTD)->pType ); @@ -4605,7 +4605,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP } while( pParentBasic == nullptr && pCurObject != nullptr ); - assert( pParentBasic != nullptr ); + OSL_ASSERT( pParentBasic != nullptr ); registerComponentToBeDisposedForBasic( xComponent, pParentBasic ); } diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx index d88f0ecdb589..4c8a0409a635 100644 --- a/basic/source/runtime/dllmgr-x64.cxx +++ b/basic/source/runtime/dllmgr-x64.cxx @@ -50,7 +50,7 @@ using namespace css; Missing support for functions returning structs (see TODO in call()). Missing support for additional data types (64 bit integers, Any, ...; would - trigger assert(false) in various switches). + trigger OSL_ASSERT(false) in various switches). It is assumed that the variables passed into SbiDllMgr::Call to represent the arguments and return value have types that exactly match the Declare @@ -143,7 +143,7 @@ template< typename T > void add( } std::size_t alignment(SbxVariable * variable) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -168,7 +168,7 @@ std::size_t alignment(SbxVariable * variable) { case SbxBYTE: return 1; default: - assert(false); + OSL_ASSERT(false); return 1; } } else { @@ -190,7 +190,7 @@ SbError marshal( SbError marshalString( SbxVariable * variable, bool special, MarshalData & data, void ** buffer) { - assert(variable != nullptr && buffer != nullptr); + OSL_ASSERT(variable != nullptr && buffer != nullptr); OString str; SbError e = convert(variable->GetOUString(), &str); if (e != ERRCODE_NONE) { @@ -207,7 +207,7 @@ SbError marshalStruct( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); SbxArray * props = dynamic_cast<SbxObject*>( variable->GetObject() )-> GetProperties(); for (sal_uInt16 i = 0; i < props->Count(); ++i) { @@ -223,7 +223,7 @@ SbError marshalArray( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); SbxDimArray * arr = dynamic_cast<SbxDimArray*>( variable->GetObject() ); int dims = arr->GetDims(); std::vector< sal_Int32 > low(dims); @@ -255,7 +255,7 @@ SbError marshal( bool outer, SbxVariable * variable, bool special, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); if (!(variable->GetFlags() & SbxFlagBits::Reference)) { if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { @@ -297,7 +297,7 @@ SbError marshal( add(blob, variable->GetByte(), outer ? 8 : 1, offset); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -344,7 +344,7 @@ SbError marshal( break; } default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -370,7 +370,7 @@ template< typename T > T read(void const ** pointer) { } void const * unmarshal(SbxVariable * variable, void const * data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -408,7 +408,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) { variable->PutByte(read< sal_uInt8 >(&data)); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -596,7 +596,7 @@ SbError call( result.PutByte(static_cast< sal_uInt8 >(iRetVal)); break; default: - assert(false); + OSL_ASSERT(false); break; } for (int i = 1; i < (arguments == nullptr ? 0 : arguments->Count()); ++i) { @@ -621,7 +621,7 @@ SbError call( SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc) { - assert(proc != nullptr); + OSL_ASSERT(proc != nullptr); if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"??? sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input if (n <= 0 || n > 0xFFFF) { diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx index 6108e1c8c59a..7cc4c91a8552 100644 --- a/basic/source/runtime/dllmgr-x86.cxx +++ b/basic/source/runtime/dllmgr-x86.cxx @@ -51,7 +51,7 @@ using namespace css::uno; Missing support for functions returning structs (see TODO in call()). Missing support for additional data types (64 bit integers, Any, ...; would - trigger assert(false) in various switches). + trigger OSL_ASSERT(false) in various switches). It is assumed that the variables passed into SbiDllMgr::Call to represent the arguments and return value have types that exactly match the Declare @@ -151,7 +151,7 @@ template< typename T > void add( } std::size_t alignment(SbxVariable * variable) { - assert(variable != 0); + OSL_ASSERT(variable != 0); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -176,7 +176,7 @@ std::size_t alignment(SbxVariable * variable) { case SbxBYTE: return 1; default: - assert(false); + OSL_ASSERT(false); return 1; } } else { @@ -198,7 +198,7 @@ SbError marshal( SbError marshalString( SbxVariable * variable, bool special, MarshalData & data, void ** buffer) { - assert(variable != 0 && buffer != 0); + OSL_ASSERT(variable != 0 && buffer != 0); OString str; SbError e = convert(variable->GetOUString(), &str); if (e != ERRCODE_NONE) { @@ -216,7 +216,7 @@ SbError marshalStruct( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); SbxArray * props = dynamic_cast<SbxObject*>( variable->GetObject() )-> GetProperties(); for (sal_uInt16 i = 0; i < props->Count(); ++i) { @@ -232,7 +232,7 @@ SbError marshalArray( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); SbxDimArray * arr = dynamic_cast<SbxDimArray*>( variable->GetObject() ); int dims = arr->GetDims(); std::vector< sal_Int32 > low(dims); @@ -264,7 +264,7 @@ SbError marshal( bool outer, SbxVariable * variable, bool special, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); SbxDataType eVarType = variable->GetType(); bool bByVal = !(variable->GetFlags() & SbxFlagBits::Reference); @@ -312,7 +312,7 @@ SbError marshal( add(blob, variable->GetByte(), outer ? 4 : 1, offset); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -359,7 +359,7 @@ SbError marshal( break; } default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -385,7 +385,7 @@ template< typename T > T read(void const ** pointer) { } void const * unmarshal(SbxVariable * variable, void const * data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -423,7 +423,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) { variable->PutByte(read< sal_uInt8 >(&data)); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -550,7 +550,7 @@ SbError call( DllMgr_call32(proc.proc, address(stack), stack.size()))); break; default: - assert(false); + OSL_ASSERT(false); break; } for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) { @@ -575,7 +575,7 @@ SbError call( SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc) { - assert(proc != 0); + OSL_ASSERT(proc != 0); if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"??? sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input if (n <= 0 || n > 0xFFFF) { diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 0cb6b4bbd076..201f873c4742 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -206,7 +206,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e { // if we cannot get the version then the // Oasis2OOoTransformer will not be used - assert(false); + OSL_ASSERT(false); } } diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 337089031dce..a27f69ba1085 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -663,7 +663,7 @@ namespace cairocanvas { int i; - assert( rColors.getLength() == rStops.getLength() ); + OSL_ASSERT( rColors.getLength() == rStops.getLength() ); for( i = 0; i < rColors.getLength(); i++ ) { diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 349e989bfd2b..d2edda651e4f 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -193,7 +193,7 @@ namespace oglcanvas for( sal_Int32 i=0; i<nNumCols; ++i ) *pCurrCol++ = rHelper.getDevice()->getDeviceColorSpace()->convertToARGB(rValues.maColors[i])[0]; - assert(nNumCols == rValues.maStops.getLength()); + OSL_ASSERT(nNumCols == rValues.maStops.getLength()); switch( rValues.meType ) { 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() ) { 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()) diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index b694d54d45be..4548d3b6f4df 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -636,7 +636,7 @@ void DataBrowser::RenewTable() OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const { - assert(m_apDataBrowserModel.get()); + OSL_ASSERT( m_apDataBrowserModel.get()); if( nColumnId > 0 ) return OUString( m_apDataBrowserModel->getRoleOfColumn( nColumnId - 1 )); return OUString(); @@ -694,7 +694,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const } else { - assert(m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::TEXT); + OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::TEXT ); aResult = m_apDataBrowserModel->getCellText( nColIndex, nRow ); } } diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 50610be8ca39..875137f1f576 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -279,7 +279,7 @@ private: void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) { - assert(m_apDialogModel.get()); + OSL_ASSERT( m_apDialogModel.get()); Reference< chart2::XInternalDataProvider > xDataProvider( m_apDialogModel->getDataProvider(), uno::UNO_QUERY ); @@ -400,7 +400,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex ) { //create a new text column for complex categories - assert(m_apDialogModel.get()); + OSL_ASSERT( m_apDialogModel.get()); Reference< chart2::XInternalDataProvider > xDataProvider( m_apDialogModel->getDataProvider(), uno::UNO_QUERY ); if (!xDataProvider.is()) return; @@ -438,7 +438,7 @@ void DataBrowserModel::removeComplexCategoryLevel( sal_Int32 nAtColumnIndex ) void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColumnIndex ) { - assert(m_apDialogModel.get()); + OSL_ASSERT( m_apDialogModel.get()); if (nAtColumnIndex < 0 || static_cast<size_t>(nAtColumnIndex) >= m_aColumns.size()) // Out of bound. return; @@ -509,7 +509,7 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex ) { - assert(m_apDialogModel.get()); + OSL_ASSERT( m_apDialogModel.get()); if( static_cast< tDataColumnVector::size_type >( nFirstColumnIndex ) < m_aColumns.size() - 1 ) { Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries ); @@ -523,7 +523,7 @@ void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex ) void DataBrowserModel::swapDataPointForAllSeries( sal_Int32 nFirstIndex ) { - assert(m_apDialogModel.get()); + OSL_ASSERT( m_apDialogModel.get()); Reference< chart2::XInternalDataProvider > xDataProvider( m_apDialogModel->getDataProvider(), uno::UNO_QUERY ); // lockControllers diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 94d0e87bec69..e4e74416667a 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -829,7 +829,7 @@ void DialogModel::applyInterpretedData( std::vector< Sequence< Reference< XDataSeries > > > aNewSeries( ContainerHelper::SequenceToVector( rNewData.Series )); - assert(aSeriesCnt.size() == aNewSeries.size()); + OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size()); std::vector< Sequence< Reference< XDataSeries > > >::const_iterator aSrcIt( aNewSeries.begin()); std::vector< Reference< XDataSeriesContainer > >::iterator aDestIt( aSeriesCnt.begin()); @@ -838,7 +838,7 @@ void DialogModel::applyInterpretedData( { try { - assert((*aDestIt).is()); + OSL_ASSERT( (*aDestIt).is()); (*aDestIt)->setDataSeries( *aSrcIt ); } catch( const uno::Exception & ex ) diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 524bf71dd99f..71867a64cbdc 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -189,7 +189,7 @@ void DataSourceDialog::setInvalidPage( TabPage * pTabPage ) if( ! (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid )) { m_pBtnOK->Enable( false ); - assert(m_pTabControl); + OSL_ASSERT( m_pTabControl ); // note: there seems to be no suitable mechanism to address pages by // identifier, at least it is unclear what the page identifiers are. // @todo: change the fixed numbers to identifiers @@ -211,7 +211,7 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage ) if( m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid ) { m_pBtnOK->Enable(); - assert(m_pTabControl); + OSL_ASSERT( m_pTabControl ); m_pTabControl->EnableTabToggling(); } } diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index edcc10b04ee4..6f8cc675d86f 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -598,7 +598,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) case TP_XERRORBAR: { ErrorBarsTabPage * pTabPage = dynamic_cast< ErrorBarsTabPage * >( &rPage ); - assert(pTabPage); + OSL_ASSERT( pTabPage ); if( pTabPage ) { pTabPage->SetAxisMinorStepWidthForErrorBarDecimals( m_fAxisMinorStepWidthForErrorBarDecimals ); @@ -610,7 +610,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) case TP_YERRORBAR: { ErrorBarsTabPage * pTabPage = dynamic_cast< ErrorBarsTabPage * >( &rPage ); - assert(pTabPage); + OSL_ASSERT( pTabPage ); if( pTabPage ) { pTabPage->SetAxisMinorStepWidthForErrorBarDecimals( m_fAxisMinorStepWidthForErrorBarDecimals ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 13d2e143c87b..97b5d31a4fe5 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -193,7 +193,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( m_apRangeSelectionHelper.reset( new RangeSelectionHelper( xChartDocument )); // has internal data provider => rename "cell range" to "from data" - assert(m_apRangeSelectionHelper.get()); + OSL_ASSERT( m_apRangeSelectionHelper.get()); if( m_bHasInternalDataProvider ) { m_pRbRange->SetText(m_pUIStringRbRange->GetText()); @@ -440,10 +440,10 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, Button*, void) IMPL_LINK( ErrorBarResources, ChooseRange, Button*, pButton, void ) { - assert(m_apRangeSelectionHelper.get()); + OSL_ASSERT( m_apRangeSelectionHelper.get()); if( ! m_apRangeSelectionHelper.get()) return; - assert(m_pCurrentRangeChoosingField == nullptr ); + OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); OUString aUIString; @@ -680,7 +680,7 @@ void ErrorBarResources::FillValueSets() void ErrorBarResources::listeningFinished( const OUString & rNewRange ) { - assert(m_apRangeSelectionHelper.get()); + OSL_ASSERT( m_apRangeSelectionHelper.get()); if( ! m_apRangeSelectionHelper.get()) return; @@ -707,14 +707,14 @@ void ErrorBarResources::listeningFinished( m_pCurrentRangeChoosingField = nullptr; UpdateControlStates(); - assert(m_pParentDialog); + OSL_ASSERT( m_pParentDialog ); if( m_pParentDialog ) lcl_enableRangeChoosing( false, m_pParentDialog ); } void ErrorBarResources::disposingRangeSelection() { - assert(m_apRangeSelectionHelper.get()); + OSL_ASSERT( m_apRangeSelectionHelper.get()); if( m_apRangeSelectionHelper.get()) m_apRangeSelectionHelper->stopRangeListening( false ); } diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 93820fd687ea..65a97b3d554f 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -566,7 +566,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) { - assert(m_pCurrentRangeChoosingField == nullptr); + OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_RANGE; if( !m_pEDT_RANGE->GetText().isEmpty() && ! updateModelFromControl( m_pCurrentRangeChoosingField )) @@ -607,7 +607,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void) { - assert(m_pCurrentRangeChoosingField == nullptr); + OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES; if( !m_pEDT_CATEGORIES->GetText().isEmpty() && ! updateModelFromControl( m_pCurrentRangeChoosingField )) diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 432d599cd002..c1005f5e0ef3 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -342,7 +342,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if( eKind == SdrHintKind::BeginEdit ) { // #i79965# remember map mode - assert(!m_bRestoreMapMode); + OSL_ASSERT( ! m_bRestoreMapMode ); OutputDevice* pOutDev = this->GetFirstOutputDevice(); if( pOutDev ) { @@ -353,7 +353,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) else if( eKind == SdrHintKind::EndEdit ) { // #i79965# scroll back view when ending text edit - assert(m_bRestoreMapMode); + OSL_ASSERT( m_bRestoreMapMode ); if( m_bRestoreMapMode ) { OutputDevice* pOutDev = this->GetFirstOutputDevice(); diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index e41664f4f018..4ba0b751ed3d 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -100,7 +100,7 @@ AxisItemConverter::AxisItemConverter( new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) ); - assert(m_xAxis.is()); + OSL_ASSERT( m_xAxis.is()); } AxisItemConverter::~AxisItemConverter() @@ -664,7 +664,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet if( ! aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() || aScale.IncrementData.SubIncrements[0].IntervalCount != aValue ) { - assert(aValue.getValueTypeClass() == uno::TypeClass_LONG); + OSL_ASSERT( aValue.getValueTypeClass() == uno::TypeClass_LONG ); aScale.IncrementData.SubIncrements[0].IntervalCount = aValue; bSetScale = true; } diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index c68666cf5941..b37123747c28 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -298,7 +298,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( { // no data range for error bars yet => create uno::Reference< chart2::XInternalDataProvider > xIntDataProvider( xDataProvider, uno::UNO_QUERY ); - assert(xIntDataProvider.is()); + OSL_ASSERT( xIntDataProvider.is()); if( xIntDataProvider.is()) { xIntDataProvider->appendSequence(); diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 0a4e1cfed184..a462d20cf88f 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -85,8 +85,8 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const SfxItemPool & rPool = GetItemPool(); assert(pRanges != nullptr); - assert(m_xPropertySetInfo.is()); - assert(m_xPropertySet.is()); + OSL_ASSERT( m_xPropertySetInfo.is()); + OSL_ASSERT( m_xPropertySet.is()); while( (*pRanges) != 0) { @@ -95,7 +95,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const sal_uInt16 nEnd = (*pRanges); ++pRanges; - assert(nBeg <= nEnd); + OSL_ASSERT( nBeg <= nEnd ); for( sal_uInt16 nWhich = nBeg; nWhich <= nEnd; ++nWhich ) { if( GetItemProperty( nWhich, aProperty )) @@ -166,7 +166,7 @@ bool ItemConverter::ApplySpecialItem( bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) { - assert(m_xPropertySet.is()); + OSL_ASSERT( m_xPropertySet.is()); bool bItemsChanged = false; SfxItemIter aIter( rItemSet ); diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index fd4b2f18b696..ef80018a7bb5 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -41,7 +41,7 @@ namespace template <class T, class D> bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID) { - assert(xProperties.is()); + OSL_ASSERT(xProperties.is()); if( xProperties.is() ) { T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue()); @@ -59,7 +59,7 @@ bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, co template <class T, class D> void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID) { - assert(xProperties.is()); + OSL_ASSERT(xProperties.is()); if( xProperties.is() ) { T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue()); @@ -72,7 +72,7 @@ void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::R void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID) { - assert(xProperties.is()); + OSL_ASSERT(xProperties.is()); if( xProperties.is() ) { double aValue = static_cast<const SvxDoubleItem&>(rItemSet.Get( nWhichId )).GetValue(); @@ -142,7 +142,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem( uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY ); bool bChanged = false; - assert(xCurve.is()); + OSL_ASSERT(xCurve.is()); if(!xCurve.is()) return false; @@ -255,7 +255,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem( void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const { uno::Reference<chart2::XRegressionCurve> xCurve(GetPropertySet(), uno::UNO_QUERY); - assert(xCurve.is()); + OSL_ASSERT(xCurve.is()); if(!xCurve.is()) return; diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 6defac735041..dc48db2d0fa9 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -174,7 +174,7 @@ uno::Reference< beans::XPropertySet > lcl_getCurveProperties( template <class T, class D> bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID) { - assert(xProperties.is()); + OSL_ASSERT(xProperties.is()); if( xProperties.is() ) { T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue()); @@ -192,7 +192,7 @@ bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, co template <class T, class D> void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID) { - assert(xProperties.is()); + OSL_ASSERT(xProperties.is()); if( xProperties.is() ) { T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue()); @@ -205,7 +205,7 @@ void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::R void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID) { - assert(xProperties.is()); + OSL_ASSERT(xProperties.is()); if( xProperties.is() ) { double aValue = static_cast<const SvxDoubleItem&>(rItemSet.Get( nWhichId )).GetValue(); @@ -582,7 +582,7 @@ bool StatisticsItemConverter::ApplySpecialItem( { // no data range for error bars yet => create uno::Reference< chart2::XInternalDataProvider > xIntDataProvider( xDataProvider, uno::UNO_QUERY ); - assert(xIntDataProvider.is()); + OSL_ASSERT( xIntDataProvider.is()); if( xIntDataProvider.is()) { xIntDataProvider->appendSequence(); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 99b3e95f07d4..b5577ff40f57 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -231,7 +231,7 @@ wrapper::ItemConverter* createItemConverter( if( !ColorPerPointHelper::hasPointOwnColor( xSeriesProp, nPointIndex, xObjectProperties ) ) { bUseSpecialFillColor = true; - assert(xDiagram.is()); + OSL_ASSERT( xDiagram.is()); uno::Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme() ); if( xColorScheme.is()) nSpecialFillColor = xColorScheme->getColorByIndex( nPointIndex ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index c32dc95c4b3d..53b7594e412a 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -239,7 +239,7 @@ void ChartController::executeDispatch_ScaleText() ControllerLockGuardUNO aCtlLockGuard( getModel() ); std::unique_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider()); - assert(pRefSizeProv.get()); + OSL_ASSERT( pRefSizeProv.get()); if (pRefSizeProv) pRefSizeProv->toggleAutoResizeState(); @@ -438,7 +438,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons { const Reference< lang::XMultiServiceFactory >& xShapeFactory( pDrawModelWrapper->getShapeFactory() ); const Reference< drawing::XDrawPage >& xDrawPage( pDrawModelWrapper->getMainDrawPage() ); - assert(xShapeFactory.is() && xDrawPage.is()); + OSL_ASSERT( xShapeFactory.is() && xDrawPage.is() ); if ( xShapeFactory.is() && xDrawPage.is() ) { diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index eb60b009a279..2ad50b7cc088 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1279,7 +1279,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) if( ! m_apAccelExecute.get() && m_xFrame.is() && m_xCC.is() ) { m_apAccelExecute = ::svt::AcceleratorExecute::createAcceleratorHelper(); - assert( m_apAccelExecute.get()); + OSL_ASSERT( m_apAccelExecute.get()); if( m_apAccelExecute.get() ) m_apAccelExecute->init( m_xCC, m_xFrame ); } diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index 193ed01cce71..937a11f168b1 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -160,7 +160,7 @@ namespace chart void ImplApplyDataToModel( const Reference< XModel >& i_model, const Reference< XInternalDataProvider > & i_data ) { Reference< XChartDocument > xDoc( i_model, UNO_QUERY ); - assert(xDoc.is() && xDoc->hasInternalDataProvider()); + OSL_ASSERT( xDoc.is() && xDoc->hasInternalDataProvider() ); // copy data from stored internal data provider if( xDoc.is() && xDoc->hasInternalDataProvider()) diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 30c7e797418b..42beadb65f8d 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -86,7 +86,7 @@ void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatu m_aListeners.begin(), tListenerMap::value_type( URL.Complete, new ::comphelper::OInterfaceContainerHelper2( m_aMutex ))); } - assert(aIt != m_aListeners.end()); + OSL_ASSERT( aIt != m_aListeners.end()); aIt->second->addInterface( Control ); fireStatusEvent( URL.Complete, Control ); diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index fd24342f3637..16b1f5902f75 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -488,7 +488,7 @@ void ControllerCommandDispatch::initialize() { Reference< frame::XModel > xModel( m_xChartController->getModel()); Reference< util::XModifyBroadcaster > xModifyBroadcaster( xModel, uno::UNO_QUERY ); - assert(xModifyBroadcaster.is()); + OSL_ASSERT( xModifyBroadcaster.is()); if( xModifyBroadcaster.is()) xModifyBroadcaster->addModifyListener( this ); @@ -522,8 +522,8 @@ void ControllerCommandDispatch::updateCommandAvailability() bool bModelStateIsValid = ( m_apModelState.get() != nullptr ); bool bControllerStateIsValid = ( m_apControllerState.get() != nullptr ); // Model and controller states exist. - assert(bModelStateIsValid); - assert(bControllerStateIsValid); + OSL_ASSERT( bModelStateIsValid ); + OSL_ASSERT( bControllerStateIsValid ); // read-only bool bIsWritable = bModelStateIsValid && (! m_apModelState->bIsReadOnly); diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 78bddb175ff8..3e9fd051127e 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -778,7 +778,7 @@ bool ObjectKeyNavigation::next() { ObjectHierarchy::tChildContainer::const_iterator aIt( std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection())); - assert(aIt != aSiblings.end()); + OSL_ASSERT( aIt != aSiblings.end()); if( ++aIt == aSiblings.end()) aIt = aSiblings.begin(); setCurrentSelection( *aIt ); @@ -798,7 +798,7 @@ bool ObjectKeyNavigation::previous() { ObjectHierarchy::tChildContainer::const_iterator aIt( std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection())); - assert(aIt != aSiblings.end()); + OSL_ASSERT( aIt != aSiblings.end()); if( aIt == aSiblings.begin()) aIt = aSiblings.end(); --aIt; @@ -825,7 +825,7 @@ bool ObjectKeyNavigation::down() if( bResult ) { ObjectHierarchy::tChildContainer aChildren = aHierarchy.getChildren( getCurrentSelection()); - assert(!aChildren.empty()); + OSL_ASSERT( !aChildren.empty()); setCurrentSelection( aChildren.front()); } return bResult; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 8c921eaeb88e..7b04bb4e4af4 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -50,7 +50,7 @@ void StatusBarCommandDispatch::initialize() if( m_xModifiable.is()) { Reference< util::XModifyBroadcaster > xModifyBroadcaster( m_xModifiable, uno::UNO_QUERY ); - assert(xModifyBroadcaster.is()); + OSL_ASSERT( xModifyBroadcaster.is()); if( xModifyBroadcaster.is()) xModifyBroadcaster->addModifyListener( this ); } diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 689ece847e94..69ac5871f21e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -328,10 +328,10 @@ void lcl_CloneSubGrids( } (*pDestIt) = xSubGrid; - assert( pDestIt != pDestEnd ); + OSL_ASSERT( pDestIt != pDestEnd ); ++pDestIt; } - assert( pDestIt == pDestEnd ); + OSL_ASSERT( pDestIt == pDestEnd ); (void)(pDestEnd); // avoid warning } diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 38d8a470811d..38694dcdf0e2 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -228,7 +228,7 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); - assert(m_aAllAxis.size() == static_cast< size_t >( getDimension())); + OSL_ASSERT( m_aAllAxis.size() == static_cast< size_t >( getDimension())); if( nAxisIndex < 0 || nAxisIndex > this->getMaximumAxisIndexByDimension(nDimensionIndex) ) throw lang::IndexOutOfBoundsException(); @@ -241,7 +241,7 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); - assert(m_aAllAxis.size() == static_cast< size_t >( getDimension())); + OSL_ASSERT( m_aAllAxis.size() == static_cast< size_t >( getDimension())); sal_Int32 nRet = m_aAllAxis[ nDimensionIndex ].size(); if(nRet) diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index c9a8bc6df1a1..834e05c9861c 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -521,7 +521,7 @@ void SAL_CALL ChartModel::load( } else { - assert( aMDHelper.ISSET_InputStream ); + OSL_ASSERT( aMDHelper.ISSET_InputStream ); // convert XInputStream to XStorage via the storage factory Sequence< uno::Any > aStorageArgs( 2 ); aStorageArgs[0] <<= aMDHelper.InputStream; diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 52f26a4e58d8..ec3e3cfe292d 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -196,7 +196,7 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder ); } - assert( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); + OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); if( rValue.hasValue() && (rValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index eb2ee2dbdd3c..6eebded278cb 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -284,7 +284,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder ); } - assert( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); + OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); if( rValue.hasValue() && (rValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index b2b7f34edea7..a43356152f7e 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -143,9 +143,9 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( xSeries.set( aSeriesToReUse[nSeriesIndex] ); else xSeries.set( new DataSeries ); - assert( xSeries.is() ); + OSL_ASSERT( xSeries.is() ); Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY ); - assert( xSink.is() ); + OSL_ASSERT( xSink.is() ); xSink->setData( comphelper::containerToSequence( aNewData ) ); aSeriesVec.push_back( xSeries ); diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 45a2f02dabbe..32cae2fa556c 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -304,7 +304,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder ); } - assert( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); + OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); if( rValue.hasValue() && (rValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 1c69a470f298..c98d79760cf9 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -544,7 +544,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // break; case TEMPLATE_NOT_FOUND: - assert(false); + OSL_ASSERT( false ); break; } xResult.set( xTemplate, uno::UNO_QUERY ); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 7458458d4047..cc7b5b833145 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -234,7 +234,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram > DiagramHelper::getChartTypesFromDiagram(xDiagram) ); Reference< XCoordinateSystemContainer > xCoordSysCnt( xDiagram, uno::UNO_QUERY ); - assert(xCoordSysCnt.is()); + OSL_ASSERT( xCoordSysCnt.is()); if( xCoordSysCnt.is()) { Sequence< Reference< XCoordinateSystem > > aCooSysSeq( @@ -466,7 +466,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram //iterate through all chart types in the current coordinate system uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY ); - assert(xChartTypeContainer.is()); + OSL_ASSERT( xChartTypeContainer.is()); if( !xChartTypeContainer.is() ) continue; uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() ); @@ -476,7 +476,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram //iterate through all series in this chart type uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); - assert(xDataSeriesContainer.is()); + OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) continue; @@ -836,7 +836,7 @@ void ChartTypeTemplate::createChartTypes( else { // reuse existing chart type - assert(xCT.is()); + OSL_ASSERT( xCT.is()); Reference< chart2::XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW ); Sequence< Reference< XDataSeries > > aNewSeriesSeq( xDSCnt->getDataSeries()); sal_Int32 nNewStartIndex = aNewSeriesSeq.getLength(); diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index e2c0ddd29eee..f6dd85178eec 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -313,7 +313,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( xColumnChartType.is() && xLineChartType.is()) { - assert(xColumnChartCooSys.is()); + OSL_ASSERT( xColumnChartCooSys.is()); // check stackmode of bars bResult = (xColumnChartCooSys->getDimension() == getDimension()); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 0e8917e1355c..f3000954d5ca 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -58,7 +58,7 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( InterpretedData aResult( DataInterpreter::interpretDataSource( xSource, aArguments, aSeriesToReUse )); // the base class should return one group - assert( aResult.Series.getLength() == 1 ); + OSL_ASSERT( aResult.Series.getLength() == 1 ); if( aResult.Series.getLength() == 1 ) { sal_Int32 nNumberOfSeries = aResult.Series[0].getLength(); diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index f67ccbc35e23..57f03562e85d 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -118,9 +118,9 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( xSeries.set( aSeriesToReUse[nSeriesIndex] ); else xSeries.set( new DataSeries ); - assert( xSeries.is() ); + OSL_ASSERT( xSeries.is() ); Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY ); - assert( xSink.is() ); + OSL_ASSERT( xSink.is() ); xSink->setData( aNewData ); aSeriesVec.push_back( xSeries ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index e2938628d8fa..bc29b89ac2b3 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -207,7 +207,7 @@ sal_Int32 StockChartTypeTemplate::getAxisCountByDimension( sal_Int32 nDimension return 0; // one or two y-axes depending on volume - assert( nDimension == 1 ); + OSL_ASSERT( nDimension == 1 ); bool bHasVolume = false; getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME ) >>= bHasVolume; return bHasVolume ? 2 : 1; diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index c3169299ba6b..b1844f1da84a 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -170,9 +170,9 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // 3. create series with remaining sequences if( bHasVolume && nRemaining > 1 ) { - assert( nVolumeSeries > nNumOfFullSeries ); + OSL_ASSERT( nVolumeSeries > nNumOfFullSeries ); aSequences[nBarGroupIndex][nVolumeSeries - 1].realloc( 1 ); - assert( nDataCount > nSourceIndex ); + OSL_ASSERT( nDataCount > nSourceIndex ); if( aData[nSourceIndex].is()) SetRole( aData[nSourceIndex]->getValues(), "values-y"); aSequences[nBarGroupIndex][nVolumeSeries - 1][0].set( aData[nSourceIndex] ); @@ -184,10 +184,10 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // candle-stick if( nRemaining > 0 ) { - assert( nCandleStickSeries > nNumOfFullSeries ); + OSL_ASSERT( nCandleStickSeries > nNumOfFullSeries ); const sal_Int32 nSeriesIndex = nCandleStickSeries - 1; aSequences[nCandleStickGroupIndex][nSeriesIndex].realloc( nRemaining ); - assert( nDataCount > nSourceIndex ); + OSL_ASSERT( nDataCount > nSourceIndex ); // 1. low sal_Int32 nSeqIdx( 0 ); @@ -238,9 +238,9 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( xSeries.set( rSeriesToReUse[nReUsedSeriesIdx] ); else xSeries.set( new DataSeries ); - assert( xSeries.is() ); + OSL_ASSERT( xSeries.is() ); Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY_THROW ); - assert( xSink.is() ); + OSL_ASSERT( xSink.is() ); xSink->setData( aSequences[nGroupIndex][nSeriesIdx] ); aResultSeries[nGroupIndex][nSeriesIdx].set( xSeries ); } @@ -289,7 +289,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( // 2. b. candlestick { - assert(aInterpretedData.Series.getLength() > (bHasVolume ? 1 : 0)); + OSL_ASSERT( aInterpretedData.Series.getLength() > (bHasVolume ? 1 : 0)); Sequence< Reference< XDataSeries > > aSeries( aInterpretedData.Series[(bHasVolume ? 1 : 0)] ); if(!aSeries.getLength()) return false; diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 7c0e37e40b16..c0d05a60ca98 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -127,9 +127,9 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( xSeries.set( aSeriesToReUse[nSeriesIndex] ); else xSeries.set( new DataSeries ); - assert( xSeries.is() ); + OSL_ASSERT( xSeries.is() ); Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY ); - assert( xSink.is() ); + OSL_ASSERT( xSink.is() ); xSink->setData( comphelper::containerToSequence( aNewData ) ); aSeriesVec.push_back( xSeries ); diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index d7921c9fb8b1..473d1eed8015 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -351,7 +351,7 @@ Reference< XAxis > AxisHelper::createAxis( Reference< XAxis > xAxis( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.chart2.Axis", xContext ), uno::UNO_QUERY ); - assert( xAxis.is()); + OSL_ASSERT( xAxis.is()); if( xAxis.is()) { xCooSys->setAxisByDimension( nDimensionIndex, xAxis, nAxisIndex ); @@ -439,7 +439,7 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis xAxis.set( AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, xContext, pRefSizeProvider ) ); } - assert( xAxis.is()); + OSL_ASSERT( xAxis.is()); if( !bNewAxisCreated ) //default is true already if created AxisHelper::makeAxisVisible( xAxis ); } diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index f1ad78f7fbfc..53c5705d6d44 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -150,7 +150,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const } else { - assert( m_eCurrentDataType == MIXED ); + OSL_ASSERT( m_eCurrentDataType == MIXED ); const Any * pMixedArray = m_aMixedSequence.getConstArray(); std::transform( pMixedArray, pMixedArray + nSize, pResultArray, @@ -180,7 +180,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const } else { - assert( m_eCurrentDataType == MIXED ); + OSL_ASSERT( m_eCurrentDataType == MIXED ); const Any * pMixedArray = m_aMixedSequence.getConstArray(); std::transform( pMixedArray, pMixedArray + nSize, pResultArray, @@ -211,7 +211,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const } else { - assert( m_eCurrentDataType == TEXTUAL ); + OSL_ASSERT( m_eCurrentDataType == TEXTUAL ); const OUString * pMixedArray = m_aTextualSequence.getConstArray(); std::transform( pMixedArray, pMixedArray + nSize, pResultArray, diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 223ef040dc4f..663f3b9c96a2 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -501,7 +501,7 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet( aValues[ i++ ] >>= aResult.Underline; aValues[ i++ ] >>= aResult.Weight; aValues[ i++ ] >>= aResult.WordLineMode; - assert( i == aValues.getLength()); + OSL_ASSERT( i == aValues.getLength()); return aResult; } diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index 3c749d5d57f8..436c1050ac6c 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -421,7 +421,7 @@ uno::Sequence< double > DataSequenceToDoubleSequence( const uno::Reference< data::XDataSequence >& xDataSequence ) { uno::Sequence< double > aResult; - assert( xDataSequence.is()); + OSL_ASSERT( xDataSequence.is()); if(!xDataSequence.is()) return aResult; diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index b61b84d29f45..e4792d415ecf 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -125,7 +125,7 @@ void ConfigColorScheme::retrieveConfigColors() new impl::ChartConfigItem( *this )); m_apChartConfigItem->addPropertyNotification( aSeriesPropName ); } - assert( m_apChartConfigItem.get()); + OSL_ASSERT( m_apChartConfigItem.get()); if( ! m_apChartConfigItem.get()) return; diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index a5958fa8ddee..3bc8e462a839 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -291,7 +291,7 @@ void DiagramHelper::setStackMode( //iterate through all series in this chart type uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); - assert( xDataSeriesContainer.is()); + OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) continue; @@ -380,7 +380,7 @@ StackMode DiagramHelper::getStackModeFromChartType( chart2::StackingDirection eCurrentDirection = eCommonDirection; // property is not MAYBEVOID bool bSuccess = ( xProp->getPropertyValue( "StackingDirection" ) >>= eCurrentDirection ); - assert( bSuccess ); + OSL_ASSERT( bSuccess ); (void)(bSuccess); // avoid warning in non-debug builds if( ! bDirectionInitialized ) { @@ -532,7 +532,7 @@ void DiagramHelper::replaceCoordinateSystem( const Reference< XCoordinateSystem > & xCooSysToReplace, const Reference< XCoordinateSystem > & xReplacement ) { - assert( xDiagram.is()); + OSL_ASSERT( xDiagram.is()); if( ! xDiagram.is()) return; @@ -645,7 +645,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( //iterate through all chart types in the current coordinate system uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY ); - assert( xChartTypeContainer.is()); + OSL_ASSERT( xChartTypeContainer.is()); if( !xChartTypeContainer.is() ) continue; uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() ); @@ -655,7 +655,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( //iterate through all series in this chart type uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); - assert( xDataSeriesContainer.is()); + OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) continue; @@ -781,14 +781,14 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram( for( sal_Int32 i=0; i<aCooSysSeq.getLength(); ++i ) { Reference< XCoordinateSystem > xCooSys( aCooSysSeq[i] ); - assert( xCooSys.is()); + OSL_ASSERT( xCooSys.is()); for( sal_Int32 nN = xCooSys->getDimension(); nN--; ) { const sal_Int32 nMaximumScaleIndex = xCooSys->getMaximumAxisIndexByDimension(nN); for(sal_Int32 nI=0; nI<=nMaximumScaleIndex; ++nI) { Reference< XAxis > xAxis = xCooSys->getAxisByDimension( nN,nI ); - assert( xAxis.is()); + OSL_ASSERT( xAxis.is()); if( xAxis.is()) { ScaleData aScaleData = xAxis->getScaleData(); @@ -828,14 +828,14 @@ bool DiagramHelper::isCategoryDiagram( for( sal_Int32 i=0; i<aCooSysSeq.getLength(); ++i ) { Reference< XCoordinateSystem > xCooSys( aCooSysSeq[i] ); - assert( xCooSys.is()); + OSL_ASSERT( xCooSys.is()); for( sal_Int32 nN = xCooSys->getDimension(); nN--; ) { const sal_Int32 nMaximumScaleIndex = xCooSys->getMaximumAxisIndexByDimension(nN); for(sal_Int32 nI=0; nI<=nMaximumScaleIndex; ++nI) { Reference< XAxis > xAxis = xCooSys->getAxisByDimension( nN,nI ); - assert( xAxis.is()); + OSL_ASSERT( xAxis.is()); if( xAxis.is()) { ScaleData aScaleData = xAxis->getScaleData(); @@ -1314,7 +1314,7 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed( //iterate through all chart types in the current coordinate system uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY ); - assert( xChartTypeContainer.is()); + OSL_ASSERT( xChartTypeContainer.is()); if( !xChartTypeContainer.is() ) continue; uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() ); @@ -1326,7 +1326,7 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed( //iterate through all series in this chart type uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xCurrentChartType, uno::UNO_QUERY ); - assert( xDataSeriesContainer.is()); + OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) continue; diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 2e6e0f8ec8bf..e24695621824 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -307,7 +307,7 @@ bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount ) void InternalData::insertColumn( sal_Int32 nAfterIndex ) { // note: -1 is allowed, as we insert after the given index - assert( nAfterIndex < m_nColumnCount && nAfterIndex >= -1 ); + OSL_ASSERT( nAfterIndex < m_nColumnCount && nAfterIndex >= -1 ); if( nAfterIndex >= m_nColumnCount || nAfterIndex < -1 ) return; sal_Int32 nNewColumnCount = m_nColumnCount + 1; @@ -364,7 +364,7 @@ sal_Int32 InternalData::getColumnCount() const void InternalData::insertRow( sal_Int32 nAfterIndex ) { // note: -1 is allowed, as we insert after the given index - assert( nAfterIndex < m_nRowCount && nAfterIndex >= -1 ); + OSL_ASSERT( nAfterIndex < m_nRowCount && nAfterIndex >= -1 ); if( nAfterIndex >= m_nRowCount || nAfterIndex < -1 ) return; sal_Int32 nNewRowCount = m_nRowCount + 1; @@ -401,7 +401,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex ) void InternalData::deleteColumn( sal_Int32 nAtIndex ) { - assert( nAtIndex < m_nColumnCount && nAtIndex >= 0 ); + OSL_ASSERT( nAtIndex < m_nColumnCount && nAtIndex >= 0 ); if( nAtIndex >= m_nColumnCount || m_nColumnCount < 1 || nAtIndex < 0 ) return; sal_Int32 nNewColumnCount = m_nColumnCount - 1; @@ -435,7 +435,7 @@ void InternalData::deleteColumn( sal_Int32 nAtIndex ) void InternalData::deleteRow( sal_Int32 nAtIndex ) { - assert( nAtIndex < m_nRowCount && nAtIndex >= 0 ); + OSL_ASSERT( nAtIndex < m_nRowCount && nAtIndex >= 0 ); if( nAtIndex >= m_nRowCount || m_nRowCount < 1 || nAtIndex < 0 ) return; sal_Int32 nNewRowCount = m_nRowCount - 1; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index da95f3486543..fa77624adc44 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -712,7 +712,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData return new DataSource( comphelper::containerToSequence(aComplexCategories) ); } - assert( aRangeRepresentation == lcl_aCompleteRange ); + OSL_ASSERT( aRangeRepresentation == lcl_aCompleteRange ); std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec; @@ -799,7 +799,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa { if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { - assert( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested + OSL_ASSERT( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested // categories return createDataSequenceAndAddToMap( lcl_aCategoriesRangeName, lcl_aCategoriesRoleName ); @@ -846,7 +846,7 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt if( aRange.match( lcl_aCategoriesRangeName )) { - assert( aRange == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested + OSL_ASSERT( aRange == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested bResult = true; } else if( aRange.match( lcl_aLabelRangePrefix )) @@ -1155,7 +1155,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang // @todo: add this information in the range representation strings if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { - assert( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested + OSL_ASSERT( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested aRange.aUpperLeft.bIsEmpty = false; if( m_bDataInColumns ) { diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index dcd9851b7058..6d662c1d252d 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -80,7 +80,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( fErrorSum += (v*v); } } - assert( fErrorSum >= 0.0 ); + OSL_ASSERT( fErrorSum >= 0.0 ); m_fCorrelationCoeffitient = sqrt( fErrorSum / (nMax - 1 )); } } diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 5b613629032b..8741037b6014 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -41,7 +41,7 @@ struct lcl_EqualsElement : public std::unary_function< OUString, bool > explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess ) : m_aValue( rValue ), m_xAccess( xAccess ) { - assert( m_xAccess.is()); + OSL_ASSERT( m_xAccess.is()); } bool operator() ( const OUString & rName ) @@ -155,7 +155,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable( aUniqueName = rPrefix + OUString::number( nIndex ); } - assert( !aUniqueName.isEmpty()); + OSL_ASSERT( !aUniqueName.isEmpty()); xNameContainer->insertByName( aUniqueName, rValue ); return aUniqueName; } diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx index 0c7d6171bdf2..a205d75d6448 100644 --- a/chart2/source/tools/RelativePositionHelper.cxx +++ b/chart2/source/tools/RelativePositionHelper.cxx @@ -304,7 +304,7 @@ bool RelativePositionHelper::centerGrow( } // anchor must not be changed - assert( rInOutPosition.Anchor == aPos.Anchor ); + OSL_ASSERT( rInOutPosition.Anchor == aPos.Anchor ); if( rInOutPosition.Primary == aPos.Primary && rInOutPosition.Secondary == aPos.Secondary && diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx index 07b27fc61a8c..3f3fb615697a 100644 --- a/chart2/source/tools/ResourceManager.cxx +++ b/chart2/source/tools/ResourceManager.cxx @@ -30,7 +30,7 @@ ResMgr & ResourceManager::getResourceManager() static ResMgr * pResourceManager = nullptr; if( ! pResourceManager ) pResourceManager = ResMgr::CreateResMgr("chartcontroller"); - assert( pResourceManager ); + OSL_ASSERT( pResourceManager ); return *pResourceManager; } diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 94aa4faedd0e..f7f1ff7ef1d8 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -313,7 +313,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( xErrorBar.set( new ErrorBar ); } - assert( xErrorBar.is()); + OSL_ASSERT( xErrorBar.is()); if( xErrorBar.is()) { xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle )); diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 3d94de98e9eb..b3cd9a77c67f 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 - assert( nResolution > 1 ); - assert( nDegree >= 1 ); + OSL_ASSERT( nResolution > 1 ); + OSL_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 3fee4195e507..38a6bb865730 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 ) { - assert(xEquationProperties.is()); + OSL_ASSERT( xEquationProperties.is()); if( !xEquationProperties.is()) return; @@ -1317,7 +1317,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( xEquationTarget, aFormula.makeStringAndClear(), aNames, aValues, AbstractShapeFactory::makeTransformation( aScreenPosition2D )); - assert(xTextShape.is()); + OSL_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 ); - assert(xPointSet.is()); + OSL_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 4cd9c8362d88..ccaa3f868444 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 ); - assert(xCooSysContainer.is()); + OSL_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 ); - assert(xChartTypeContainer.is()); + OSL_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 ); - assert(xDataSeriesContainer.is()); + OSL_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 ); - assert(xChartTypeContainer.is()); + OSL_ASSERT( xChartTypeContainer.is()); if( !xChartTypeContainer.is() ) return; @@ -3437,7 +3437,7 @@ void ChartView::createShapes3D() } uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); - assert(xDataSeriesContainer.is()); + OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) return; diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index effa91d53028..bf51d0bd64d8 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 ); - assert(aTextShapes.size() == rEntries.size()); + OSL_ASSERT( aTextShapes.size() == rEntries.size()); sal_Int32 nMaxEntryWidth = nXOffset + nSymbolPlusDistanceWidth + aMaxEntryExtent.Width; sal_Int32 nMaxEntryHeight = nYOffset + aMaxEntryExtent.Height; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 14a6d93ef334..a63e1cd6ffe7 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1987,7 +1987,7 @@ void release(oslInterlockedCount& _refCount, } // only the alive ref holds the object - assert( _refCount == 1 ); + OSL_ASSERT( _refCount == 1 ); // release the parent in the ~ if (xParent.is()) diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index ce33cb7dde00..22ac35d02d9f 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -317,7 +317,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath) { - assert(_rxConfProvider.is()); + OSL_ASSERT(_rxConfProvider.is()); Sequence< Any > args(1); args[0] <<= NamedValue( "nodepath", makeAny(_rPath)); Reference< XInterface > xInterface( diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index c1a8c3e7da2c..283700649dea 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -199,7 +199,7 @@ bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu } catch (Exception&) { - assert(false); + OSL_ASSERT(false); return false; } return true; diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index b1a5949af405..8a343a3404a9 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -658,7 +658,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName } catch(const Exception&) { - assert(false); + OSL_ASSERT(false); } return sURL; } @@ -2564,7 +2564,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) } else { - assert(false); + OSL_ASSERT(false); } } // for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.db_anz;++nRowPos) } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index af4cabf2f4dd..9fe66357e010 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -274,7 +274,7 @@ namespace connectivity _pObject->dispose(); // only the alive ref holds the object - assert( _refCount == 1 ); + OSL_ASSERT( _refCount == 1 ); // release the parent in the ~ if (xParent.is()) diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 31e44ca95f20..06ae56b2fea7 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -486,7 +486,7 @@ OUString OFlatTable::getEntry() } catch(const Exception&) { - assert(false); + OSL_ASSERT(false); } return sURL; } diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 0dca4e127767..fce0c21ccd8e 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -130,7 +130,7 @@ bool loadClass( OUString const & classPath, OUString const & name, LocalRef< jobject > * classLoaderPtr, LocalRef< jclass > * classPtr) { - assert(classLoaderPtr != nullptr); + OSL_ASSERT(classLoaderPtr != nullptr); // For any jweak entries still present in the map upon destruction, // DeleteWeakGlobalRef is not called (which is a leak): ClassMapData * d = diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index e3050a50da81..eb80ca6590a7 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -222,7 +222,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse lcl_throwError(STR_QUERY_TOO_COMPLEX); // Unreachable: - assert(false); + OSL_ASSERT(false); return nullptr; } @@ -268,7 +268,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo } lcl_throwError(STR_QUERY_TOO_COMPLEX); // Unreachable: - assert(false); + OSL_ASSERT(false); return nullptr; } diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx index b9c036670fc9..e86ea64efa4d 100644 --- a/connectivity/source/drivers/kab/kfields.cxx +++ b/connectivity/source/drivers/kab/kfields.cxx @@ -79,7 +79,7 @@ sal_uInt32 findKabField(const OUString& columnName) ) ); ::dbtools::throwGenericSQLException(sError,nullptr); // Unreachable: - assert(false); + OSL_ASSERT(false); return 0; } diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index cac20fa7e341..721bbe36c087 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -222,7 +222,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP } impl_throwError(STR_QUERY_TOO_COMPLEX); // Unreachable: - assert(false); + OSL_ASSERT(false); return nullptr; } @@ -268,7 +268,7 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar } impl_throwError(STR_QUERY_TOO_COMPLEX); // Unreachable: - assert(false); + OSL_ASSERT(false); return nullptr; } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index d3fcf9e2d026..122efca9e511 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -155,7 +155,7 @@ Any Container::getByName( const OUString& aName ) "Element " + aName + " unknown in " + m_type + "-Container", *this ); } - assert( ii->second >= 0 && ii->second < (int)m_values.size() ); + OSL_ASSERT( ii->second >= 0 && ii->second < (int)m_values.size() ); return m_values[ ii->second ]; } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 8130cff131b1..b2f1d43a05d9 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1186,7 +1186,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString } catch ( Exception& ) { - assert(false); + OSL_ASSERT(false); } if (m_nFormatKey && m_xFormatter.is()) diff --git a/cppcanvas/source/mtfrenderer/emfpfont.cxx b/cppcanvas/source/mtfrenderer/emfpfont.cxx index f618719ade35..2df7981e6ab6 100755 --- a/cppcanvas/source/mtfrenderer/emfpfont.cxx +++ b/cppcanvas/source/mtfrenderer/emfpfont.cxx @@ -51,7 +51,7 @@ namespace cppcanvas s.ReadUInt32(header).ReadFloat(emSize).ReadUInt32(sizeUnit).ReadInt32(fontFlags).ReadUInt32(reserved).ReadUInt32(length); - assert((header >> 12) == 0xdbc01); + OSL_ASSERT((header >> 12) == 0xdbc01); SAL_INFO("cppcanvas.emf", "EMF+\tfont\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec); SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << " reserved: 0x" << reserved << " length: 0x" << std::hex << length << std::dec); diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 6d264b5806ac..4d4bfb528d61 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -440,7 +440,7 @@ namespace cppcanvas int length = aStartColor.getLength (); uno::Sequence< double > aColor (length); - assert (length == aEndColor.getLength()); + OSL_ASSERT (length == aEndColor.getLength()); for (int i = 0; i < brush->blendPoints; i++) { aStops[i] = brush->blendPositions [i]; diff --git a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx index d23c0173daab..01bbb4aae874 100755 --- a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx +++ b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx @@ -52,7 +52,7 @@ namespace cppcanvas s.ReadFloat(firstTabOffset).ReadInt32(hotkeyPrefix).ReadFloat(leadingMargin).ReadFloat(trailingMargin).ReadFloat(tracking); s.ReadInt32(trimming).ReadInt32(tabStopCount).ReadInt32(rangeCount); - assert((header >> 12) == 0xdbc01); + OSL_ASSERT((header >> 12) == 0xdbc01); SAL_INFO("cppcanvas.emf", "EMF+\t string format\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " StringFormatFlags: " << std::dec << stringFormatFlags << " Language: " << language); SAL_INFO("cppcanvas.emf", "EMF+\t StringAlignment: " << stringAlignment << " LineAlign: " << lineAlign << " DigitSubstitution: " << digitSubstitution << " DigitLanguage: " << digitLanguage); diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 0ae89bb71582..6d194517bf56 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -174,8 +174,8 @@ AffineBridge::~AffineBridge() void AffineBridge::outerDispatch(bool loop) { - assert(m_outerThreadId == osl::Thread::getCurrentIdentifier()); - assert(m_innerThreadId != m_outerThreadId); + OSL_ASSERT(m_outerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId != m_outerThreadId); Msg mm; @@ -213,8 +213,8 @@ void AffineBridge::outerDispatch(bool loop) void AffineBridge::innerDispatch() { - assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); - assert(m_innerThreadId != m_outerThreadId); + OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId != m_outerThreadId); Msg mm; @@ -275,7 +275,7 @@ void AffineBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) void AffineBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) { - assert(m_innerThreadId); + OSL_ASSERT(m_innerThreadId); osl::MutexGuard guard(m_innerMutex); @@ -310,14 +310,14 @@ void AffineBridge::v_enter() if (!m_enterCount) m_innerThreadId = osl::Thread::getCurrentIdentifier(); - assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); ++ m_enterCount; } void AffineBridge::v_leave() { - assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); -- m_enterCount; if (!m_enterCount) diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index b5d72a6771f1..604369d85186 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -62,7 +62,7 @@ LogBridge::LogBridge() LogBridge::~LogBridge() { - assert(m_count >= 0); + OSL_ASSERT(m_count >= 0); } void LogBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) @@ -74,7 +74,7 @@ void LogBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) void LogBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) { - assert(m_count > 0); + OSL_ASSERT(m_count > 0); -- m_count; pCallee(pParam); @@ -88,7 +88,7 @@ void LogBridge::v_enter() { m_mutex.acquire(); - assert(m_count >= 0); + OSL_ASSERT(m_count >= 0); if (m_count == 0) m_threadId = osl::Thread::getCurrentIdentifier(); @@ -98,7 +98,7 @@ void LogBridge::v_enter() void LogBridge::v_leave() { - assert(m_count > 0); + OSL_ASSERT(m_count > 0); -- m_count; if (!m_count) diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index dfafe2b181dc..8f46ce7a875a 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -146,7 +146,7 @@ void Mapping::mapInterface( uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr) { - assert(ppOut && pTypeDescr); + OSL_ASSERT(ppOut && pTypeDescr); if (*ppOut) { (*ppOut)->release(*ppOut); @@ -160,7 +160,7 @@ void Mapping::mapInterface( // need to enter environment because of potential "queryInterface" call rtl_uString * pOId = nullptr; uno_Environment_invoke(m_from.get(), s_getIdentifier_v, m_from.get(), &pOId, pUnoI); - assert(pOId); + OSL_ASSERT(pOId); // try to get any known interface from target environment m_to.get()->pExtEnv->getRegisteredInterface(m_to.get()->pExtEnv, reinterpret_cast<void **>(ppOut), pOId, pTypeDescr); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index ca0fffd2f4ab..0b81cea8130d 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -312,7 +312,7 @@ void Proxy::acquire() Proxy_free, m_aOId.pData, m_pTypeDescr); - assert(pThis == this); + OSL_ASSERT(pThis == this); } if (m_probeFun) diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index be679ef65c6f..1b82a02d30cc 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -181,7 +181,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext( SAL_THROW_EXTERN_C() { IdContainer * pId = getIdContainer(); - assert( pId ); + OSL_ASSERT( pId ); // free old one if (pId->pCurrentContext) @@ -199,7 +199,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext( { uno_Environment * pEnv = nullptr; ::uno_getEnvironment( &pEnv, pEnvTypeName, pEnvContext ); - assert( pEnv && pEnv->pExtEnv ); + OSL_ASSERT( pEnv && pEnv->pExtEnv ); if (pEnv) { if (pEnv->pExtEnv) @@ -228,7 +228,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( SAL_THROW_EXTERN_C() { IdContainer * pId = getIdContainer(); - assert( pId ); + OSL_ASSERT( pId ); Environment target_env; @@ -236,11 +236,11 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( if (*ppCurrentContext) { target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); - assert( target_env.is() ); + OSL_ASSERT( target_env.is() ); if (! target_env.is()) return false; uno_ExtEnvironment * pEnv = target_env.get()->pExtEnv; - assert( nullptr != pEnv ); + OSL_ASSERT( nullptr != pEnv ); if (nullptr == pEnv) return false; (*pEnv->releaseInterface)( pEnv, *ppCurrentContext ); @@ -255,13 +255,13 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( if (! target_env.is()) { target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); - assert( target_env.is() ); + OSL_ASSERT( target_env.is() ); if (! target_env.is()) return false; } Mapping mapping(&pId->pCurrentContextEnv->aBase, target_env.get()); - assert( mapping.is() ); + OSL_ASSERT( mapping.is() ); if (! mapping.is()) return false; diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx index 81246cf25111..2d375dcf8bbd 100644 --- a/cppu/source/threadpool/jobqueue.cxx +++ b/cppu/source/threadpool/jobqueue.cxx @@ -89,7 +89,7 @@ namespace cppu_threadpool { break; } - assert(!m_lstJob.empty()); + OSL_ASSERT( ! m_lstJob.empty() ); if( ! m_lstJob.empty() ) { job = m_lstJob.front(); diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index 09ad6442c84f..8dfa93bd443f 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -157,7 +157,7 @@ namespace cppu_threadpool { { if ( !uno_bindIdToCurrentThread( m_aThreadId.getHandle() ) ) { - assert(false); + OSL_ASSERT( false ); } } diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx index e27fcac87269..24037f6e4d2e 100644 --- a/cppu/source/threadpool/threadident.cxx +++ b/cppu/source/threadpool/threadident.cxx @@ -84,9 +84,9 @@ extern "C" void SAL_CALL uno_releaseIdFromCurrentThread() SAL_THROW_EXTERN_C() { IdContainer *p = getIdContainer(); - assert( p ); - assert( p->bInit ); - assert( p->nRefCountOfCurrentId ); + OSL_ASSERT( p ); + OSL_ASSERT( p->bInit ); + OSL_ASSERT( p->nRefCountOfCurrentId ); p->nRefCountOfCurrentId --; if( ! p->nRefCountOfCurrentId && (p->pLocalThreadId != p->pCurrentId) ) @@ -110,7 +110,7 @@ extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId } else { - assert( 0 == p->nRefCountOfCurrentId ); + OSL_ASSERT( 0 == p->nRefCountOfCurrentId ); if( 0 == p->nRefCountOfCurrentId ) { rtl_byte_sequence_assign(&( p->pCurrentId ), pThreadId ); diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 853325bb69f3..a508f56e6aec 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -158,7 +158,7 @@ namespace cppu_threadpool // thread wasn't reused, remove it from the list WaitingThreadList::iterator ii = find( m_lstThreads.begin(), m_lstThreads.end(), &waitingThread ); - assert( ii != m_lstThreads.end() ); + OSL_ASSERT( ii != m_lstThreads.end() ); m_lstThreads.erase( ii ); } } @@ -212,7 +212,7 @@ namespace cppu_threadpool MutexGuard guard( m_mutex ); ThreadIdHashMap::iterator ii = m_mapQueue.find( aThreadId ); - assert( ii != m_mapQueue.end() ); + OSL_ASSERT( ii != m_mapQueue.end() ); if( bAsynchron ) { @@ -266,7 +266,7 @@ namespace cppu_threadpool { m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( nullptr , nullptr ); ii = m_mapQueue.find( aThreadId ); - assert( ii != m_mapQueue.end() ); + OSL_ASSERT( ii != m_mapQueue.end() ); } if( bAsynchron ) @@ -323,11 +323,11 @@ namespace cppu_threadpool ThreadIdHashMap::iterator ii = m_mapQueue.find( aThreadId ); - assert( ii != m_mapQueue.end() ); + OSL_ASSERT( ii != m_mapQueue.end() ); pQueue = (*ii).second.first; } - assert( pQueue ); + OSL_ASSERT( pQueue ); void *pReturn = pQueue->enter( nDisposeId ); if( pQueue->isCallstackEmpty() ) @@ -477,12 +477,12 @@ uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() bool empty; { - assert( g_pThreadpoolHashSet ); + OSL_ASSERT( g_pThreadpoolHashSet ); MutexGuard guard( Mutex::getGlobalMutex() ); ThreadpoolHashSet::iterator ii = g_pThreadpoolHashSet->find( hPool ); - assert( ii != g_pThreadpoolHashSet->end() ); + OSL_ASSERT( ii != g_pThreadpoolHashSet->end() ); g_pThreadpoolHashSet->erase( ii ); delete hPool; diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 4c75593558a8..f869e795c077 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -100,7 +100,7 @@ static inline bool reallyWeak( typelib_TypeClass eTypeClass ) static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass ) { - assert( typelib_TypeClass_TYPEDEF != eTypeClass ); + OSL_ASSERT( typelib_TypeClass_TYPEDEF != eTypeClass ); sal_Int32 nSize; // The reference is the description @@ -275,7 +275,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() i != ppTDR.end(); ++i ) { typelib_TypeDescriptionReference * pTDR = *i; - assert( pTDR->nRefCount > pTDR->nStaticRefCount ); + OSL_ASSERT( pTDR->nRefCount > pTDR->nStaticRefCount ); pTDR->nRefCount -= pTDR->nStaticRefCount; if( pTDR->pType && !pTDR->pType->bOnDemand ) @@ -381,7 +381,7 @@ static inline void typelib_typedescription_initTables( { typelib_TypeDescription * pM = nullptr; TYPELIB_DANGER_GET( &pM, pITD->ppAllMembers[i] ); - assert( pM ); + OSL_ASSERT( pM ); if (pM) { aReadWriteAttributes[i] = !reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>(pM)->bReadOnly; @@ -457,7 +457,7 @@ void freeTypeDescription(typelib_TypeDescription const * desc) { bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { if (! (*ppTypeDescr)->bComplete) { - assert( (typelib_TypeClass_STRUCT == (*ppTypeDescr)->eTypeClass || + OSL_ASSERT( (typelib_TypeClass_STRUCT == (*ppTypeDescr)->eTypeClass || typelib_TypeClass_EXCEPTION == (*ppTypeDescr)->eTypeClass || typelib_TypeClass_ENUM == (*ppTypeDescr)->eTypeClass || typelib_TypeClass_INTERFACE == (*ppTypeDescr)->eTypeClass) && @@ -482,12 +482,12 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { { typelib_typedescriptionreference_getDescription( &pTD, reinterpret_cast<typelib_IndirectTypeDescription *>(pTD)->pType ); - assert( pTD ); + OSL_ASSERT( pTD ); if (! pTD) return false; } - assert( typelib_TypeClass_TYPEDEF != pTD->eTypeClass ); + OSL_ASSERT( typelib_TypeClass_TYPEDEF != pTD->eTypeClass ); // typedescription found // set to on demand pTD->bOnDemand = true; @@ -496,7 +496,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { && !pTD->bComplete && initTables) { // mandatory info from callback chain - assert( reinterpret_cast<typelib_InterfaceTypeDescription *>(pTD)->ppAllMembers ); + OSL_ASSERT( reinterpret_cast<typelib_InterfaceTypeDescription *>(pTD)->ppAllMembers ); // complete except of tables init typelib_typedescription_initTables( pTD ); pTD->bComplete = true; @@ -505,7 +505,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { // The type description is hold by the reference until // on demand is activated. ::typelib_typedescription_register( &pTD ); // replaces incomplete one - assert( pTD == *ppTypeDescr ); // has to merge into existing one + OSL_ASSERT( pTD == *ppTypeDescr ); // has to merge into existing one // insert into the chache MutexGuard aGuard( rInit.getMutex() ); @@ -520,7 +520,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { typelib_typedescription_acquire( pTD ); rInit.pCache->push_back( pTD ); - assert( + OSL_ASSERT( pTD->bComplete || (pTD->eTypeClass == typelib_TypeClass_INTERFACE && !initTables)); @@ -553,7 +553,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty( *ppRet = nullptr; } - assert( typelib_TypeClass_TYPEDEF != eTypeClass ); + OSL_ASSERT( typelib_TypeClass_TYPEDEF != eTypeClass ); typelib_TypeDescription * pRet; switch( eTypeClass ) @@ -711,7 +711,7 @@ void newTypeDescription( sal_Int32 nMembers, typelib_CompoundMember_Init * pCompoundMembers, typelib_StructMember_Init * pStructMembers) { - assert( + OSL_ASSERT( (pCompoundMembers == nullptr || pStructMembers == nullptr) && (pStructMembers == nullptr || eTypeClass == typelib_TypeClass_STRUCT)); if (typelib_TypeClass_TYPEDEF == eTypeClass) @@ -727,7 +727,7 @@ void newTypeDescription( { case typelib_TypeClass_SEQUENCE: { - assert( nMembers == 0 ); + OSL_ASSERT( nMembers == 0 ); typelib_typedescriptionreference_acquire( pType ); reinterpret_cast<typelib_IndirectTypeDescription *>(*ppRet)->pType = pType; } @@ -755,7 +755,7 @@ void newTypeDescription( pTmp->ppMemberNames = new rtl_uString *[ nMembers ]; bool polymorphic = eTypeClass == typelib_TypeClass_STRUCT && rtl::OUString::unacquired(&pTypeName).indexOf('<') >= 0; - assert(!polymorphic || pStructMembers != nullptr); + OSL_ASSERT(!polymorphic || pStructMembers != nullptr); if (polymorphic) { reinterpret_cast< typelib_StructTypeDescription * >(pTmp)-> pParameterizedTypes = new sal_Bool[nMembers]; @@ -958,11 +958,11 @@ void BaseList::calculate( e.directBaseMemberOffset = *directBaseMembers; e.base = desc; list.push_back(e); - assert(desc->ppAllMembers != nullptr); + OSL_ASSERT(desc->ppAllMembers != nullptr); members += desc->nMembers; } if (directBaseSet.insert(desc->aBase.pTypeName).second) { - assert(desc->ppAllMembers != nullptr); + OSL_ASSERT(desc->ppAllMembers != nullptr); *directBaseMembers += desc->nMembers; } } @@ -1004,10 +1004,10 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface( &pITD->ppBaseTypes[i]), false)) { - assert(false); + OSL_ASSERT(false); return; } - assert(pITD->ppBaseTypes[i] != nullptr); + OSL_ASSERT(pITD->ppBaseTypes[i] != nullptr); } if (nBaseInterfaces > 0) { pITD->pBaseTypeDescription = pITD->ppBaseTypes[0]; @@ -1036,7 +1036,7 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface( typelib_InterfaceTypeDescription const * pBase = i->base; typelib_InterfaceTypeDescription const * pDirectBase = pITD->ppBaseTypes[i->directBaseIndex]; - assert(pBase->ppAllMembers != nullptr); + OSL_ASSERT(pBase->ppAllMembers != nullptr); for (sal_Int32 j = 0; j < pBase->nMembers; ++j) { typelib_TypeDescriptionReference const * pDirectBaseMember = pDirectBase->ppAllMembers[i->directBaseMemberOffset + j]; @@ -1085,7 +1085,7 @@ namespace { typelib_TypeDescriptionReference ** copyExceptions( sal_Int32 count, rtl_uString ** typeNames) { - assert(count >= 0); + OSL_ASSERT(count >= 0); if (count == 0) { return nullptr; } @@ -1170,7 +1170,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( (*ppRet)->ppExceptions = copyExceptions(nExceptions, ppExceptionNames); (*ppRet)->pInterface = pInterface; (*ppRet)->pBaseRef = nullptr; - assert( + OSL_ASSERT( (nAbsolutePosition >= pInterface->nAllMembers - pInterface->nMembers) && nAbsolutePosition < pInterface->nAllMembers); (*ppRet)->nIndex = nAbsolutePosition @@ -1242,7 +1242,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( (*ppRet)->bReadOnly = bReadOnly; (*ppRet)->pInterface = pInterface; (*ppRet)->pBaseRef = nullptr; - assert( + OSL_ASSERT( (nAbsolutePosition >= pInterface->nAllMembers - pInterface->nMembers) && nAbsolutePosition < pInterface->nAllMembers); (*ppRet)->nIndex = nAbsolutePosition @@ -1283,7 +1283,7 @@ void deleteExceptions( static inline void typelib_typedescription_destructExtendedMembers( typelib_TypeDescription * pTD ) { - assert( typelib_TypeClass_TYPEDEF != pTD->eTypeClass ); + OSL_ASSERT( typelib_TypeClass_TYPEDEF != pTD->eTypeClass ); switch( pTD->eTypeClass ) { @@ -1391,7 +1391,7 @@ extern "C" void SAL_CALL typelib_typedescription_release( SAL_THROW_EXTERN_C() { sal_Int32 ref = osl_atomic_decrement( &pTD->nRefCount ); - assert(ref >= 0); + OSL_ASSERT(ref >= 0); if (0 == ref) { TypeDescriptor_Init_Impl &rInit = Init::get(); @@ -1468,10 +1468,10 @@ extern "C" void SAL_CALL typelib_typedescription_register( typelib_TypeDescriptionReference * pTDR = nullptr; typelib_typedescriptionreference_getByName( &pTDR, (*ppNewDescription)->pTypeName ); - assert( (*ppNewDescription)->pWeakRef || reallyWeak( (*ppNewDescription)->eTypeClass ) ); + OSL_ASSERT( (*ppNewDescription)->pWeakRef || reallyWeak( (*ppNewDescription)->eTypeClass ) ); if( pTDR ) { - assert( (*ppNewDescription)->eTypeClass == pTDR->eTypeClass ); + OSL_ASSERT( (*ppNewDescription)->eTypeClass == pTDR->eTypeClass ); if( pTDR->pType ) { if (reallyWeak( pTDR->eTypeClass )) @@ -1494,7 +1494,7 @@ extern "C" void SAL_CALL typelib_typedescription_register( } // take new descr pTDR->pType = *ppNewDescription; - assert( ! (*ppNewDescription)->pWeakRef ); + OSL_ASSERT( ! (*ppNewDescription)->pWeakRef ); (*ppNewDescription)->pWeakRef = pTDR; return; } @@ -1572,7 +1572,7 @@ extern "C" void SAL_CALL typelib_typedescription_register( // description is the weak itself, so register it (*rInit.pWeakMap)[pTDR->pTypeName->buffer] = pTDR; - assert( static_cast<void *>(*ppNewDescription) == static_cast<void *>(pTDR) ); + OSL_ASSERT( static_cast<void *>(*ppNewDescription) == static_cast<void *>(pTDR) ); } // By default this reference is not really weak. The reference hold the description @@ -1585,8 +1585,8 @@ extern "C" void SAL_CALL typelib_typedescription_register( pTDR->pType = *ppNewDescription; (*ppNewDescription)->pWeakRef = pTDR; - assert( rtl_ustr_compare( pTDR->pTypeName->buffer, (*ppNewDescription)->pTypeName->buffer ) == 0 ); - assert( pTDR->eTypeClass == (*ppNewDescription)->eTypeClass ); + OSL_ASSERT( rtl_ustr_compare( pTDR->pTypeName->buffer, (*ppNewDescription)->pTypeName->buffer ) == 0 ); + OSL_ASSERT( pTDR->eTypeClass == (*ppNewDescription)->eTypeClass ); } @@ -1624,7 +1624,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( nSize = 0; rMaxIntegralTypeSize = 1; - assert( typelib_TypeClass_TYPEDEF != pTypeDescription->eTypeClass ); + OSL_ASSERT( typelib_TypeClass_TYPEDEF != pTypeDescription->eTypeClass ); switch( pTypeDescription->eTypeClass ) { @@ -2157,7 +2157,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_release( } rtl_uString_release( pRef->pTypeName ); - assert( pRef->pType == nullptr ); + OSL_ASSERT( pRef->pType == nullptr ); #if OSL_DEBUG_LEVEL > 0 osl_atomic_decrement( &rInit.nTypeDescriptionReferenceCount ); #endif @@ -2210,9 +2210,9 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription( } typelib_typedescription_getByName( ppRet, pRef->pTypeName ); - assert( !*ppRet || rtl_ustr_compare( pRef->pTypeName->buffer, (*ppRet)->pTypeName->buffer ) == 0 ); - assert( !*ppRet || pRef->eTypeClass == (*ppRet)->eTypeClass ); - assert( !*ppRet || pRef == (*ppRet)->pWeakRef ); + OSL_ASSERT( !*ppRet || rtl_ustr_compare( pRef->pTypeName->buffer, (*ppRet)->pTypeName->buffer ) == 0 ); + OSL_ASSERT( !*ppRet || pRef->eTypeClass == (*ppRet)->eTypeClass ); + OSL_ASSERT( !*ppRet || pRef == (*ppRet)->pWeakRef ); pRef->pType = *ppRet; } diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index b3383a23da5d..59257c44b09a 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -445,7 +445,7 @@ inline bool _assignData( return (pQueried != nullptr); } default: - assert(false); + OSL_ASSERT(false); return false; } } diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 8e7dfcab2f13..69721566d9c2 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -148,7 +148,7 @@ void MediatorMapping::mapInterface( if (*ppOut != nullptr) { uno_ExtEnvironment * env = m_to.get()->pExtEnv; - assert(env != nullptr); + OSL_ASSERT( env != nullptr ); env->releaseInterface( env, *ppOut ); *ppOut = nullptr; } diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index 7e4e034f08a5..8c15a6fb0142 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -129,7 +129,7 @@ inline void _defaultConstructData( *static_cast<void **>(pMem) = nullptr; // either cpp or c-uno interface break; default: - assert(false); + OSL_ASSERT(false); break; } } diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 3ac9994a94b9..b6ecb3036577 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -33,7 +33,7 @@ namespace cppu inline uno_Sequence * allocSeq( sal_Int32 nElementSize, sal_Int32 nElements ) { - assert( nElements >= 0 && nElementSize >= 0 ); + OSL_ASSERT( nElements >= 0 && nElementSize >= 0 ); uno_Sequence * pSeq = nullptr; sal_uInt32 nSize = calcSeqMemSize( nElementSize, nElements ); if (nSize > 0) @@ -224,7 +224,7 @@ inline void _copyConstructAnyFromData( } break; default: - assert(false); + OSL_ASSERT(false); break; } } @@ -361,7 +361,7 @@ inline void _copyConstructAny( pDestAny->pReserved = nullptr; // either cpp or c-uno interface break; default: - assert(false); + OSL_ASSERT(false); break; } } @@ -462,7 +462,7 @@ inline uno_Sequence * icopyConstructSequence( pSourceElements[nPos], pSeqElementType, acquire, mapping ); - assert( pNew != nullptr ); + OSL_ASSERT( pNew != nullptr ); // ought never be a memory allocation problem, // because of reference counted sequence handles pDestElements[ nPos ] = pNew; diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index a8d2f8ea5cba..580620814b93 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -253,7 +253,7 @@ inline sal_Int32 idestructElements( return (sal_Int32)(sizeof(void *)); } default: - assert(false); + OSL_ASSERT(false); return 0; } } diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 3e043fdcc328..008a204a104e 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -252,7 +252,7 @@ inline bool _equalSequence( return true; } default: - assert(false); + OSL_ASSERT(false); return false; } } @@ -580,7 +580,7 @@ inline bool _equalData( return _equalObject( *static_cast<void **>(pDest), *static_cast<void **>(pSource), queryInterface, release ); break; default: - assert(false); + OSL_ASSERT(false); break; } return false; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index c267a3148f46..db32cec51d08 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -185,7 +185,7 @@ inline void ObjectEntry::append( inline InterfaceEntry * ObjectEntry::find( typelib_InterfaceTypeDescription * pTypeDescr_ ) { - assert( ! aInterfaces.empty() ); + OSL_ASSERT( ! aInterfaces.empty() ); if (aInterfaces.empty()) return nullptr; @@ -346,7 +346,7 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) Ptr2ObjectMap::const_iterator const iFind( that->aPtr2ObjectMap.find( pInterface ) ); - assert( iFind != that->aPtr2ObjectMap.end() ); + OSL_ASSERT( iFind != that->aPtr2ObjectMap.end() ); ObjectEntry * pOEntry = iFind->second; if (! --pOEntry->nRef) { @@ -381,15 +381,15 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) } else if (pOEntry->mixedObject) { - assert( !pOEntry->aInterfaces.empty() && + OSL_ASSERT( !pOEntry->aInterfaces.empty() && pOEntry->aInterfaces[ 0 ].fpFreeProxy == nullptr ); sal_Int32 index = pOEntry->find( pInterface, 1 ); - assert( index > 0 ); + OSL_ASSERT( index > 0 ); if (index > 0) { InterfaceEntry & entry = pOEntry->aInterfaces[ index ]; - assert( entry.pInterface == pInterface ); + OSL_ASSERT( entry.pInterface == pInterface ); if (entry.fpFreeProxy != nullptr) { --entry.refCount; @@ -408,7 +408,7 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) // remove from ptr map std::size_t erased = that->aPtr2ObjectMap.erase( pInterface ); - assert( erased == 1 ); + OSL_ASSERT( erased == 1 ); } guard.clear(); @@ -1007,7 +1007,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( { *pppEnvs = static_cast<uno_Environment **>((*memAlloc)( sizeof (uno_Environment *) * nSize )); - assert( *pppEnvs ); + OSL_ASSERT( *pppEnvs ); while (nSize--) { (*pppEnvs)[nSize] = aFounds[nSize]; diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 4384233d3e94..e8dcc574e58a 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -381,7 +381,7 @@ static inline bool loadModule(osl::Module & rModule, const OUString & rBridgeNam static Mapping loadExternalMapping( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose ) { - assert( rFrom.is() && rTo.is() ); + OSL_ASSERT( rFrom.is() && rTo.is() ); if (rFrom.is() && rTo.is()) { #ifdef DISABLE_DYNLOADING @@ -414,7 +414,7 @@ static Mapping loadExternalMapping( { Mapping aExt; (*fpGetMapFunc)( (uno_Mapping **)&aExt, rFrom.get(), rTo.get() ); - assert( aExt.is() ); + OSL_ASSERT( aExt.is() ); if (aExt.is()) return aExt; } @@ -440,7 +440,7 @@ static Mapping loadExternalMapping( { Mapping aExt; (*fpGetMapFunc)( reinterpret_cast<uno_Mapping **>(&aExt), rFrom.get(), rTo.get() ); - assert( aExt.is() ); + OSL_ASSERT( aExt.is() ); if (aExt.is()) { aModule.release(); @@ -460,7 +460,7 @@ static Mapping getDirectMapping( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose = OUString() ) { - assert( rFrom.is() && rTo.is() ); + OSL_ASSERT( rFrom.is() && rTo.is() ); if (rFrom.is() && rTo.is()) { MappingsData & rData = getMappingsData(); @@ -705,7 +705,7 @@ void SAL_CALL uno_revokeMapping( ClearableMutexGuard aGuard( rData.aMappingsMutex ); const t_Mapping2Entry::const_iterator iFind( rData.aMapping2Entry.find( pMapping ) ); - assert( iFind != rData.aMapping2Entry.end() ); + OSL_ASSERT( iFind != rData.aMapping2Entry.end() ); MappingEntry * pEntry = (*iFind).second; if (! --pEntry->nRef) { diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 4274c3eb7574..3fbe338cfc00 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -44,7 +44,7 @@ namespace cppu static inline uno_Sequence * reallocSeq( uno_Sequence * pReallocate, std::size_t nElementSize, sal_Int32 nElements ) { - assert( nElements >= 0 ); + OSL_ASSERT( nElements >= 0 ); uno_Sequence * pNew = nullptr; sal_uInt32 nSize = calcSeqMemSize( nElementSize, nElements ); if (nSize > 0) @@ -302,7 +302,7 @@ static inline bool idefaultConstructElements( if (pSeq == nullptr) { - assert( nAlloc >= 0 ); // must have been an allocation failure + OSL_ASSERT( nAlloc >= 0 ); // must have been an allocation failure return false; } *ppSeq = pSeq; @@ -532,7 +532,7 @@ static inline bool icopyConstructFromElements( uno_Sequence * pNew = icopyConstructSequence( static_cast<uno_Sequence **>(pSourceElements)[nPos], pSeqElementType, acquire, nullptr ); - assert( pNew != nullptr ); + OSL_ASSERT( pNew != nullptr ); // ought never be a memory allocation problem, // because of reference counted sequence handles pDestElements[ nPos ] = pNew; @@ -625,7 +625,7 @@ static inline bool ireallocSequence( } else { - assert( pSeq->nRefCount == 1 ); + OSL_ASSERT( pSeq->nRefCount == 1 ); if (nSize > nElements) // default construct the rest { ret = idefaultConstructElements( @@ -641,7 +641,7 @@ static inline bool ireallocSequence( // warning: it is assumed that the following will never fail, // else this leads to a sequence null handle *ppSequence = reallocSeq( pSeq, nElementSize, nSize ); - assert( *ppSequence != nullptr ); + OSL_ASSERT( *ppSequence != nullptr ); ret = (*ppSequence != nullptr); } } @@ -695,7 +695,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct( ret = true; } - assert( (*ppSequence != nullptr) == ret ); + OSL_ASSERT( (*ppSequence != nullptr) == ret ); return ret; } @@ -734,7 +734,7 @@ sal_Bool SAL_CALL uno_sequence_construct( ret = true; } - assert( (*ppSequence != nullptr) == ret ); + OSL_ASSERT( (*ppSequence != nullptr) == ret ); return ret; } diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index b9b97d953e8b..fdff1a21bab8 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -101,7 +101,7 @@ void OComponentHelper::release() throw() } // only the alive ref holds the object - assert( m_refCount == 1 ); + OSL_ASSERT( m_refCount == 1 ); // destroy the object if xHoldAlive decrement the refcount to 0 return; } diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index d3bbeea5f3b9..2df1b495689c 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -85,7 +85,7 @@ class DisposingForwarder explicit DisposingForwarder( Reference< lang::XComponent > const & xTarget ) : m_xTarget( xTarget ) { - assert( m_xTarget.is() ); + OSL_ASSERT( m_xTarget.is() ); } public: // listens at source for disposing, then disposes target @@ -532,7 +532,7 @@ ComponentContext::ComponentContext( UNO_QUERY ); // patch DefaultContext property of new one Reference< beans::XPropertySet > xProps( m_xSMgr, UNO_QUERY ); - assert( xProps.is() ); + OSL_ASSERT( xProps.is() ); if (xProps.is()) { Reference< XComponentContext > xThis( this ); @@ -545,7 +545,7 @@ ComponentContext::ComponentContext( throw; } osl_atomic_decrement( &m_refCount ); - assert( m_xSMgr.is() ); + OSL_ASSERT( m_xSMgr.is() ); } } } diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index de05ab727215..8bd5084c7e8c 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -75,7 +75,7 @@ void SAL_CALL ExceptionThrower_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) { - assert( pMemberType->eTypeClass == typelib_TypeClass_INTERFACE_METHOD ); + OSL_ASSERT( pMemberType->eTypeClass == typelib_TypeClass_INTERFACE_METHOD ); switch (reinterpret_cast< typelib_InterfaceMemberTypeDescription * >( const_cast< typelib_TypeDescription * >( pMemberType ) )-> @@ -109,13 +109,13 @@ void SAL_CALL ExceptionThrower_dispatch( case 3: // throwException() { uno_Any * pAny = static_cast< uno_Any * >( pArgs[ 0 ] ); - assert( pAny->pType->eTypeClass == typelib_TypeClass_EXCEPTION ); + OSL_ASSERT( pAny->pType->eTypeClass == typelib_TypeClass_EXCEPTION ); uno_type_any_construct( *ppException, pAny->pData, pAny->pType, nullptr ); break; } default: { - assert( false ); + OSL_ASSERT( false ); RuntimeException exc( "not implemented!" ); uno_type_any_construct( *ppException, &exc, cppu::UnoType<decltype(exc)>::get().getTypeLibType(), nullptr ); @@ -198,7 +198,7 @@ void SAL_CALL throwException( Any const & exc ) reinterpret_cast< void ** >( &xThrower ), static_cast< uno_Interface * >( &theExceptionThrower::get() ), ExceptionThrower::getCppuType() ); - assert( xThrower.is() ); + OSL_ASSERT( xThrower.is() ); xThrower->throwException( exc ); } @@ -226,7 +226,7 @@ Any SAL_CALL getCaughtException() cpp2uno.mapInterface( reinterpret_cast< void ** >( &unoI.m_pUnoI ), static_cast< XExceptionThrower * >( &theExceptionThrower::get() ), pTD ); - assert( unoI.is() ); + OSL_ASSERT( unoI.is() ); typelib_TypeDescription * pMemberTD = nullptr; TYPELIB_DANGER_GET( diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 596508e213a8..6118ccb79fc1 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -82,7 +82,7 @@ void WeakComponentImplHelperBase::release() exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } - assert( rBHelper.bDisposed ); + OSL_ASSERT( rBHelper.bDisposed ); } OWeakObject::release(); } @@ -209,7 +209,7 @@ void WeakAggComponentImplHelperBase::release() exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } - assert( rBHelper.bDisposed ); + OSL_ASSERT( rBHelper.bDisposed ); } OWeakAggObject::release(); } diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index 0571c4c87e66..2eb7197bf9e6 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -126,14 +126,14 @@ void OInterfaceIteratorHelper::remove() { if( bIsList ) { - assert( nRemain >= 0 && + OSL_ASSERT( nRemain >= 0 && nRemain < aData.pAsSequence->getLength() ); XInterface * p = aData.pAsSequence->getConstArray()[nRemain].get(); rCont.removeInterface( * reinterpret_cast< const Reference< XInterface > * >( &p ) ); } else { - assert( 0 == nRemain ); + OSL_ASSERT( 0 == nRemain ); rCont.removeInterface( * reinterpret_cast< const Reference< XInterface > * >(&aData.pAsInterface)); } } @@ -195,7 +195,7 @@ void OInterfaceContainerHelper::copyAndResetInUse() sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener ) { - assert( rListener.is() ); + OSL_ASSERT( rListener.is() ); MutexGuard aGuard( rMutex ); if( bInUse ) copyAndResetInUse(); @@ -226,7 +226,7 @@ sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface> & rListener ) { - assert( rListener.is() ); + OSL_ASSERT( rListener.is() ); MutexGuard aGuard( rMutex ); if( bInUse ) copyAndResetInUse(); diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 9a5b7f6cba58..02da05163732 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -155,11 +155,11 @@ inline static typelib_TypeDescription * createCTD( Reference< XStructTypeDescription > templateDesc( access->getByHierarchicalName(aTypeName.copy(0, i)), UNO_QUERY_THROW); - assert( + OSL_ASSERT( templateDesc->getTypeParameters().getLength() == xType->getTypeArguments().getLength()); templateMemberTypes = templateDesc->getMemberTypes(); - assert(templateMemberTypes.getLength() == nMembers); + OSL_ASSERT(templateMemberTypes.getLength() == nMembers); } sal_Int32 nPos; @@ -212,7 +212,7 @@ inline static typelib_TypeDescription * createCTD( xAttribute->getGetExceptions() ); for (sal_Int32 i = 0; i != getExcs.getLength(); ++i) { - assert( getExcs[i].is() ); + OSL_ASSERT( getExcs[i].is() ); getExc.push_back( getExcs[i]->getName().pData ); } std::vector< rtl_uString * > setExc; @@ -220,7 +220,7 @@ inline static typelib_TypeDescription * createCTD( xAttribute->getSetExceptions() ); for (sal_Int32 i = 0; i != setExcs.getLength(); ++i) { - assert( setExcs[i].is() ); + OSL_ASSERT( setExcs[i].is() ); setExc.push_back( setExcs[i]->getName().pData ); } typelib_typedescription_newExtendedInterfaceAttribute( @@ -322,7 +322,7 @@ inline static typelib_TypeDescription * createCTD( new typelib_TypeDescription *[nBases]); for (sal_Int32 i = 0; i < nBases; ++i) { typelib_TypeDescription * p = createCTD(access, aBases[i]); - assert( + OSL_ASSERT( !TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(p->eTypeClass)); typelib_typedescription_register(&p); aBaseTypes[i] = p; @@ -380,7 +380,7 @@ inline static typelib_TypeDescription * createCTD( const Reference< XEnumTypeDes { OUString aTypeName( xType->getName() ); Sequence< OUString > aNames( xType->getEnumNames() ); - assert( sizeof(OUString) == sizeof(rtl_uString *) ); // !!! + OSL_ASSERT( sizeof(OUString) == sizeof(rtl_uString *) ); // !!! Sequence< sal_Int32 > aValues( xType->getEnumValues() ); typelib_typedescription_newEnum( @@ -621,7 +621,7 @@ public: void EventListenerImpl::disposing( lang::EventObject const & rEvt ) { if (rEvt.Source != m_xTDMgr) { - assert(false); + OSL_ASSERT(false); } // deregister of c typelib callback ::typelib_typedescription_revokeCallback( m_xTDMgr.get(), typelib_callback ); diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 981867ec5162..b52634b26ecc 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -383,7 +383,7 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) } } } - catch (RuntimeException &) { assert( false ); } // assert here, but no unexpected() + catch (RuntimeException &) { OSL_ASSERT( false ); } // assert here, but no unexpected() osl_atomic_decrement( &m_aRefCount ); } @@ -397,7 +397,7 @@ OWeakRefListener::~OWeakRefListener() m_XWeakConnectionPoint->removeReference(static_cast<XReference*>(this)); } } - catch (RuntimeException &) { assert( false ); } // assert here, but no unexpected() + catch (RuntimeException &) { OSL_ASSERT( false ); } // assert here, but no unexpected() } // XInterface @@ -471,7 +471,7 @@ void WeakReferenceHelper::clear() m_pImpl = nullptr; } } - catch (RuntimeException &) { assert( false ); } // assert here, but no unexpected() + catch (RuntimeException &) { OSL_ASSERT( false ); } // assert here, but no unexpected() } WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) @@ -504,7 +504,7 @@ WeakReferenceHelper::operator= (const Reference< XInterface > & xInt) m_pImpl->acquire(); } } - catch (RuntimeException &) { assert( false ); } // assert here, but no unexpected() + catch (RuntimeException &) { OSL_ASSERT( false ); } // assert here, but no unexpected() return *this; } @@ -530,7 +530,7 @@ Reference< XInterface > WeakReferenceHelper::get() const } catch (RuntimeException &) { - assert( false ); + OSL_ASSERT( false ); } // assert here, but no unexpected() return Reference< XInterface >(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index f6238d3f9f2d..848e476313cd 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -768,7 +768,7 @@ void SvxColorTabPage::FillUserData() void SvxColorTabPage::SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ) { (void) t; - assert( t == XPropertyListType::Color ); + OSL_ASSERT( t == XPropertyListType::Color ); pColorList = XColorListRef( static_cast<XColorList *>(xRef.get() ) ); } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index b81314122913..6b4650ef04fb 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1403,7 +1403,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU } // check the index - assert(nIndex >= 0); + OSL_ASSERT(nIndex >= 0); if (sal::static_int_cast< sal_uInt32 >(nIndex) > m_aChildren.size()) nIndex = m_aChildren.size(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a897fd521b5a..e3eabd7a2d68 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -812,7 +812,7 @@ OUString Desktop::CreateErrorMsgString( case ::utl::Bootstrap::NO_FAILURE: { - assert(false); + OSL_ASSERT(false); } break; } @@ -892,7 +892,7 @@ void Desktop::HandleBootstrapErrors( case ::utl::Bootstrap::NO_FAILURE: { - assert(false); + OSL_ASSERT(false); } break; } @@ -1320,7 +1320,7 @@ void Desktop::Exception(ExceptionCategory nCategory) } } - assert(false); // unreachable + OSL_ASSERT(false); // unreachable } void Desktop::AppEvent( const ApplicationEvent& rAppEvent ) diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 33aa938fb5c5..a0d6093f6762 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -152,7 +152,7 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe bApprove = true; else { - assert(false); + OSL_ASSERT(false); } } diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 9a50a3487ef5..b86fe45d3b80 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -87,7 +87,7 @@ public: virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; } virtual bool next(OUString * argument) override { - assert(argument != nullptr); + OSL_ASSERT(argument != nullptr); if (m_index < m_count) { rtl_getAppCommandArg(m_index++, &argument->pData); return true; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index dbcb1e337e56..7e712bc3fdd5 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -146,7 +146,7 @@ public: private: bool next(OUString * argument, bool prefix) { - assert(argument != nullptr); + OSL_ASSERT(argument != nullptr); if (m_index < m_input.getLength()) { if (prefix) { if (m_input[m_index] != ',') { diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 7d05c4bb15f9..ee814f312b7b 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -149,7 +149,7 @@ void ProgressLogImpl::log_write( OString const & text ) void ProgressLogImpl::push( Any const & Status ) { update( Status ); - assert( m_log_level >= 0 ); + OSL_ASSERT( m_log_level >= 0 ); ++m_log_level; } @@ -160,7 +160,7 @@ void ProgressLogImpl::update( Any const & Status ) return; OUStringBuffer buf; - assert( m_log_level >= 0 ); + OSL_ASSERT( m_log_level >= 0 ); for ( sal_Int32 n = 0; n < m_log_level; ++n ) buf.append( ' ' ); @@ -180,7 +180,7 @@ void ProgressLogImpl::update( Any const & Status ) void ProgressLogImpl::pop() { - assert( m_log_level > 0 ); + OSL_ASSERT( m_log_level > 0 ); --m_log_level; } diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 93673c977246..78f5b42d0824 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -120,13 +120,13 @@ static OString decodeString( const sal_Char* pEncChars, int nLen) if( c == '%') { --i; - assert( i >= 0); + OSL_ASSERT( i >= 0); c = *(pChar++); if( ('0' <= c) && (c <= '9')) c -= '0'; else { - assert( ('A' <= c) && (c <= 'F')); + OSL_ASSERT( ('A' <= c) && (c <= 'F')); c -= ('A'-10); } } @@ -165,7 +165,7 @@ void PersistentMap::readAll() char aHeaderBytes[ sizeof(PmapMagic)]; sal_uInt64 nBytesRead = 0; m_MapFile.read( aHeaderBytes, sizeof(aHeaderBytes), nBytesRead); - assert( nBytesRead == sizeof(aHeaderBytes)); + OSL_ASSERT( nBytesRead == sizeof(aHeaderBytes)); if( nBytesRead != sizeof(aHeaderBytes)) return; // check header magic @@ -229,13 +229,13 @@ void PersistentMap::flush() const OString aKeyString = encodeString( (*it).first); const sal_Int32 nKeyLen = aKeyString.getLength(); m_MapFile.write( aKeyString.getStr(), nKeyLen, nBytesWritten); - assert( nKeyLen == (sal_Int32)nBytesWritten); + OSL_ASSERT( nKeyLen == (sal_Int32)nBytesWritten); m_MapFile.write( "\n", 1, nBytesWritten); // write line for value const OString& rValString = encodeString( (*it).second); const sal_Int32 nValLen = rValString.getLength(); m_MapFile.write( rValString.getStr(), nValLen, nBytesWritten); - assert( nValLen == (sal_Int32)nBytesWritten); + OSL_ASSERT( nValLen == (sal_Int32)nBytesWritten); m_MapFile.write( "\n", 1, nBytesWritten); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 17da1e5b1238..676e94283661 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -91,7 +91,7 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles > const OUString operator () () { const SolarMutexGuard guard; std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) ); - assert( resmgr.get() != nullptr ); + OSL_ASSERT( resmgr.get() != nullptr ); return ResId(STR_FILTERNAME_ALL, *resmgr.get()).toString(); } }; @@ -649,7 +649,7 @@ bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > & dp_misc::getIdentifier(xPackage), xPackage->getName(), uno::Reference<ucb::XCommandEnvironment>()); uno::Reference<deployment::XPackage> extension = dp_misc::getExtensionWithHighestVersion(seqExtensions); - assert(extension.is()); + OSL_ASSERT(extension.is()); std::vector< css::uno::Reference< css::deployment::XPackage > > vEntries; vEntries.push_back(extension); @@ -732,7 +732,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() m_sLastFolderURL = xFilePicker->getDisplayDirectory(); uno::Sequence< OUString > files( xFilePicker->getSelectedFiles() ); - assert( files.getLength() > 0 ); + OSL_ASSERT( files.getLength() > 0 ); return files; } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index e6d9b79a1725..a7970b81297e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -321,7 +321,7 @@ uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler() void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest ) { uno::Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); dp_misc::TRACE( "[dp_gui_cmdenv.cxx] incoming request:\n" + ::comphelper::anyToString(request) + "\n"); @@ -355,11 +355,11 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & // ignore intermediate errors of legacy packages, i.e. // former pkgchk behaviour: const uno::Reference< deployment::XPackage > xPackage( wtExc.Context, uno::UNO_QUERY ); - assert( xPackage.is() ); + OSL_ASSERT( xPackage.is() ); if ( xPackage.is() ) { const uno::Reference< deployment::XPackageTypeInfo > xPackageType( xPackage->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) { approve = ( xPackage->isBundle() && @@ -400,7 +400,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & approve = true; else { - assert(false); + OSL_ASSERT(false); } } else if (request >>= verExc) @@ -419,7 +419,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & id = RID_STR_WARNING_VERSION_GREATER; break; } - assert( verExc.Deployed.is() ); + OSL_ASSERT( verExc.Deployed.is() ); bool bEqualNames = verExc.NewDisplayName.equals( verExc.Deployed->getDisplayName()); { @@ -579,7 +579,7 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, m_bStopped( false ), m_bWorking( false ) { - assert( pDialogHelper ); + OSL_ASSERT( pDialogHelper ); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 1d0520032cee..4cd3d38587f6 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -274,7 +274,7 @@ sal_Int32 ExtensionBox_Impl::getSelIndex() const { if ( m_bHasActive ) { - assert( m_nActive >= -1); + OSL_ASSERT( m_nActive >= -1); return static_cast< sal_Int32 >( m_nActive ); } else diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 151ec49c5e5c..62cb6e8fb10e 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -223,7 +223,7 @@ void ServiceImpl::startExecuteModal( } if (! bOfficePipePresent) { - assert( ! bAppUp ); + OSL_ASSERT( ! bAppUp ); app.reset( new MyApp ); if (! InitVCL() ) throw RuntimeException( "Cannot initialize VCL!", diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index cbf6268e4811..3170f8192d14 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -214,7 +214,7 @@ void TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bPare for ( sal_Int32 i = 0; i < xAllPackages.getLength(); ++i ) { uno::Reference< deployment::XPackage > xPackage = dp_misc::getExtensionWithHighestVersion(xAllPackages[i]); - assert(xPackage.is()); + OSL_ASSERT(xPackage.is()); if ( xPackage.is() ) { vEntries.push_back( xPackage ); @@ -373,7 +373,7 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa beans::Optional< OUString > aId = xPackage->getIdentifier(); //a bundle must always have an id - assert( aId.IsPresent ); + OSL_ASSERT( aId.IsPresent ); //iterate over all available nodes uno::Sequence< OUString > seqNames = m_xNameAccessNodes->getElementNames(); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 4090ea05638e..9769a8b3b452 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -314,13 +314,13 @@ void UpdateDialog::Thread::execute() dp_misc::getIdentifier(info.extension), info.extension->getName(), uno::Reference<ucb::XCommandEnvironment>()); } catch ( const lang::IllegalArgumentException& ) { - assert(false); + OSL_ASSERT(false); continue; } catch ( const css::ucb::CommandFailedException& ) { - assert(false); + OSL_ASSERT(false); continue; } - assert(extensions.getLength() == 3); + OSL_ASSERT(extensions.getLength() == 3); if (extensions[0].is() ) sVersionUser = extensions[0]->getVersion(); if (extensions[1].is() ) @@ -393,7 +393,7 @@ void UpdateDialog::Thread::handleSpecificError( OUString UpdateDialog::Thread::getUpdateDisplayString( dp_gui::UpdateData const & data, OUString const & version) const { - assert(data.aInstalledPackage.is()); + OSL_ASSERT(data.aInstalledPackage.is()); OUStringBuffer b(data.aInstalledPackage->getDisplayName()); b.append(' '); { @@ -429,7 +429,7 @@ void UpdateDialog::Thread::prepareUpdateData( if (!updateInfo.is()) return; dp_misc::DescriptionInfoset infoset(m_context, updateInfo); - assert(!infoset.getVersion().isEmpty()); + OSL_ASSERT(!infoset.getVersion().isEmpty()); uno::Sequence< uno::Reference< xml::dom::XElement > > ds( dp_misc::Dependencies::check(infoset)); @@ -526,7 +526,7 @@ UpdateDialog::UpdateDialog( get(m_pOk, "INSTALL"); get(m_pClose, "gtk-close"); get(m_pHelp, "gtk-help"); - assert(updateData != nullptr); + OSL_ASSERT(updateData != nullptr); m_xExtensionManager = deployment::ExtensionManager::get( context ); @@ -609,7 +609,7 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const { sal_uLong i = GetEntryCount(); - assert(i <= std::numeric_limits< sal_uInt16 >::max()); + OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max()); return sal::static_int_cast< sal_uInt16 >(i); } @@ -704,7 +704,7 @@ sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKi if ( p == pEntry ) return i; } - assert(false); + OSL_ASSERT(false); return 0; } @@ -933,7 +933,7 @@ bool UpdateDialog::showDescription(uno::Reference< xml::dom::XNode > const & aUp bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const & aExtension) { - assert(aExtension.is()); + OSL_ASSERT(aExtension.is()); beans::StringPair pubInfo = aExtension->getPublisherInfo(); return showDescription(std::make_pair(pubInfo.First, pubInfo.Second), ""); @@ -1219,7 +1219,7 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler, SvTreeListBox*, void) break; } default: - assert(false); + OSL_ASSERT(false); break; } } @@ -1279,7 +1279,7 @@ IMPL_LINK_NOARG(UpdateDialog, okHandler, Button*, void) typedef std::vector<UpdateData>::const_iterator CIT; for (CIT i = m_enabledUpdates.begin(); i < m_enabledUpdates.end(); ++i) { - assert(i->aInstalledPackage.is()); + OSL_ASSERT(i->aInstalledPackage.is()); //If the user has no write access to the shared folder then the update //for a shared extension is disable, that is it cannot be in m_enabledUpdates } diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 8f66a8ce49a0..8f18c13c8060 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -290,7 +290,7 @@ void UpdateInstallDialog::setError(INSTALL_ERROR err, OUString const & sExtensio break; default: - assert(false); + OSL_ASSERT(false); } OUString sMsg(m_pMle_info->GetText()); @@ -362,7 +362,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() continue; //We assume that m_aVecUpdateData contains only information about extensions which //can be downloaded directly. - assert(curData.sWebsiteURL.isEmpty()); + OSL_ASSERT(curData.sWebsiteURL.isEmpty()); //update the name of the extension which is to be downloaded { @@ -495,7 +495,7 @@ void UpdateInstallDialog::Thread::installExtensions() } else if (curData.aUpdateSource.is()) { - assert(curData.aUpdateSource.is()); + OSL_ASSERT(curData.aUpdateSource.is()); //I am not sure if we should obtain the install properties and pass them into //add extension. Currently it contains only "SUPPRESS_LICENSE". So it could happen //that a license is displayed when updating from the shared repository, although the @@ -581,7 +581,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update } } - assert(m_sDownloadFolder.getLength()); + OSL_ASSERT(m_sDownloadFolder.getLength()); OUString destFolder, tempEntry; if (::osl::File::createTempFile( &m_sDownloadFolder, @@ -644,7 +644,7 @@ void UpdateCommandEnv::handle( cssu::Reference< css::task::XInteractionRequest> const & xRequest ) { cssu::Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION ); dp_misc::TRACE("[dp_gui_cmdenv.cxx] incoming request:\n" + ::comphelper::anyToString(request) + "\n\n"); diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index e1263bec3b5f..410c0aab528a 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -66,7 +66,7 @@ OString newKey(OUString const & id) { { ::dp_manager::ActivePackages::Data d; sal_Int32 i = value.indexOf(';'); - assert(i >= 0); + OSL_ASSERT(i >= 0); d.temporaryName = OUString(value.getStr(), i, RTL_TEXTENCODING_UTF8); d.fileName = fileName; d.mediaType = OUString( @@ -78,11 +78,11 @@ OString newKey(OUString const & id) { ::dp_manager::ActivePackages::Data decodeNewData(OString const & value) { ::dp_manager::ActivePackages::Data d; sal_Int32 i1 = value.indexOf(separator); - assert(i1 >= 0); + OSL_ASSERT(i1 >= 0); d.temporaryName = OUString( value.getStr(), i1, RTL_TEXTENCODING_UTF8); sal_Int32 i2 = value.indexOf(separator, i1 + 1); - assert(i2 >= 0); + OSL_ASSERT(i2 >= 0); d.fileName = OUString( value.getStr() + i1 + 1, i2 - i1 - 1, RTL_TEXTENCODING_UTF8); sal_Int32 i3 = value.indexOf(separator, i2 + 1); diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 67a6fdd55d8e..cd93931e6de0 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -143,7 +143,7 @@ void TmpRepositoryCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest ) { uno::Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); deployment::VersionException verExc; deployment::LicenseException licExc; @@ -176,7 +176,7 @@ void LicenseCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest ) { uno::Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); deployment::LicenseException licExc; @@ -211,7 +211,7 @@ void NoLicenseCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest ) { uno::Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); deployment::LicenseException licExc; @@ -233,7 +233,7 @@ void SilentCheckPrerequisitesCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest ) { uno::Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); deployment::LicenseException licExc; deployment::PlatformException platformExc; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 6282a838b687..e5d31af7c1a3 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -86,7 +86,7 @@ struct CompIdentifiers OUString CompIdentifiers::getName(std::vector<Reference<css::deployment::XPackage> > const & a) { - assert(a.size() == 3); + OSL_ASSERT(a.size() == 3); //get the first non-null reference Reference<css::deployment::XPackage> extension; std::vector<Reference<css::deployment::XPackage> >::const_iterator it = a.begin(); @@ -98,7 +98,7 @@ OUString CompIdentifiers::getName(std::vector<Reference<css::deployment::XPackag break; } } - assert(extension.is()); + OSL_ASSERT(extension.is()); return extension->getDisplayName(); } @@ -146,14 +146,14 @@ public: ExtensionRemoveGuard::~ExtensionRemoveGuard() { try { - assert(!(m_extension.is() && !m_xPackageManager.is())); + OSL_ASSERT(!(m_extension.is() && !m_xPackageManager.is())); if (m_xPackageManager.is() && m_extension.is()) m_xPackageManager->removePackage( dp_misc::getIdentifier(m_extension), OUString(), css::uno::Reference<css::task::XAbortChannel>(), css::uno::Reference<css::ucb::XCommandEnvironment>()); } catch (...) { - assert(false); + OSL_ASSERT(false); } } @@ -167,7 +167,7 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x , m_xContext(xContext) { m_xPackageManagerFactory = css::deployment::thePackageManagerFactory::get(m_xContext); - assert(m_xPackageManagerFactory.is()); + OSL_ASSERT(m_xPackageManagerFactory.is()); m_repositoryNames.push_back("user"); m_repositoryNames.push_back("shared"); @@ -301,7 +301,7 @@ std::list<Reference<css::deployment::XPackage> > } extensionList.push_back(xPackage); } - assert(extensionList.size() == 3); + OSL_ASSERT(extensionList.size() == 3); return extensionList; } @@ -359,7 +359,7 @@ bool ExtensionManager::isUserDisabled( listExtensions = getExtensionsWithSameId(identifier, fileName); } catch ( const lang::IllegalArgumentException & ) { } - assert(listExtensions.size() == 3); + OSL_ASSERT(listExtensions.size() == 3); return isUserDisabled( ::comphelper::containerToSequence(listExtensions) ); } @@ -367,7 +367,7 @@ bool ExtensionManager::isUserDisabled( bool ExtensionManager::isUserDisabled( uno::Sequence<Reference<css::deployment::XPackage> > const & seqExtSameId) { - assert(seqExtSameId.getLength() == 3); + OSL_ASSERT(seqExtSameId.getLength() == 3); Reference<css::deployment::XPackage> const & userExtension = seqExtSameId[0]; if (userExtension.is()) { @@ -411,7 +411,7 @@ void ExtensionManager::activateExtension( listExtensions = getExtensionsWithSameId(identifier, fileName); } catch (const lang::IllegalArgumentException &) { } - assert(listExtensions.size() == 3); + OSL_ASSERT(listExtensions.size() == 3); activateExtension( ::comphelper::containerToSequence(listExtensions), @@ -1171,7 +1171,7 @@ void ExtensionManager::reinstallDeployedExtensions( registered.Value.Value)) { const OUString id = dp_misc::getIdentifier(extensions[ pos ]); - assert(!id.isEmpty()); + OSL_ASSERT(!id.isEmpty()); disabledExts.insert(id); } } @@ -1196,7 +1196,7 @@ void ExtensionManager::reinstallDeployedExtensions( { const OUString id = dp_misc::getIdentifier(extensions[ pos ]); const OUString fileName = extensions[ pos ]->getName(); - assert(!id.isEmpty()); + OSL_ASSERT(!id.isEmpty()); activateExtension( id, fileName, disabledExts.find(id) != disabledExts.end(), true, xAbortChannel, xCmdEnv ); @@ -1313,7 +1313,7 @@ void ExtensionManager::checkInstall( request, cppu::UnoType<task::XInteractionApprove>::get(), cmdEnv, &approve, &abort )) { - assert( !approve && !abort ); + OSL_ASSERT( !approve && !abort ); throw css::deployment::DeploymentException( dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName, static_cast<OWeakObject *>(this), request ); @@ -1345,7 +1345,7 @@ void ExtensionManager::checkUpdate( if (! dp_misc::interactContinuation( request, cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &replace, &abort )) { - assert( !replace && !abort ); + OSL_ASSERT( !replace && !abort ); throw css::deployment::DeploymentException( dp_misc::getResourceString( RID_STR_ERROR_WHILE_ADDING) + newDisplayName, diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 9f99a483cc3a..a19a5c728516 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -163,7 +163,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) if (!extMgr.is()) { - assert(false); + OSL_ASSERT(false); return aList; } std::vector<std::pair<uno::Reference<deployment::XPackage>, uno::Any > > errors; @@ -181,7 +181,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) } catch (lang::IllegalArgumentException &) { - assert(false); + OSL_ASSERT(false); } updateInfoMap = dp_misc::getOnlineUpdateInfos( mxContext, extMgr, mxUpdateInformation, &vecExtensions, errors); @@ -222,7 +222,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) "ignoring IllegalArgumentException \"" << e.Message << "\""); continue; } - assert(extensions.getLength() == 3); + OSL_ASSERT(extensions.getLength() == 3); if (extensions[0].is() ) sVersionUser = extensions[0]->getVersion(); if (extensions[1].is() ) @@ -289,7 +289,7 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider:: const uno::Sequence< uno::Reference< deployment::XPackage > > & seqExtension = allExt[i]; sal_Int32 cExt = seqExtension.getLength(); - assert(cExt == 3); + OSL_ASSERT(cExt == 3); for (sal_Int32 j = 0; j < cExt; j++) { //ToDo according to the old code the first found extension is used diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 9f57fe73a9f2..df1431c449a2 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -114,7 +114,7 @@ void PackageManagerImpl::initActivationLayer( { if (m_activePackages.isEmpty()) { - assert( m_registryCache.isEmpty() ); + OSL_ASSERT( m_registryCache.isEmpty() ); // documents temp activation: m_activePackagesDB.reset( new ActivePackages ); ::ucbhelper::Content ucbContent; @@ -161,7 +161,7 @@ void PackageManagerImpl::initActivationLayer( else { // user|share: - assert( !m_activePackages.isEmpty() ); + OSL_ASSERT( !m_activePackages.isEmpty() ); m_activePackages_expanded = expandUnoRcUrl( m_activePackages ); m_registrationData_expanded = expandUnoRcUrl(m_registrationData); if (!m_readOnly) @@ -523,7 +523,7 @@ OUString PackageManagerImpl::getContext() Sequence< Reference<deployment::XPackageTypeInfo> > PackageManagerImpl::getSupportedPackageTypes() { - assert( m_xRegistry.is() ); + OSL_ASSERT( m_xRegistry.is() ); return m_xRegistry->getSupportedPackageTypes(); } @@ -575,7 +575,7 @@ OUString PackageManagerImpl::detectMediaType( url, OUString(), false, OUString(), ucbContent.getCommandEnvironment() ) ); const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) mediaType = xPackageType->getMediaType(); } @@ -644,7 +644,7 @@ OUString PackageManagerImpl::insertToActivationLayer( // write to DB: //bundled extensions should only be added by the synchronizeAddedExtensions //functions. Moreover, there is no "temporary folder" for bundled extensions. - assert(!(m_context == "bundled")); + OSL_ASSERT(!(m_context == "bundled")); OUString sFolderUrl = makeURLAppendSysPathSegment(destFolderContent.getURL(), title); DescriptionInfoset info = dp_misc::getDescriptionInfoset(sFolderUrl); @@ -780,7 +780,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( xPackage = m_xRegistry->bindPackage( makeURL( destFolder, title_enc ), mediaType, false, OUString(), xCmdEnv ); - assert( xPackage.is() ); + OSL_ASSERT( xPackage.is() ); if (xPackage.is()) { bool install = false; @@ -888,7 +888,7 @@ void PackageManagerImpl::removePackage( { ActivePackages::Data val; m_activePackagesDB->get( & val, id, fileName); - assert(!val.temporaryName.isEmpty()); + OSL_ASSERT(!val.temporaryName.isEmpty()); OUString url(makeURL(m_activePackages_expanded, val.temporaryName + "removed")); ::ucbhelper::Content contentRemoved(url, xCmdEnv, m_xComponentContext); @@ -1194,7 +1194,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( //find all which are in the extension data base but which //are removed already. - assert(!(m_context == "user")); + OSL_ASSERT(!(m_context == "user")); bool bModified = false; ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() ); @@ -1261,7 +1261,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( { Reference<deployment::XPackage> xPackage = m_xRegistry->bindPackage( url, i->second.mediaType, true, i->first, xCmdEnv ); - assert(xPackage.is()); //Even if the files are removed, we must get the object. + OSL_ASSERT(xPackage.is()); //Even if the files are removed, we must get the object. xPackage->revokePackage(true, xAbortChannel, xCmdEnv); removePackage(xPackage->getIdentifier().Value, xPackage->getName(), xAbortChannel, xCmdEnv); @@ -1282,7 +1282,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) { bool bModified = false; - assert(!(m_context == "user")); + OSL_ASSERT(!(m_context == "user")); ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() ); //check if the folder exist at all. The shared extension folder @@ -1320,7 +1320,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( bool bShared = (m_context == "shared"); if (bShared) { - assert(title2.endsWith("_")); + OSL_ASSERT(title2.endsWith("_")); title2 = title2.copy(0, title2.getLength() -1); } OUString titleEncoded = ::rtl::Uri::encode( @@ -1378,7 +1378,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( //showing a license if simple-license/@accept-by = "admin" //It will also prevent showing the license for bundled extensions //which is not supported. - assert(!(m_context == "user")); + OSL_ASSERT(!(m_context == "user")); // shall the license be suppressed? DescriptionInfoset info = diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 9ec153b93d3f..b2e9fc418d8e 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -132,7 +132,7 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context ) m_managers.insert( t_string2weakref::value_type( context, xRet ) ) ); if (insertion.second) { - assert( insertion.first->second.get() == xRet ); + OSL_ASSERT( insertion.first->second.get() == xRet ); // hold user, shared mgrs for whole process: live deployment if ( context == "user" ) m_xUserMgr = xRet; diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 48ab6f6a78d7..10d10f292765 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -152,7 +152,7 @@ check(dp_misc::DescriptionInfoset const & infoset) { OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency) { - assert(dependency.is()); + OSL_ASSERT(dependency.is()); if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg ) { return produceErrorText( diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 470e7726393c..b1762ab7fd87 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -88,7 +88,7 @@ css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) OUString getNodeValue( css::uno::Reference< css::xml::dom::XNode > const & node) { - assert(node.is()); + OSL_ASSERT(node.is()); try { return node->getNodeValue(); } catch (const css::xml::dom::DOMException & e) { @@ -583,7 +583,7 @@ std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAnd } catch (const css::xml::xpath::XPathException &) { // ignore } - assert(xPathName.is()); + OSL_ASSERT(xPathName.is()); if (xPathName.is()) sPublisherName = xPathName->getNodeValue(); @@ -594,7 +594,7 @@ std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAnd } catch (const css::xml::xpath::XPathException &) { // ignore } - assert(xURL.is()); + OSL_ASSERT(xURL.is()); if (xURL.is()) sURL = xURL->getNodeValue(); } @@ -711,7 +711,7 @@ css::uno::Reference<css::xml::dom::XNode> DescriptionInfoset::matchLanguageTag( css::uno::Reference< css::xml::dom::XNode > const & xParent, OUString const & rTag) const { - assert(xParent.is()); + OSL_ASSERT(xParent.is()); css::uno::Reference<css::xml::dom::XNode> nodeMatch; //first try exact match for lang @@ -741,7 +741,7 @@ css::uno::Reference<css::xml::dom::XNode> DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom::XNode > const & xParent) const { - assert(xParent.is()); + OSL_ASSERT(xParent.is()); if ( xParent->getNodeName() == "simple-license" ) { css::uno::Reference<css::xml::dom::XNode> nodeDefault; @@ -792,7 +792,7 @@ OUString DescriptionInfoset::getLocalizedHREFAttrFromChild( } catch (const css::xml::xpath::XPathException &) { // ignore } - assert(xURL.is()); + OSL_ASSERT(xURL.is()); if (xURL.is()) sURL = xURL->getNodeValue(); } diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index 9977d91b2a4c..a0b922c008b1 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -43,7 +43,7 @@ OUString generateIdentifier( OUString getIdentifier( css::uno::Reference< css::deployment::XPackage > const & package) { - assert(package.is()); + OSL_ASSERT(package.is()); css::beans::Optional< OUString > id(package->getIdentifier()); return id.IsPresent ? id.Value : generateLegacyIdentifier(package->getName()); diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 9887d258b327..0eda61153da6 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -46,7 +46,7 @@ public: InteractionContinuationImpl( Type const & type, bool * pselect ) : m_type( type ), m_pselect( pselect ) - { assert( + { OSL_ASSERT( cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom(m_type) ); } // XInterface @@ -97,7 +97,7 @@ bool interactContinuation( Any const & request, Reference<XCommandEnvironment> const & xCmdEnv, bool * pcont, bool * pabort ) { - assert( + OSL_ASSERT( cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom( continuation ) ); if (xCmdEnv.is()) { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 1d2ddabbb4ed..2083075a608e 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -81,7 +81,7 @@ struct UnoRc : public rtl::StaticWithInit< ::rtl::Bootstrap::expandMacros( unorc ); std::shared_ptr< ::rtl::Bootstrap > ret( new ::rtl::Bootstrap( unorc ) ); - assert( ret->getHandle() != nullptr ); + OSL_ASSERT( ret->getHandle() != nullptr ); return ret; } }; @@ -198,13 +198,13 @@ bool compareExtensionFolderWithLastSynchronizedFile( } else { - assert(false); + OSL_ASSERT(false); bNeedsSync = true; } } else { - assert(false); + OSL_ASSERT(false); bNeedsSync = true; } @@ -227,7 +227,7 @@ bool needToSyncRepository(OUString const & name) } else { - assert(false); + OSL_ASSERT(false); return true; } ::rtl::Bootstrap::expandMacros(folder); @@ -296,7 +296,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) OUString makeURLAppendSysPathSegment( OUString const & baseURL, OUString const & segment ) { - assert(segment.indexOf(u'/') == -1); + OSL_ASSERT(segment.indexOf(u'/') == -1); ::rtl::Uri::encode( segment, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, @@ -314,7 +314,7 @@ OUString expandUnoRcTerm( OUString const & term_ ) OUString makeRcTerm( OUString const & url ) { - assert( url.match( "vnd.sun.star.expand:" )); + OSL_ASSERT( url.match( "vnd.sun.star.expand:" )); if (url.match( "vnd.sun.star.expand:" )) { // cut protocol: OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) ); @@ -508,7 +508,7 @@ OUString readConsole() //unopkg.com feeds unopkg.exe with wchar_t|s if (ReadFile( GetStdHandle(STD_INPUT_HANDLE), &aBuffer, sizeof(aBuffer), &dwRead, nullptr ) ) { - assert((dwRead % 2) == 0); + OSL_ASSERT((dwRead % 2) == 0); OUString value( aBuffer, dwRead / 2); return value.trim(); } diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 2a9459453204..f20da27e0d5a 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -90,7 +90,7 @@ void getOwnUpdateInfos( bool bAllHaveOwnUpdateInformation = true; for (UpdateInfoMap::iterator i = inout_map.begin(); i != inout_map.end(); ++i) { - assert(i->second.extension.is()); + OSL_ASSERT(i->second.extension.is()); Sequence<OUString> urls(i->second.extension->getUpdateInformationURLs()); if (urls.getLength()) { @@ -113,7 +113,7 @@ void getOwnUpdateInfos( boost::optional< OUString > id2(infoset.getIdentifier()); if (!id2) continue; - assert(*id2 == id); + OSL_ASSERT(*id2 == id); if (*id2 == id) { i->second.version = infoset.getVersion(); @@ -137,7 +137,7 @@ void getDefaultUpdateInfos( std::vector<std::pair<Reference<deployment::XPackage>, uno::Any> > & out_errors) { const OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL()); - assert(!sDefaultURL.isEmpty()); + OSL_ASSERT(!sDefaultURL.isEmpty()); Any anyError; Sequence< Reference< xml::dom::XElement > > @@ -175,7 +175,7 @@ void getDefaultUpdateInfos( bool containsBundledOnly(Sequence<Reference<deployment::XPackage> > const & sameIdExtensions) { - assert(sameIdExtensions.getLength() == 3); + OSL_ASSERT(sameIdExtensions.getLength() == 3); return !sameIdExtensions[0].is() && !sameIdExtensions[1].is() && sameIdExtensions[2].is(); } @@ -187,7 +187,7 @@ bool onlyBundledExtensions( Reference<deployment::XExtensionManager> const & xExtMgr, std::vector< Reference<deployment::XPackage > > const * extensionList) { - assert(xExtMgr.is()); + OSL_ASSERT(xExtMgr.is()); bool bOnlyBundled = true; if (extensionList) { @@ -341,7 +341,7 @@ UpdateInfoMap getOnlineUpdateInfos( std::vector<Reference<deployment::XPackage > > const * extensionList, std::vector<std::pair< Reference<deployment::XPackage>, uno::Any> > & out_errors) { - assert(xExtMgr.is()); + OSL_ASSERT(xExtMgr.is()); UpdateInfoMap infoMap; if (!xExtMgr.is() || onlyBundledExtensions(xExtMgr, extensionList)) return infoMap; @@ -357,12 +357,12 @@ UpdateInfoMap getOnlineUpdateInfos( uno::Sequence<Reference<deployment::XPackage> > const & seqExt = seqAllExt[pos]; Reference<deployment::XPackage> extension = getExtensionWithHighestVersion(seqExt); - assert(extension.is()); + OSL_ASSERT(extension.is()); std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert( UpdateInfoMap::value_type( dp_misc::getIdentifier(extension), UpdateInfo(extension))); - assert(insertRet.second); + OSL_ASSERT(insertRet.second); (void)insertRet; } } @@ -371,11 +371,11 @@ UpdateInfoMap getOnlineUpdateInfos( typedef std::vector<Reference<deployment::XPackage > >::const_iterator CIT; for (CIT i = extensionList->begin(); i != extensionList->end(); ++i) { - assert(i->is()); + OSL_ASSERT(i->is()); std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert( UpdateInfoMap::value_type( dp_misc::getIdentifier(*i), UpdateInfo(*i))); - assert(insertRet.second); + OSL_ASSERT(insertRet.second); (void)insertRet; } } @@ -402,7 +402,7 @@ OUString getHighestVersion( case 1: return sharedVersion; case 2: return bundledVersion; case 3: return onlineVersion; - default: assert(false); + default: OSL_ASSERT(false); } return OUString(); diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index b8fe7478e10a..2b04a5c5c94e 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1051,7 +1051,7 @@ Reference<XComponentContext> raise_uno_process( Reference<XComponentContext> const & xContext, ::rtl::Reference<AbortChannel> const & abortChannel ) { - assert( xContext.is() ); + OSL_ASSERT( xContext.is() ); OUString url( util::theMacroExpander::get(xContext)->expandMacros( "$URE_BIN_DIR/uno" ) ); @@ -1095,7 +1095,7 @@ Reference<XComponentContext> raise_uno_process( // try to terminate process: if ( osl_terminateProcess( hProcess ) != osl_Process_E_None ) { - assert( false ); + OSL_ASSERT( false ); } throw; } @@ -1113,7 +1113,7 @@ void extractComponentData( componentLoader, OUString const & componentUrl) { - assert( + OSL_ASSERT( context.is() && registry.is() && data != nullptr && componentLoader.is()); OUString registryName(registry->getKeyName()); sal_Int32 prefix = registryName.getLength(); @@ -1588,7 +1588,7 @@ BackendImpl::OtherPlatformPackageImpl::impl_createInstance(OUString const& rServ const { Reference<XComponentContext> const xContext(getMyBackend()->getComponentContext()); - assert(xContext.is()); + OSL_ASSERT(xContext.is()); Reference<XInterface> xService; if (xContext.is()) xService.set(xContext->getServiceManager()->createInstanceWithContext(rService, xContext)); diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 110d3ed87563..a7906c3694e1 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -691,7 +691,7 @@ void BackendImpl::PackageImpl::processPackage_( if (getMyBackend()->activateEntry(getURL())) { ::boost::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url); - assert(data); + OSL_ASSERT(data); that->addToConfigmgrIni( m_isSchema, false, data->iniEntry, xCmdEnv ); } else @@ -779,7 +779,7 @@ void BackendImpl::PackageImpl::processPackage_( } catch(const Exception&) { - assert(false); + OSL_ASSERT(false); } } #endif diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 118029d058a5..f44b1d7ac2f1 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -140,7 +140,7 @@ void BackendDb::removeElement(OUString const & sXPathExpression) //There must not be any other entry with the same url const Reference<css::xml::dom::XNode> nextNode = xpathApi->selectSingleNode(root, sXPathExpression); - assert(! nextNode.is()); + OSL_ASSERT(! nextNode.is()); #endif } catch(const css::uno::Exception &) @@ -277,7 +277,7 @@ void BackendDb::writeVectorOfPair( if (vecPairs.empty()) return; const OUString sNameSpace = getDbNSName(); - assert(!sNameSpace.isEmpty()); + OSL_ASSERT(!sNameSpace.isEmpty()); const OUString sPrefix(getNSPrefix() + ":"); const Reference<css::xml::dom::XDocument> doc = getDocument(); const Reference<css::xml::dom::XNode> root = doc->getFirstChild(); @@ -346,7 +346,7 @@ BackendDb::readVectorOfPair( { try { - assert(parent.is()); + OSL_ASSERT(parent.is()); const OUString sPrefix(getNSPrefix() + ":"); const Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI(); const OUString sExprPairs( @@ -366,7 +366,7 @@ BackendDb::readVectorOfPair( const OUString sExprSecond(sPrefix + sSecondTagName + "/text()"); const Reference<css::xml::dom::XNode> second = xpathApi->selectSingleNode(aPair, sExprSecond); - assert(first.is() && second.is()); + OSL_ASSERT(first.is() && second.is()); retVector.push_back(std::make_pair( first->getNodeValue(), second->getNodeValue())); @@ -484,7 +484,7 @@ Reference<css::xml::dom::XNode> BackendDb::writeKeyElement( getXPathAPI()->selectSingleNode(root, sExpression); if (existingNode.is()) { - assert(false); + OSL_ASSERT(false); //replace the existing entry. removeEntry(url); } @@ -539,7 +539,7 @@ std::list< OUString> BackendDb::readList( { try { - assert(parent.is()); + OSL_ASSERT(parent.is()); const OUString sPrefix(getNSPrefix() + ":"); const Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI(); const OUString sExprList( @@ -635,7 +635,7 @@ void RegisteredDb::addEntry(OUString const & url) sPrefix + ":" + sEntry + "[@url = \"" + url + "\"]"); Reference<css::xml::dom::XNode> _extensionNode = getXPathAPI()->selectSingleNode(root, sExpression); - assert(! _extensionNode.is()); + OSL_ASSERT(! _extensionNode.is()); #endif Reference<css::xml::dom::XElement> helpElement( doc->createElementNS(sNameSpace, sPrefix + ":" + sEntry)); diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 27fa7acb75f6..d0b4211691ee 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -239,7 +239,7 @@ void PackageRegistryImpl::insertBackend( m_mediaType2backend.find( /* media-type of pr. added backend */ ins.first->second ) ); - assert( + OSL_ASSERT( iFind != m_mediaType2backend.end() ); if (iFind != m_mediaType2backend.end()) m_ambiguousBackends.insert( iFind->second ); @@ -358,7 +358,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( Reference<lang::XServiceInfo> xServiceInfo( extensionBackend, UNO_QUERY_THROW ); - assert(xServiceInfo.is()); + OSL_ASSERT(xServiceInfo.is()); OUString registryCachePath( makeURL( cachePath, ::rtl::Uri::encode( @@ -421,7 +421,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( } allBackends.insert( that->m_ambiguousBackends.begin(), that->m_ambiguousBackends.end() ); - assert( allBackends == that->m_allBackends ); + OSL_ASSERT( allBackends == that->m_allBackends ); } #endif diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 777469fd8415..a5bac639d480 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -228,7 +228,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_( { if (!isUrlTargetInExtension()) { - assert(false); + OSL_ASSERT(false); return; } sal_uInt64 attributes = 0; @@ -243,7 +243,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_( else if (!(getMyBackend()->m_context == "bundled")) //Bundled extension are required to be in the properly //installed. That is an executable must have the right flags - assert(false); + OSL_ASSERT(false); //This won't have affect on Windows osl::File::setAttributes( @@ -272,7 +272,7 @@ bool BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension() else if (getMyBackend()->m_context == "bundled") sExtensionDir = dp_misc::expandUnoRcTerm("$BUNDLED_EXTENSIONS"); else - assert(false); + OSL_ASSERT(false); //remove file ellipses if (osl::File::E_None == osl::File::getAbsoluteFileURL(OUString(), sExtensionDir, sExtensionDir)) { diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index a3bcef271497..4eba37cf3243 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -291,7 +291,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() else { //Error - assert(false); + OSL_ASSERT(false); bCompiled = false; break; } @@ -300,7 +300,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() && errorNext != ::osl::File::E_None) { //Error - assert(false); + OSL_ASSERT(false); bCompiled = false; } } @@ -358,7 +358,7 @@ void BackendImpl::implProcessHelp( Reference<ucb::XCommandEnvironment> const & xCmdEnv) { Reference< deployment::XPackage > xPackage(package); - assert(xPackage.is()); + OSL_ASSERT(xPackage.is()); if (doRegisterPackage) { //revive already processed help if possible diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 906c8bc60767..cda1f56de4c4 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -821,7 +821,7 @@ void BackendImpl::PackageImpl::processPackage_( static_cast<OWeakObject *>(this), exc ) ), cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &approve, &abort )) { - assert( !approve && !abort ); + OSL_ASSERT( !approve && !abort ); if (m_legacyBundle) // default for legacy packages: ignore continue; // no selection at all, so rethrow; @@ -900,7 +900,7 @@ void BackendImpl::PackageImpl::processPackage_( static_cast<OWeakObject *>(this), exc ) ), cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &approve, &abort )) { - assert( !approve && !abort ); + OSL_ASSERT( !approve && !abort ); if (m_legacyBundle) // default for legacy packages: ignore continue; // no selection at all, so rethrow @@ -1080,7 +1080,7 @@ void BackendImpl::PackageImpl::exportTo( { Reference<deployment::XPackage> const & xPackage = pbundle[ pos ]; OUString url_( expandUnoRcUrl( xPackage->getURL() ) ); - assert( url_.getLength() >= baseURLlen ); + OSL_ASSERT( url_.getLength() >= baseURLlen ); OUString fullPath; if (url_.getLength() > baseURLlen) fullPath = url_.copy( baseURLlen + 1 ); @@ -1096,7 +1096,7 @@ void BackendImpl::PackageImpl::exportTo( const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); OUString mediaType; - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) mediaType = xPackageType->getMediaType(); else @@ -1252,7 +1252,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( { const Reference<deployment::XPackageTypeInfo> xPackageType( (*iPos)->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) { const OUString mediaType( xPackageType->getMediaType() ); @@ -1271,7 +1271,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( pret[ lower_end ] = *iPos; ++lower_end; } - assert( lower_end == upper_end ); + OSL_ASSERT( lower_end == upper_end ); const ::osl::MutexGuard guard( getMutex() ); pBundle = m_pBundle; @@ -1312,7 +1312,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( try { xPackage.set( getMyBackend()->m_xRootRegistry->bindPackage( url, mediaType, bRemoved, identifier, xCmdEnv ) ); - assert( xPackage.is() ); + OSL_ASSERT( xPackage.is() ); } catch (css::lang::IllegalArgumentException & e) { css::uno::Any exc(cppu::getCaughtException()); throw css::lang::WrappedTargetException( @@ -1340,7 +1340,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( if (xPackage.is()) { const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); // ignore any nested bundles: if (xPackageType.is() && isBundle_( xPackageType->getMediaType() )) xPackage.clear(); @@ -1354,7 +1354,7 @@ void BackendImpl::PackageImpl::scanBundle( ::rtl::Reference<AbortChannel> const & abortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) { - assert( !m_legacyBundle ); + OSL_ASSERT( !m_legacyBundle ); OUString mfUrl( makeURL( m_url_expanded, "META-INF/manifest.xml" ) ); ::ucbhelper::Content manifestContent; @@ -1540,7 +1540,7 @@ void BackendImpl::PackageImpl::scanLegacyBundle( if (xPackage.is()) { const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) mediaType = xPackageType->getMediaType(); @@ -1588,7 +1588,7 @@ BackendImpl::PackageImpl::getPackagesFromDb( { Reference<deployment::XPackage> xExtension = bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv); - assert(xExtension.is()); + OSL_ASSERT(xExtension.is()); if (xExtension.is()) retVector.push_back(xExtension); } diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 7424294acab3..3c59f781a049 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -157,7 +157,7 @@ BackendImpl::BackendImpl( m_typeInfos[ 0 ] = m_xBasicLibTypeInfo; m_typeInfos[ 1 ] = m_xDialogLibTypeInfo; - assert( ! transientMode() ); + OSL_ASSERT( ! transientMode() ); if (!transientMode()) { diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 0b6bc0404651..274ee2f827c2 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -294,7 +294,7 @@ void BackendImpl::PackageImpl:: initPackageHandler() } else { - assert( false ); + OSL_ASSERT( false ); // NOT supported at the moment // TODO } diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 4fd14f88366c..7a1b917ab363 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -693,7 +693,7 @@ typedef std::map< OUString, componentParts > Components; bool getComponent(OUString const & path, OUString * component) { - assert(component != nullptr); + OSL_ASSERT(component != nullptr); if (path.isEmpty() || path[0] != '/') { SAL_INFO( "desktop.migration", "configuration migration in/exclude path " << path << " ignored (does not start with slash)" ); return false; diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 8342745ec3ea..fc858ec3a039 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -142,7 +142,7 @@ private: JavaMigration::~JavaMigration() { - assert(m_aStack.empty()); + OSL_ASSERT(m_aStack.empty()); } OUString jvmfwk_getImplementationName() @@ -346,7 +346,7 @@ void SAL_CALL JavaMigration::setPropertyValue( break; } default: - assert(false); + OSL_ASSERT(false); } } } diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index f3cb45862abf..7645e13926a4 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -399,7 +399,7 @@ uno::Reference< ucb::XProgressHandler > TmpRepositoryCommandEnv::getProgressHand void TmpRepositoryCommandEnv::handle( uno::Reference< task::XInteractionRequest> const & xRequest ) { - assert( xRequest->getRequest().getValueTypeClass() == uno::TypeClass_EXCEPTION ); + OSL_ASSERT( xRequest->getRequest().getValueTypeClass() == uno::TypeClass_EXCEPTION ); bool approve = true; diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index fa1f270b31e7..31a93cecea8a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -334,7 +334,7 @@ extern "C" int unopkg_main() else if (repository == "bundled") extensionUnorc = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"; else - assert(false); + OSL_ASSERT(false); ::rtl::Bootstrap::expandMacros(extensionUnorc); oslFileError e = osl_removeFile(extensionUnorc.pData); diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 238cbb444e36..80ed1bcec910 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -204,7 +204,7 @@ void CommandEnvironmentImpl::handle( Reference<task::XInteractionRequest> const & xRequest ) { Any request( xRequest->getRequest() ); - assert( request.getValueTypeClass() == TypeClass_EXCEPTION ); + OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION ); dp_misc::TRACE("[unopkg_cmdenv.cxx] incoming request:\n" + ::comphelper::anyToString(request) + "\n\n"); @@ -224,11 +224,11 @@ void CommandEnvironmentImpl::handle( // former pkgchk behaviour: const Reference<deployment::XPackage> xPackage( wtExc.Context, UNO_QUERY ); - assert( xPackage.is() ); + OSL_ASSERT( xPackage.is() ); if (xPackage.is()) { const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) { approve = (xPackage->isBundle() && xPackageType->getMediaType().match( @@ -319,7 +319,7 @@ void CommandEnvironmentImpl::handle( void CommandEnvironmentImpl::push( Any const & Status ) { update_( Status ); - assert( m_logLevel >= 0 ); + OSL_ASSERT( m_logLevel >= 0 ); ++m_logLevel; if (m_xLogFile.is()) m_xLogFile->push( Status ); @@ -351,7 +351,7 @@ void CommandEnvironmentImpl::update_( Any const & Status ) msg = buf.makeStringAndClear(); bUseErr = true; } - assert( m_logLevel >= 0 ); + OSL_ASSERT( m_logLevel >= 0 ); for ( sal_Int32 n = 0; n < m_logLevel; ++n ) { if (bUseErr) @@ -377,7 +377,7 @@ void CommandEnvironmentImpl::update( Any const & Status ) void CommandEnvironmentImpl::pop() { - assert( m_logLevel > 0 ); + OSL_ASSERT( m_logLevel > 0 ); --m_logLevel; if (m_xLogFile.is()) m_xLogFile->pop(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 1615b22006b9..c74d9e0d98aa 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -124,7 +124,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) bool isBootstrapVariable(sal_uInt32 * pIndex) { - assert(osl_getCommandArgCount() >= *pIndex); + OSL_ASSERT(osl_getCommandArgCount() >= *pIndex); OUString arg; osl_getCommandArg(*pIndex, &arg.pData); @@ -144,7 +144,7 @@ bool readArgument( { if (*pIndex < osl_getCommandArgCount()) { - assert( pValue != nullptr ); + OSL_ASSERT( pValue != nullptr ); osl_getCommandArg( *pIndex, &pValue->pData ); dp_misc::TRACE(__FILE__ ": argument value: " + *pValue + "\n"); @@ -273,7 +273,7 @@ void printf_package( const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); - assert( xPackageType.is() ); + OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) { printf_line( "Media-Type", xPackageType->getMediaType(), level + 1 ); } @@ -310,7 +310,7 @@ void printf_packages( std::vector<bool> const & vecUnaccepted, Reference<XCommandEnvironment> const & xCmdEnv, sal_Int32 level ) { - assert(allExtensions.size() == vecUnaccepted.size()); + OSL_ASSERT(allExtensions.size() == vecUnaccepted.size()); if (allExtensions.empty()) { @@ -383,7 +383,7 @@ Reference<XComponentContext> connectToOffice( if (verbose) dp_misc::writeConsole("OK. Connecting..."); - assert( buf.isEmpty() ); + OSL_ASSERT( buf.isEmpty() ); buf.append( "uno:pipe,name=" ); buf.append( pipeId ); buf.append( ";urp;StarOffice.ComponentContext" ); diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index 708989afda38..61251922d3bc 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -145,7 +145,7 @@ void ParagraphList::Remove( sal_Int32 nPara ) void ParagraphList::MoveParagraphs( sal_Int32 nStart, sal_Int32 nDest, sal_Int32 _nCount ) { - assert(static_cast<size_t>(nStart) < maEntries.size() && static_cast<size_t>(nDest) < maEntries.size()); + OSL_ASSERT(static_cast<size_t>(nStart) < maEntries.size() && static_cast<size_t>(nDest) < maEntries.size()); if ( (( nDest < nStart ) || ( nDest >= ( nStart + _nCount ) )) && nStart >= 0 && nDest >= 0 && _nCount >= 0 ) { diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 0b94c9bf7751..5d2982315f25 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -170,7 +170,7 @@ void LdapConnection::initConnection() void LdapConnection::getUserProfile( const OUString& aUser, LdapData * data) { - assert(data != nullptr); + OSL_ASSERT(data != nullptr); if (!isValid()) { connectSimple(); } OUString aUserDn =findUserDn( aUser ); diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 1c1374b32451..54d60e335c50 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -90,7 +90,7 @@ bool LdapUserProfileBe::readLdapConfiguration( css::uno::Reference< css::uno::XComponentContext > const & context, LdapDefinition * definition, OUString * loggedOnUser) { - assert(context.is() && definition != nullptr && loggedOnUser != nullptr); + OSL_ASSERT(context.is() && definition != nullptr && loggedOnUser != nullptr); const OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; const OUString kComponent("org.openoffice.LDAP/UserDirectory"); const OUString kServerDefiniton("ServerDefinition"); diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index d88b5c077622..43fc37670a53 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -111,7 +111,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() XInterface * xIntRoot = static_cast<OWeakObject *>(this); #if OSL_DEBUG_LEVEL > 0 acquire(); // make sure we don't delete us twice because of Reference - assert( Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY).get() == xIntRoot ); + OSL_ASSERT( Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY).get() == xIntRoot ); #endif // remove entries in global maps @@ -324,7 +324,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, dispparams.cNamedArgs = 1; dispparams.rgvarg = & varArg; - assert(aDescPut || aVarDesc); + OSL_ASSERT(aDescPut || aVarDesc); VARTYPE vt = 0; DISPID dispid = 0; @@ -506,7 +506,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) throw UnknownPropertyException(msg); } // write-only should not be possible - assert( aDescGet || ! aDescPut); + OSL_ASSERT( aDescGet || ! aDescPut); HRESULT hr; DISPPARAMS dispparams = {nullptr, nullptr, 0, 0}; @@ -999,7 +999,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, { //We should not run into this block, because invokeWithDispIdComTlb should //have been called instead. - assert(false); + OSL_ASSERT(false); } @@ -1171,7 +1171,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument // 2.parameter is a boolean which indicates if the COM pointer was a IUnknown or IDispatch // 3.parameter is a Sequence<Type> o2u_attachCurrentThread(); - assert(aArguments.getLength() == 3); + OSL_ASSERT(aArguments.getLength() == 3); m_spUnknown= *static_cast<IUnknown* const *>(aArguments[0].getValue()); m_spUnknown.QueryInterface( & m_spDispatch.p); @@ -1898,7 +1898,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, { //optional arg //e.g: call func(x) in basic : func() ' no arg supplied - assert(paramFlags & PARAMFLAG_FOPT); + OSL_ASSERT(paramFlags & PARAMFLAG_FOPT); arRefArgs[revIndex].vt = VT_ERROR; arRefArgs[revIndex].scode = DISP_E_PARAMNOTFOUND; } @@ -2171,7 +2171,7 @@ void IUnknownWrapper_Impl::getFuncDescForInvoke(const OUString & sFuncName, } bool IUnknownWrapper_Impl::getDispid(const OUString& sFuncName, DISPID * id) { - assert(m_spDispatch); + OSL_ASSERT(m_spDispatch); LPOLESTR lpsz = const_cast<LPOLESTR> (reinterpret_cast<LPCOLESTR>(sFuncName.getStr())); HRESULT hr = m_spDispatch->GetIDsOfNames(IID_NULL, &lpsz, 1, LOCALE_USER_DEFAULT, id); return hr == S_OK; @@ -2179,7 +2179,7 @@ bool IUnknownWrapper_Impl::getDispid(const OUString& sFuncName, DISPID * id) void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** pFuncDesc) { - assert( * pFuncDesc == nullptr); + OSL_ASSERT( * pFuncDesc == nullptr); buildComTlbIndex(); typedef TLBFuncIndexMap::const_iterator cit; //We assume there is only one entry with the function name. A property @@ -2201,7 +2201,7 @@ void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** p //the actual name as obtained from ITypeInfo OUString sRealName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName))); cit itOrg = m_mapComFunc.find(sRealName); - assert(itOrg != m_mapComFunc.end()); + OSL_ASSERT(itOrg != m_mapComFunc.end()); // maybe this is a property, if so we need // to store either both id's ( put/get ) or // just the get. Storing both is more consistent @@ -2220,7 +2220,7 @@ void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** p pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName.toAsciiLowerCase()); int numEntries = 0; for ( ;p.first != p.second; p.first ++, numEntries ++); - assert( ! (numEntries > 3) ); + OSL_ASSERT( ! (numEntries > 3) ); #endif if( itIndex != m_mapComFunc.end()) { @@ -2249,7 +2249,7 @@ void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** p void IUnknownWrapper_Impl::getPropDesc(const OUString & sFuncName, FUNCDESC ** pFuncDescGet, FUNCDESC** pFuncDescPut, VARDESC** pVarDesc) { - assert( * pFuncDescGet == nullptr && * pFuncDescPut == nullptr); + OSL_ASSERT( * pFuncDescGet == nullptr && * pFuncDescPut == nullptr); buildComTlbIndex(); typedef TLBFuncIndexMap::const_iterator cit; pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName); @@ -2275,7 +2275,7 @@ void IUnknownWrapper_Impl::getPropDesc(const OUString & sFuncName, FUNCDESC ** p for ( int i = 0 ;p.first != p.second; p.first ++, i ++) { // There are a maximum of two entries, property put and property get - assert( ! (i > 2) ); + OSL_ASSERT( ! (i > 2) ); ITypeInfo* pType= getTypeInfo(); FUNCDESC * pFuncDesc = nullptr; if (SUCCEEDED( pType->GetFuncDesc(p.first->second, & pFuncDesc))) diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 6f2f20725d7a..db6398364656 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -273,15 +273,15 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, } catch(const BridgeRuntimeError&) { - assert(false); + OSL_ASSERT(false); } catch(const Exception&) { - assert(false); + OSL_ASSERT(false); } catch(...) { - assert(false); + OSL_ASSERT(false); } return ret; @@ -400,7 +400,7 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id, else if(info.eMemberType == MemberType_PROPERTY) variantToAny( & varParam, anyParam, info.aType); else - assert(false); + OSL_ASSERT(false); pParams[countArgs - (i + 1)]= anyParam; }// end for / iterating over all parameters diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index bf511432e81f..ef576a11aaa4 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -25,7 +25,7 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) { bool ret = false; - assert(sTypeName && pVar); + OSL_ASSERT(sTypeName && pVar); CComObject< UnoTypeWrapper>* pObj; VariantClear(pVar); if( SUCCEEDED( CComObject<UnoTypeWrapper>::CreateInstance( &pObj))) @@ -35,7 +35,7 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) pVar->pdispVal= CComQIPtr<IDispatch>(pObj->GetUnknown()); //now set the value, e.i. the name of the type CComQIPtr<IUnoTypeWrapper> spType(pVar->pdispVal); - assert(spType); + OSL_ASSERT(spType); if (SUCCEEDED(spType->put_Name(sTypeName))) { ret = true; diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 97f4e372c522..4b4afea5523d 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -104,7 +104,7 @@ static void openFile( OutData& out ) static inline OString getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) { - assert(xNameAccess->hasByName(aName)); + OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); return OUStringToOString(aValue.get<OUString>(), RTL_TEXTENCODING_UTF8); @@ -115,7 +115,7 @@ static inline sal_Int32 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) { - assert(xNameAccess->hasByName(aName)); + OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); sal_Int32 n = -1; @@ -191,7 +191,7 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) "com.sun.star.configuration.ConfigurationAccess", aArgumentList ), uno::UNO_QUERY_THROW ); - assert(xNameAccess->hasByName("ooInetProxyType")); + OSL_ASSERT(xNameAccess->hasByName("ooInetProxyType")); uno::Any aValue = xNameAccess->getByName("ooInetProxyType"); sal_Int32 nProxyType = aValue.get< sal_Int32 >(); @@ -336,7 +336,7 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal bool Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir) { - assert( m_aHandler.is() ); + OSL_ASSERT( m_aHandler.is() ); OutData out(m_aCondition); OUString aFile( rFile ); diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 2aa4da72b3ad..0538f40403aa 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -991,7 +991,7 @@ UpdateCheck::enableAutoCheck(bool enable) void UpdateCheck::enableDownload(bool enable, bool paused) { - assert(nullptr == m_pThread); + OSL_ASSERT(nullptr == m_pThread); State eState = DISABLED; if( enable ) @@ -1198,7 +1198,7 @@ UpdateCheck::showDialog(bool forceCheck) break; case NOT_INITIALIZED: - assert( false ); + OSL_ASSERT( false ); break; } @@ -1233,7 +1233,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) bool bSuppressBubble = aInfo.BuildId.equals(m_aUpdateInfo.BuildId); m_aUpdateInfo = aInfo; - assert(DISABLED == m_eState || CHECK_SCHEDULED == m_eState); + OSL_ASSERT(DISABLED == m_eState || CHECK_SCHEDULED == m_eState); // Ignore leading non direct download if we get direct ones std::vector< DownloadSource >::iterator iter = m_aUpdateInfo.Sources.begin(); @@ -1253,7 +1253,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) } rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext, *this); - assert( rModel.is() ); + OSL_ASSERT( rModel.is() ); // Decide whether to use alternate release note pos .. bool autoDownloadEnabled = rModel->isAutoDownloadEnabled(); @@ -1368,7 +1368,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) m_eUpdateState = eState; rtl::Reference<UpdateHandler> aUpdateHandler(getUpdateHandler()); - assert( aUpdateHandler.is() ); + OSL_ASSERT( aUpdateHandler.is() ); UpdateInfo aUpdateInfo(m_aUpdateInfo); OUString aImageName(m_aImageName); diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index d6bbb033ecdc..e61f7edc3e63 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -422,7 +422,7 @@ UpdateCheckConfig::clearUpdateFound() m_xContainer->removeByName(aName); } catch(const lang::WrappedTargetException& ) { // Can not remove value, probably in share layer - assert(false); + OSL_ASSERT(false); m_xContainer->replaceByName(aName, uno::makeAny(OUString())); } } diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 4e0be50fb5f6..13ba54392c0f 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -1040,7 +1040,7 @@ void UpdateHandler::createDialog() { if ( !mxContext.is() ) { - assert( false ); + OSL_ASSERT( false ); return; } diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 905d05723401..93c6508e42f1 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -114,7 +114,7 @@ checkForUpdates( if( !rxContext.is() ) throw uno::RuntimeException( "checkForUpdates: empty component context" ); - assert( rxContext->getServiceManager().is() ); + OSL_ASSERT( rxContext->getServiceManager().is() ); // XPath implementation uno::Reference< xml::xpath::XXPathAPI > xXPath = xml::xpath::XPathAPI::create(rxContext); diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index e3fdaf38936e..28c092c76a81 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -224,8 +224,8 @@ public: sal_Bool SAL_CALL hasMoreElements() override { return m_nCount < m_nNodes; }; uno::Any SAL_CALL nextElement() override { - assert( m_xNodeList.is() ); - assert( m_xUpdateInformationProvider.is() ); + OSL_ASSERT( m_xNodeList.is() ); + OSL_ASSERT( m_xUpdateInformationProvider.is() ); if( !(m_nCount < m_nNodes ) ) throw container::NoSuchElementException(OUString::number(m_nCount), *this); @@ -516,7 +516,7 @@ UpdateInformationProvider::load(const OUString& rURL) uno::Reference< xml::dom::XElement > UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode >& rxNode) { - assert(m_xDocumentBuilder.is()); + OSL_ASSERT(m_xDocumentBuilder.is()); uno::Reference< xml::dom::XElement > xElement(rxNode, uno::UNO_QUERY_THROW); @@ -526,7 +526,7 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode uno::Reference< xml::dom::XDocument > xUpdateXML = m_xDocumentBuilder->parse(load(xElement->getAttribute( "src" ))); - assert( xUpdateXML.is() ); + OSL_ASSERT( xUpdateXML.is() ); if( xUpdateXML.is() ) return xUpdateXML->getDocumentElement(); @@ -561,7 +561,7 @@ uno::Reference< xml::dom::XNode > UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const OUString& rName) { - assert(m_xXPathAPI.is()); + OSL_ASSERT(m_xXPathAPI.is()); try { return m_xXPathAPI->selectSingleNode(rxNode, "./atom:" + rName); } catch (const xml::xpath::XPathException &) { @@ -577,7 +577,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration( OUString const & extensionId ) { - assert(m_xDocumentBuilder.is()); + OSL_ASSERT(m_xDocumentBuilder.is()); // reset cancelled flag m_bCancelled.reset(); diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index d3f3dc5d28d2..8070b085a608 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -163,7 +163,7 @@ bool equalSequences(const Any& orig, const Any& returned) { if (orig.getValueTypeClass() != TypeClass_SEQUENCE) { - assert(0); + OSL_ASSERT(0); return false; } TypeDescription td(orig.getValueTypeRef()); diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index f80ca28306e1..e4804608bf5e 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -279,7 +279,7 @@ void TestListener::cmdLine() void TestListener::detach() { - assert( m_pDebuggingRef ); + OSL_ASSERT( m_pDebuggingRef ); m_pDebuggingRef = 0; } @@ -299,15 +299,15 @@ void checkInvokation( const XInvokationRef &xInvoke ) UsrAny anyList; // check exporting an object as an invokation - assert( xInvoke->hasProperty( L"list" ) ); + OSL_ASSERT( xInvoke->hasProperty( L"list" ) ); anyList = xInvoke->getValue( L"list" ); - assert( anyList.getReflection() == XInvokation_getReflection() ); + OSL_ASSERT( anyList.getReflection() == XInvokation_getReflection() ); XInvokationRef *pRef = ( XInvokationRef * ) anyList.get(); - assert( (*pRef).is() ); + OSL_ASSERT( (*pRef).is() ); - assert( (*pRef)->hasMethod( L"append" ) ); - assert( (*pRef)->hasMethod( L"count" ) ); + OSL_ASSERT( (*pRef)->hasMethod( L"append" ) ); + OSL_ASSERT( (*pRef)->hasMethod( L"count" ) ); Sequence<UsrAny> seq(1); UsrAny any( (INT32) 1); @@ -319,7 +319,7 @@ void checkInvokation( const XInvokationRef &xInvoke ) any = (*pRef)->invoke( L"append" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); - assert( nOldSize + 1 == any.getINT32() ); + OSL_ASSERT( nOldSize + 1 == any.getINT32() ); } // just for testing ! @@ -424,30 +424,30 @@ int SAL_CALL main (int argc, char **argv) *****/ // get/set an int ! { - assert( xInvoke->hasProperty( L"nIntTest" ) ); + OSL_ASSERT( xInvoke->hasProperty( L"nIntTest" ) ); UsrAny any = xInvoke->getValue( L"nIntTest" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 5 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 5 ); // simple test: set an int ! xInvoke->setValue( L"nIntTest" , UsrAny( (INT32) 10 ) ); any = xInvoke->getValue( L"nIntTest" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 10 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 10 ); } // call a python method ! { xEngine->run( L"def foo():\n" L" return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () ); - assert( xInvoke->hasMethod( L"foo" ) ); + OSL_ASSERT( xInvoke->hasMethod( L"foo" ) ); UsrAny any = xInvoke->invoke( L"foo" , Sequence<UsrAny>(), Sequence<INT16>() , Sequence<UsrAny> () ); - assert( any.getString() == L"this is foo" ); + OSL_ASSERT( any.getString() == L"this is foo" ); } @@ -456,7 +456,7 @@ int SAL_CALL main (int argc, char **argv) try { xInvoke->invoke( L"foo" , Sequence<UsrAny>(1) , Sequence<INT16>(), Sequence<UsrAny> () ); // wrong number of arguments - assert( 0 ); + OSL_ASSERT( 0 ); } catch ( IllegalArgumentException& e ) { } @@ -477,21 +477,21 @@ int SAL_CALL main (int argc, char **argv) *******/ { XIntrospectionAccessRef xIntrospection = xInvoke->getIntrospection(); - assert( xIntrospection.is() ); + OSL_ASSERT( xIntrospection.is() ); // no further test, simply call them xIntrospection->getMethods(0); xIntrospection->getProperties(0); - assert( xIntrospection->getSuppliedMethodConcepts() == 0 ); - assert( xIntrospection->getSuppliedPropertyConcepts() == 0 ); + OSL_ASSERT( xIntrospection->getSuppliedMethodConcepts() == 0 ); + OSL_ASSERT( xIntrospection->getSuppliedPropertyConcepts() == 0 ); Property prop = xIntrospection->getProperty( L"nIntTest" ,0 ); - assert( prop.Name == L"nIntTest" ); - assert( prop.Type->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( prop.Name == L"nIntTest" ); + OSL_ASSERT( prop.Type->getTypeClass() == TypeClass_LONG ); XIdlMethodRef method = xIntrospection->getMethod( L"foo" , 0 ); - assert( method->getName() == L"foo" ); + OSL_ASSERT( method->getName() == L"foo" ); } @@ -543,8 +543,8 @@ int SAL_CALL main (int argc, char **argv) xEngine->run( L"import testmodul\n" L"x = testmodul.testmethod()\n" , XInterfaceRef() , Sequence<UsrAny>() ); UsrAny any = xInvoke->getValue( L"x" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 42 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 42 ); } // check other imports @@ -553,11 +553,11 @@ int SAL_CALL main (int argc, char **argv) xEngine->run( L"import math\n" L"dMathTest = math.exp(0)\n" , XInterfaceRef() , Sequence<UsrAny> () ); - assert( xInvoke->hasProperty( L"dMathTest" ) ); + OSL_ASSERT( xInvoke->hasProperty( L"dMathTest" ) ); UsrAny any = xInvoke->getValue( L"dMathTest" ); - assert( any.getReflection()->getTypeClass() == TypeClass_DOUBLE ); - assert( any.getDouble() == 1. ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_DOUBLE ); + OSL_ASSERT( any.getDouble() == 1. ); } // Test connection to root object ! @@ -568,36 +568,36 @@ int SAL_CALL main (int argc, char **argv) L"z = y.value\n" , XInterfaceRef() , Sequence<UsrAny> () ); UsrAny any = xInvoke->getValue( L"x" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 15 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 15 ); any = xInvoke->getValue( L"z" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 15 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 15 ); } // Test exactName interface { UsrAny any = xInvoke->getValue( L"__builtins__" ); - assert( any.getReflection()->getTypeClass() == TypeClass_INTERFACE ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_INTERFACE ); XInvokationRef rInv( *((XInterfaceRef *) any.get() ), USR_QUERY ); - assert( rInv.is() ); + OSL_ASSERT( rInv.is() ); XExactNameRef rName( *((XInterfaceRef*) any.get() ), USR_QUERY ); - assert( rName.is() ); + OSL_ASSERT( rName.is() ); UString str = rName->getExactName( L"SYNTAXERROR" ); - assert( str.len() ); + OSL_ASSERT( str.len() ); } // Test exactName interface of the engine itself { XExactNameRef rName( xInvoke , USR_QUERY ); - assert( rName.is() ); + OSL_ASSERT( rName.is() ); UString str = rName->getExactName( L"STARDIV" ); - assert( str.len() ); + OSL_ASSERT( str.len() ); } diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index c12d83ee40fd..b7174dbe12ab 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -433,7 +433,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE * void CmdDebugger::detach() { - assert( m_pDebuggingRef ); + OSL_ASSERT( m_pDebuggingRef ); m_bIsRunning = FALSE; m_pDebuggingRef = 0; diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index b62c045843e3..e9bed4c909b4 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -62,7 +62,7 @@ int SAL_CALL main (int argc, char **argv) // create service manager // XMultiServiceFactoryRef xSMgr = getProcessServiceManager(); XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); - assert( xSMgr.is() ); + OSL_ASSERT( xSMgr.is() ); registerUsrServices( xSMgr ); setProcessServiceManager( xSMgr ); diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index c163df0e9224..34d7d10bb9f9 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -160,7 +160,7 @@ bool FlashExporter::exportAll( const Reference< XComponent >& xDoc, Reference< X } catch( const Exception& ) { - assert( false ); + OSL_ASSERT( false ); return false; // no writer, no cookies } @@ -289,7 +289,7 @@ bool FlashExporter::exportSlides( const Reference< XDrawPage >& xDrawPage, Refer } catch( const Exception& ) { - assert( false ); + OSL_ASSERT( false ); } exportDrawPageContents(xDrawPage, true, false); @@ -631,7 +631,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster } catch( const Exception& ) { - assert(false); + OSL_ASSERT(false); } } diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 4dc4eec9f8fb..459bc8da3bbc 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -450,7 +450,7 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDes if (!xOutputStream.is() ) { - assert ( false ); + OSL_ASSERT ( false ); return false; } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 32b2c787e596..ee786573f1a0 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1731,7 +1731,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( // write out link to graphic else { - assert(aGraphicUrl.getLength()); + OSL_ASSERT(aGraphicUrl.getLength()); AddOpt( ESCHER_Prop_pibName, aGraphicUrl ); sal_uInt32 nPibFlags=0; @@ -2075,7 +2075,7 @@ sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly ) sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex ) { sal_uInt16 k = rPoly.GetSize(); - assert ( k >= ( 3 + nIndex ) ); + OSL_ASSERT ( k >= ( 3 + nIndex ) ); Point aPt; Point aStart = rPoly[0]; @@ -2355,7 +2355,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { size_t nIndex = (size_t) nValue; - assert(nIndex < rEquationOrder.size()); + OSL_ASSERT(nIndex < rEquationOrder.size()); if ( nIndex < rEquationOrder.size() ) { nValue = (sal_uInt16)rEquationOrder[ nIndex ]; diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index b32a8a2e14b9..83dee6c37223 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -44,7 +44,7 @@ namespace { template< typename Type > inline void lclRotateLeft( Type& rnValue, int nBits ) { - assert( + OSL_ASSERT( nBits >= 0 && sal::static_int_cast< unsigned int >(nBits) < sizeof( Type ) * 8 ); rnValue = static_cast< Type >( (rnValue << nBits) | (rnValue >> (sizeof( Type ) * 8 - nBits)) ); @@ -54,7 +54,7 @@ inline void lclRotateLeft( Type& rnValue, int nBits ) template< typename Type > inline void lclRotateLeft( Type& rnValue, sal_uInt8 nBits, sal_uInt8 nWidth ) { - assert( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8) ); + OSL_ASSERT( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8) ); Type nMask = static_cast< Type >( (1UL << nWidth) - 1 ); rnValue = static_cast< Type >( ((rnValue << nBits) | ((rnValue & nMask) >> (nWidth - nBits))) & nMask ); diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index e91cbc523c12..685d6ebce9eb 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -126,7 +126,7 @@ OdfFlatXml::importer( sourceData[paramIdx].Value >>= url; } - assert(inputStream.is()); + OSL_ASSERT(inputStream.is()); if (!inputStream.is()) return false; @@ -186,10 +186,10 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, } // get data source interface ... Reference<XActiveDataSource> dataSource(getDelegate(), UNO_QUERY); - assert(dataSource.is()); + OSL_ASSERT(dataSource.is()); if (!dataSource.is()) return false; - assert(outputStream.is()); + OSL_ASSERT(outputStream.is()); if (!outputStream.is()) return false; dataSource->setOutputStream(outputStream); diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index 4927facc3c98..445d233fe6d5 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -85,7 +85,7 @@ bool SVGFilter::implImport(const Sequence< PropertyValue >& rDescriptor) xSeek->seek(0); } - assert(xInputStream.is()); + OSL_ASSERT(xInputStream.is()); if(!xInputStream.is()) return false; diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index fad6cbd5b6a7..0546eea3132e 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -595,7 +595,7 @@ struct AnnotatingVisitor aBuf.append( sal_Int32(nBlue), 16 ); // TODO(F3): respect alpha transparency (polygons etc.) - assert(rColor.a == 1.0); + OSL_ASSERT(rColor.a == 1.0); return aBuf.makeStringAndClear(); } @@ -1253,11 +1253,11 @@ struct AnnotatingVisitor nDummyIndex=0; OUString aCurrAttrib( aCurrToken.getToken(0,':',nDummyIndex).trim()); - assert(nDummyIndex!=-1); + OSL_ASSERT(nDummyIndex!=-1); nDummyIndex=0; OUString aCurrValue( aCurrToken.getToken(1,':',nDummyIndex).trim()); - assert(nDummyIndex==-1); + OSL_ASSERT(nDummyIndex==-1); // recurse into normal attribute parsing parseAttribute( getTokenId(aCurrAttrib), diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 2ca25e8190a2..45ebedc2d900 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -258,7 +258,7 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property if ( !mxInputStream.is() ) { - assert( false ); + OSL_ASSERT( false ); return false; } diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index bdfa6387c6e7..d828cbd91991 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -268,10 +268,10 @@ namespace XSLT void Reader::execute() { - assert(m_transformer != nullptr); - assert(m_transformer->getInputStream().is()); - assert(m_transformer->getOutputStream().is()); - assert(!m_transformer->getStyleSheetURL().isEmpty()); + OSL_ASSERT(m_transformer != nullptr); + OSL_ASSERT(m_transformer->getInputStream().is()); + OSL_ASSERT(m_transformer->getOutputStream().is()); + OSL_ASSERT(!m_transformer->getStyleSheetURL().isEmpty()); ::std::map<const char*, OString>::iterator pit; ::std::map<const char*, OString> pmap = m_transformer->getParameters(); ::std::vector< const char* > params( pmap.size() * 2 + 1 ); // build parameters diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index ed54f2e34d67..6564d2ea88a9 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -53,7 +53,7 @@ namespace XSLT { Reference<XStream> SAL_CALL OleHandler::createTempFile() { Reference<XStream> tempFile( TempFile::create(m_xContext), UNO_QUERY); - assert(tempFile.is()); + OSL_ASSERT(tempFile.is()); return tempFile; } diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index d64ae15f21b9..47d9e380ae14 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -296,7 +296,7 @@ namespace XSLT else if ( aName == "InteractionHandler" ) value >>= xInterActionHandler; } - assert(xInputStream.is()); + OSL_ASSERT(xInputStream.is()); if (!xInputStream.is()) return false; @@ -320,9 +320,9 @@ namespace XSLT m_tcontrol = impl_createTransformer(msUserData[1], args); - assert(xHandler.is()); - assert(xInputStream.is()); - assert(m_tcontrol.is()); + OSL_ASSERT(xHandler.is()); + OSL_ASSERT(xInputStream.is()); + OSL_ASSERT(m_tcontrol.is()); if (xHandler.is() && xInputStream.is() && m_tcontrol.is()) { try @@ -473,8 +473,8 @@ namespace XSLT m_tcontrol = impl_createTransformer(msUserData[1], args); - assert(m_rOutputStream.is()); - assert(m_tcontrol.is()); + OSL_ASSERT(m_rOutputStream.is()); + OSL_ASSERT(m_tcontrol.is()); if (m_tcontrol.is() && m_rOutputStream.is()) { // we want to be notfied when the processing is done... diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index a350bfe2f10e..f1c9023a1cfd 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -131,7 +131,7 @@ public: try { - assert( m_ResMgr && m_OtherResMgr ); + OSL_ASSERT( m_ResMgr && m_OtherResMgr ); // translate the control id to a resource id sal_Int16 aResId = CtrlIdToResId( aId ); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index d1d094d0b3b1..62ba06b9fe14 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -170,7 +170,7 @@ void lcl_throwCorruptedUIConfigurationException( { css::uno::Exception e; bool ok = (exception >>= e); - assert(ok); (void) ok; // avoid warnings + OSL_ASSERT(ok); (void) ok; // avoid warnings throw css::configuration::CorruptedUIConfigurationException( lcl_getLocalizedMessage(id), css::uno::Reference< css::uno::XInterface >(), diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 6d69d002541a..b8b9c3f47bd7 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -78,7 +78,7 @@ Sequence< Any > make_seq_out_of_struct( } typelib_TypeDescription * pTD = nullptr; TYPELIB_DANGER_GET( &pTD, type.getTypeLibType() ); - assert( pTD ); + OSL_ASSERT( pTD ); if (! pTD) { throw RuntimeException( diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 0c9f372e039c..1171aebc87d7 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -317,7 +317,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventO if (iDescriptor == maListeners.end()) { - assert(iDescriptor != maListeners.end()); + OSL_ASSERT(iDescriptor != maListeners.end()); return; } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 3b936d92ff8f..2ab500e34b04 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -148,7 +148,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, m_xContext( rxContext ), m_sIconTheme( SvtMiscOptions().GetIconTheme() ) { - assert( m_xContext.is() ); + OSL_ASSERT( m_xContext.is() ); vcl::Window* pWindow = m_pToolBar; while ( pWindow && !pWindow->IsSystemWindow() ) @@ -204,12 +204,12 @@ ToolBarManager::~ToolBarManager() { assert(!m_aAsyncUpdateControllersTimer.IsActive()); assert(!m_pToolBar); // must be disposed by ToolbarLayoutManager - assert( !m_bAddedToTaskPaneList ); + OSL_ASSERT( !m_bAddedToTaskPaneList ); } void ToolBarManager::Destroy() { - assert( m_pToolBar != nullptr ); + OSL_ASSERT( m_pToolBar != nullptr ); SolarMutexGuard g; if ( m_bAddedToTaskPaneList ) { diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 4b6fd854ed7f..b5f4917e8781 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -633,7 +633,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal return OUString(); // ignore prefix and suffix case PAGE_DESCRIPTOR: case BITMAP: - assert(false); + OSL_ASSERT(false); throw IllegalArgumentException(); case CHARS_UPPER_LETTER_N: lcl_formatChars1( upperLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ... @@ -653,6 +653,8 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal } catch (Exception& ) { // When transliteration property is missing, return default number (bug #101141#) result += OUString::number( number ); + // OSL_ASSERT(0); + // throw IllegalArgumentException(); } break; case NATIVE_NUMBERING: @@ -856,7 +858,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal break; default: - assert(false); + OSL_ASSERT(false); throw IllegalArgumentException(); } diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 71b98d5de299..bded191b7020 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -503,7 +503,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( { if (pCurrent->dllName == i.pLib) { - assert( pOutCachedItem ); + OSL_ASSERT( pOutCachedItem ); if( pOutCachedItem ) { (*pOutCachedItem) = new LocaleDataLookupTableItem( *pCurrent ); @@ -531,7 +531,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( ::osl::MutexGuard aGuard( maMutex ); LocaleDataLookupTableItem* pNewItem = new LocaleDataLookupTableItem(i.pLib, module, i.pLocale); maLookupTable.push_back(pNewItem); - assert( pOutCachedItem ); + OSL_ASSERT( pOutCachedItem ); if( pOutCachedItem ) { (*pOutCachedItem) = new LocaleDataLookupTableItem( *pNewItem ); @@ -1286,7 +1286,7 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) rVal.Value <<= (sal_Int16) sVal.toInt32(); break; default: - assert(false); + OSL_ASSERT(false); } } } @@ -1381,7 +1381,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) case 10: level[j].sTransliteration = tmp; break; case 11: level[j].nNatNum = tmp.toInt32(); break; default: - assert(false); + OSL_ASSERT(false); } } } diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx index bd229af5288e..044a279c061e 100644 --- a/include/canvas/base/spritecanvasbase.hxx +++ b/include/canvas/base/spritecanvasbase.hxx @@ -139,7 +139,7 @@ namespace canvas // SpriteSurface virtual void showSprite( const Sprite::Reference& rSprite ) override { - assert( rSprite.is() ); + OSL_ASSERT( rSprite.is() ); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -148,7 +148,7 @@ namespace canvas virtual void hideSprite( const Sprite::Reference& rSprite ) override { - assert( rSprite.is() ); + OSL_ASSERT( rSprite.is() ); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -160,7 +160,7 @@ namespace canvas const ::basegfx::B2DPoint& rNewPos, const ::basegfx::B2DVector& rSpriteSize ) override { - assert( rSprite.is() ); + OSL_ASSERT( rSprite.is() ); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -171,7 +171,7 @@ namespace canvas const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DRange& rUpdateArea ) override { - assert( rSprite.is() ); + OSL_ASSERT( rSprite.is() ); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 740ac57e19c3..bb2f31bcd78f 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -85,7 +85,7 @@ protected: */ virtual ~ReferenceObject() { - assert(m_nReferenceCount == 0); + OSL_ASSERT(m_nReferenceCount == 0); } }; diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index d01daeadf931..b1395946d936 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -77,7 +77,7 @@ namespace io_acceptor aReadBytes.realloc( nBytesToRead ); } sal_Int32 n = m_pipe.read( aReadBytes.getArray(), nBytesToRead ); - assert( n >= 0 && n <= aReadBytes.getLength() ); + OSL_ASSERT( n >= 0 && n <= aReadBytes.getLength() ); if( n < aReadBytes.getLength() ) { aReadBytes.realloc( n ); diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index e47a4f342e31..9053ada96698 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -497,7 +497,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 sal_Int32 nToRead = nBytesToRead - ( m_pBuffer->getSize() - m_nCurrentPos ); nRead = m_input->readBytes( aData , nToRead ); - assert( aData.getLength() == nRead ); + OSL_ASSERT( aData.getLength() == nRead ); m_pBuffer->writeAt( m_pBuffer->getSize() , aData ); @@ -506,7 +506,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 } } - assert( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); + OSL_ASSERT( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); m_pBuffer->readAt( m_nCurrentPos , aData , nBytesToRead ); diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 44c587895114..283344c271ee 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -181,13 +181,13 @@ sal_Int32 ODataStreamTest::test( rSource.set( x, UNO_QUERY ); } - assert( rPipeInput.is() ); - assert( rPipeOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); rSink->setInputStream( rPipeInput ); rSource->setOutputStream( rPipeOutput ); - assert( rSink->getInputStream().is() ); - assert( rSource->getOutputStream().is() ); + OSL_ASSERT( rSink->getInputStream().is() ); + OSL_ASSERT( rSource->getOutputStream().is() ); if( 1 == hTestHandle ) { testSimple( rInput , rOutput ); @@ -727,10 +727,10 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, Reference <XOutputStream > markableOutput( x , UNO_QUERY ); Reference <XActiveDataSource > markableSource( x , UNO_QUERY ); - assert( markableInput.is() ); - assert( markableOutput.is() ); - assert( markableSink.is() ); - assert( markableSource.is() ); + OSL_ASSERT( markableInput.is() ); + OSL_ASSERT( markableOutput.is() ); + OSL_ASSERT( markableSink.is() ); + OSL_ASSERT( markableSource.is() ); markableSink->setInputStream( rPipeInput ); markableSource->setOutputStream( rPipeOutput ); @@ -748,14 +748,14 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, rSource.set( x, UNO_QUERY ); } - assert( rPipeInput.is() ); - assert( rPipeOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); rSink->setInputStream( markableInput ); rSource->setOutputStream( markableOutput ); - assert( rSink->getInputStream().is() ); - assert( rSource->getOutputStream().is() ); + OSL_ASSERT( rSink->getInputStream().is() ); + OSL_ASSERT( rSource->getOutputStream().is() ); if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) { testObject( rOutput , rInput); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index b8c229dab312..8892e7338330 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -135,8 +135,8 @@ sal_Int32 OMarkableOutputStreamTest::test( Reference< XOutputStream > rOutput( TestObject , UNO_QUERY ); - assert( rPipeInput.is() ); - assert( rOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rOutput.is() ); if( 1 == hTestHandle ) { // checks usual streaming testSimple( rOutput , rPipeInput ); @@ -489,8 +489,8 @@ sal_Int32 OMarkableInputStreamTest::test( Reference < XInputStream > rInput( TestObject , UNO_QUERY ); - assert( rPipeOutput.is() ); - assert( rInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); + OSL_ASSERT( rInput.is() ); if( 1 == hTestHandle ) { // checks usual streaming testSimple( rPipeOutput , rInput ); diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 67310cf854a7..69a2bdeccfb8 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -72,11 +72,11 @@ void doRead( const Reference < XConnection > &r ) { Sequence < sal_Int8 > seq(10); - assert( 10 == r->read( seq , 10 ) ); + OSL_ASSERT( 10 == r->read( seq , 10 ) ); for( sal_Int32 i = 0 ; i < 10 ; i ++ ) { - assert( seq.getConstArray()[i] == i ); + OSL_ASSERT( seq.getConstArray()[i] == i ); } } @@ -130,7 +130,7 @@ void testConnection( const OUString &sConnectionDescription , TimeValue value = {1,0}; osl_waitThread( &value ); r = rConnector->connect( sConnectionDescription ); - assert( r.is() ); + OSL_ASSERT( r.is() ); doWrite( r ); doRead( r ); bGotit = sal_True; diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index d75bf132ce0b..6ec95eaa4484 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -49,12 +49,12 @@ namespace javaunohelper inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env ) { - assert( sizeof (sal_Unicode) == sizeof (jchar) ); + OSL_ASSERT( sizeof (sal_Unicode) == sizeof (jchar) ); jsize len = jni_env->GetStringLength( jstr ); rtl_uString * ustr = static_cast<rtl_uString *>(rtl_allocateMemory( sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) )); jni_env->GetStringRegion( jstr, 0, len, reinterpret_cast<jchar *>(ustr->buffer) ); - assert( !jni_env->ExceptionCheck() ); + OSL_ASSERT( !jni_env->ExceptionCheck() ); ustr->refCount = 1; ustr->length = len; ustr->buffer[ len ] = '\0'; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 8e8146628621..1750696ab018 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -171,7 +171,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) m_sJavaHome = "file:///usr/lib"; // init m_sRuntimeLibrary - assert(!m_sHome.isEmpty()); + OSL_ASSERT(!m_sHome.isEmpty()); //call virtual function to get the possible paths to the runtime library. int size = 0; @@ -256,7 +256,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) return false; // init m_sLD_LIBRARY_PATH - assert(!m_sHome.isEmpty()); + OSL_ASSERT(!m_sHome.isEmpty()); size = 0; char const * const * arLDPaths = getLibraryPaths( & size); vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 9071bc6fa3b5..0bd412408b3b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -103,7 +103,7 @@ OString getPluginJarPath( SunVersion ver142("1.4.2-ea"); SunVersion ver150("1.5.0-ea"); SunVersion ver(sVersion); - assert(ver142 && ver150 && ver); + OSL_ASSERT(ver142 && ver150 && ver); OUString sName; if (ver < ver142) @@ -139,7 +139,7 @@ OString getPluginJarPath( sPath = sPath1 + OUString::createFromAscii(sep) + sPath2; } } - assert(!sPath.isEmpty()); + OSL_ASSERT(!sPath.isEmpty()); } ret = OUStringToOString(sPath, osl_getThreadTextEncoding()); @@ -301,7 +301,7 @@ javaPluginError jfw_plugin_getAllJavaInfos( { assert(parJavaInfo); - assert(!sVendor.isEmpty()); + OSL_ASSERT(!sVendor.isEmpty()); if (sVendor.isEmpty()) return javaPluginError::InvalidArg; @@ -349,11 +349,11 @@ javaPluginError jfw_plugin_getJavaInfoByPath( std::unique_ptr<JavaInfo> * ppInfo) { assert(ppInfo != nullptr); - assert(!sPath.isEmpty()); + OSL_ASSERT(!sPath.isEmpty()); if (sPath.isEmpty()) return javaPluginError::InvalidArg; - assert(!sVendor.isEmpty()); + OSL_ASSERT(!sVendor.isEmpty()); if (sVendor.isEmpty()) return javaPluginError::InvalidArg; @@ -688,7 +688,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( reinterpret_cast<JNI_CreateVM_Type *>(moduleRt.getFunctionSymbol(sSymbolCreateJava)); if (!pCreateJavaVM) { - assert(false); + OSL_ASSERT(false); OString sLib = OUStringToOString( sRuntimeLib, osl_getThreadTextEncoding()); OString sSymbol = OUStringToOString( diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 0b37c182f805..3c31e60c63e6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -404,7 +404,7 @@ bool getJavaProps(const OUString & exePath, { bool ret = false; - assert(!exePath.isEmpty()); + OSL_ASSERT(!exePath.isEmpty()); OUString usStartDir; //We need to set the CLASSPATH in case the office is started from //a different directory. The JREProperties.class is expected to reside @@ -515,7 +515,7 @@ bool getJavaProps(const OUString & exePath, continue; //The JREProperties class writes key value pairs, separated by '=' sal_Int32 index = sLine.indexOf('='); - assert(index != -1); + OSL_ASSERT(index != -1); OUString sKey = sLine.copy(0, index); OUString sVal = sLine.copy(index + 1); @@ -541,7 +541,7 @@ bool getJavaProps(const OUString & exePath, TimeValue waitMax= {5 ,0}; procErr = osl_joinProcessWithTimeout(javaProcess, &waitMax); - assert(procErr == osl_Process_E_None); + OSL_ASSERT(procErr == osl_Process_E_None); osl_freeProcessHandle(javaProcess); return ret; } @@ -552,7 +552,7 @@ bool getJavaProps(const OUString & exePath, */ bool decodeOutput(const OString& s, OUString* out) { - assert(out != nullptr); + OSL_ASSERT(out != nullptr); OUStringBuffer buff(512); sal_Int32 nIndex = 0; do diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index c84e668e8371..1f7423045bc1 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -122,7 +122,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) return false; // init m_sRuntimeLibrary - assert(!m_sHome.isEmpty()); + OSL_ASSERT(!m_sHome.isEmpty()); //call virtual function to get the possible paths to the runtime library. int size = 0; @@ -148,7 +148,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) return false; // init m_sLD_LIBRARY_PATH - assert(!m_sHome.isEmpty()); + OSL_ASSERT(!m_sHome.isEmpty()); size = 0; char const * const * arLDPaths = getLibraryPaths( & size); vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size); diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index a57af9ad2374..353eab37ba6f 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -51,7 +51,7 @@ OString getElement(OString const & docPath, xmlChar const * pathExpression, bool bThrowIfEmpty) { //Prepare the xml document and context - assert(!docPath.isEmpty()); + OSL_ASSERT(!docPath.isEmpty()); jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr())); if (doc == nullptr) throw FrameworkException( @@ -712,7 +712,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode " "(elements.cxx)."); - assert(pJavaInfo && pDoc); + OSL_ASSERT(pJavaInfo && pDoc); if (pJavaInfo->children == nullptr) return; //Get the xsi:nil attribute; @@ -829,7 +829,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc, xmlNode* pJavaInfoNode) const { - assert(pJavaInfoNode && pDoc); + OSL_ASSERT(pJavaInfoNode && pDoc); //write the attribute vendorSettings //javaInfo@vendorUpdate diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 9dd836a5b806..ddc5e6c19747 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -239,7 +239,7 @@ javaFrameworkError jfw_startVM( "-Djava.class.path=" + jfw::BootParams::getClasspath(); } else - assert(false); + OSL_ASSERT(false); pInfo = aInfo.get(); } assert(pInfo != nullptr); @@ -299,7 +299,7 @@ javaFrameworkError jfw_startVM( g_pJavaVM = pVm; *ppVM = pVm; } - assert(plerr != javaPluginError::WrongVendor); + OSL_ASSERT(plerr != javaPluginError::WrongVendor); } catch (const jfw::FrameworkException& e) { @@ -667,7 +667,7 @@ javaFrameworkError jfw_getJavaInfoByPath(OUString const & pPath, std::unique_ptr {// plugin does not recognize this path as belonging to JRE continue; } - assert(false); + OSL_ASSERT(false); } if (!*ppInfo && errcode != JFW_E_FAILED_VERSION) errcode = JFW_E_NOT_RECOGNIZED; diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 226673356cd5..dbab7d4a9e7a 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -120,7 +120,7 @@ VendorSettings::VendorSettings(): VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) { - assert(!sVendor.isEmpty()); + OSL_ASSERT(!sVendor.isEmpty()); VersionInfo aVersionInfo; OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8); //Get minVersion @@ -436,7 +436,7 @@ JFW_MODE getMode() OUString getApplicationClassPath() { - assert(getMode() == JFW_MODE_APPLICATION); + OSL_ASSERT(getMode() == JFW_MODE_APPLICATION); OUString retVal; OUString sParams = BootParams::getClasspathUrls(); if (sParams.isEmpty()) @@ -453,7 +453,7 @@ OUString getApplicationClassPath() OUString systemPathElement; oslFileError rc = osl_getSystemPathFromFileURL( token.pData, &systemPathElement.pData ); - assert( rc == osl_File_E_None ); + OSL_ASSERT( rc == osl_File_E_None ); if (rc == osl_File_E_None && !systemPathElement.isEmpty()) { if (buf.getLength() > 0) diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx index 435054d12bb3..2f8e93701e97 100644 --- a/oox/source/drawingml/clrscheme.cxx +++ b/oox/source/drawingml/clrscheme.cxx @@ -18,7 +18,6 @@ */ #include <algorithm> -#include <cassert> #include <osl/diagnose.h> #include "oox/drawingml/clrscheme.hxx" @@ -64,7 +63,7 @@ private: bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const { - assert((nSchemeClrToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nSchemeClrToken & sal_Int32(0xFFFF0000))==0); switch( nSchemeClrToken ) { case XML_bg1 : nSchemeClrToken = XML_lt1; break; diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index afbb4612de16..725d7af84c87 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -106,7 +106,7 @@ float GetFontHeight( sal_Int32 nHeight ) sal_Int16 GetFontUnderline( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_none: return awt::FontUnderline::NONE; @@ -133,7 +133,7 @@ sal_Int16 GetFontUnderline( sal_Int32 nToken ) sal_Int16 GetFontStrikeout( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_dblStrike: return awt::FontStrikeout::DOUBLE; @@ -156,7 +156,7 @@ sal_Int16 GetCaseMap( sal_Int32 nToken ) /** converts a paragraph align to a ParaAdjust */ ParagraphAdjust GetParaAdjust( sal_Int32 nAlign ) { - assert((nAlign & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nAlign & sal_Int32(0xFFFF0000))==0); ParagraphAdjust nEnum; switch( nAlign ) { @@ -224,7 +224,7 @@ const char* GetTextVerticalAdjust( TextVerticalAdjust eAdjust ) TabAlign GetTabAlign( sal_Int32 aToken ) { - assert((aToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((aToken & sal_Int32(0xFFFF0000))==0); TabAlign nEnum; switch( aToken ) { diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 2d128ec1b449..314ff5822695 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -113,7 +113,7 @@ Reference< XGraphic > applyBrightnessContrast( Reference< XGraphic > const & xGr BitmapMode lclGetBitmapMode( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_tile: return BitmapMode_REPEAT; @@ -124,7 +124,7 @@ BitmapMode lclGetBitmapMode( sal_Int32 nToken ) RectanglePoint lclGetRectanglePoint( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_tl: return RectanglePoint_LEFT_TOP; @@ -317,7 +317,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, if( moFillType.has() ) { FillStyle eFillStyle = FillStyle_NONE; - assert((moFillType.get() & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((moFillType.get() & sal_Int32(0xFFFF0000))==0); switch( moFillType.get() ) { case XML_noFill: diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index 92d46a5deb84..dabe5d71356b 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -132,7 +132,7 @@ void lclConvertCustomDash( LineDash& orLineDash, const LineProperties::DashStopV DashStyle lclGetDashStyle( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_rnd: return DashStyle_ROUNDRELATIVE; @@ -144,7 +144,7 @@ DashStyle lclGetDashStyle( sal_Int32 nToken ) LineJoint lclGetLineJoint( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_round: return LineJoint_ROUND; @@ -160,7 +160,7 @@ const sal_Int32 OOX_ARROWSIZE_LARGE = 2; sal_Int32 lclGetArrowSize( sal_Int32 nToken ) { - assert((nToken & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { case XML_sm: return OOX_ARROWSIZE_SMALL; @@ -181,7 +181,7 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, sal_Int32 nMarkerWidth = 0; bool bMarkerCenter = false; sal_Int32 nArrowType = rArrowProps.moArrowType.get( XML_none ); - assert((nArrowType & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nArrowType & sal_Int32(0xFFFF0000))==0); switch( nArrowType ) { case XML_triangle: @@ -241,7 +241,7 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, #define OOX_ARROW_POINT( x, y ) awt::Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) ) ::std::vector< awt::Point > aPoints; - assert((rArrowProps.moArrowType.get() & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((rArrowProps.moArrowType.get() & sal_Int32(0xFFFF0000))==0); switch( rArrowProps.moArrowType.get() ) { case XML_triangle: diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 1b09c782c33c..0a825cfc28c1 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -119,7 +119,7 @@ void BulletList::setSuffixMinusRight() void BulletList::setType( sal_Int32 nType ) { - assert((nType & sal_Int32(0xFFFF0000))==0); + OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0); switch( nType ) { case XML_alphaLcParenBoth: diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 5665f44c73bb..7b786c782fba 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -168,14 +168,14 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen for( sal_Int32 i=0; i<aCooSysSeq.getLength(); ++i ) { Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[i] ); - assert( xCooSys.is()); + OSL_ASSERT( xCooSys.is()); for( sal_Int32 nN = xCooSys->getDimension(); nN--; ) { const sal_Int32 nMaxAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nN); for(sal_Int32 nI=0; nI<=nMaxAxisIndex; ++nI) { Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension( nN, nI ); - assert( xAxis.is()); + OSL_ASSERT( xAxis.is()); if( xAxis.is()) { chart2::ScaleData aScaleData = xAxis->getScaleData(); @@ -353,7 +353,7 @@ void lcl_fillCategoriesIntoStringVector( const Reference< chart2::data::XDataSequence > & xCategories, ::std::vector< OUString > & rOutCategories ) { - assert( xCategories.is()); + OSL_ASSERT( xCategories.is()); if( !xCategories.is()) return; Reference< chart2::data::XTextualDataSequence > xTextualDataSequence( xCategories, uno::UNO_QUERY ); @@ -661,7 +661,7 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha void ChartExport::ExportContent() { Reference< chart2::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); - assert( xChartDoc.is() ); + OSL_ASSERT( xChartDoc.is() ); if( !xChartDoc.is() ) return; InitRangeSegmentationProperties( xChartDoc ); diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 9caf28f7bdc4..e1694d293ca9 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -110,7 +110,7 @@ void SAL_CALL Deflater::finish( ) } sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) { - assert( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())); + OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())); return doDeflateBytes(rBuffer, nNewOffset, nNewLength); } sal_Int64 SAL_CALL Deflater::getTotalIn( ) diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index a5b363556f08..40ed69e0191b 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -407,7 +407,7 @@ static PyObject *createUnoStructHelper( PyRef returnCandidate( PyUNOStruct_new( IdlStruct, c->xInvocation ) ); PyUNO *me = reinterpret_cast<PyUNO*>( returnCandidate.get() ); TypeDescription desc( typeName ); - assert( desc.is() ); // could already instantiate an XInvocation2 ! + OSL_ASSERT( desc.is() ); // could already instantiate an XInvocation2 ! typelib_CompoundTypeDescription *pCompType = reinterpret_cast<typelib_CompoundTypeDescription *>(desc.get()); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index ed13cb748705..7610ee6f7a70 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -517,7 +517,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const { PyRef element; element = any2PyObject (tc->convertTo (s[i], s[i].getValueType() )); - assert( element.is() ); + OSL_ASSERT( element.is() ); PyTuple_SetItem( tuple.get(), i, element.getAcquired() ); } } diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx index 5bf64a1f383b..94a2488c892e 100644 --- a/registry/tools/fileurl.cxx +++ b/registry/tools/fileurl.cxx @@ -58,11 +58,11 @@ OUString convertToFileUrl(char const * filename, sal_Int32 length) OUString uWorkingDir; if (osl_getProcessWorkingDir(&uWorkingDir.pData) != osl_Process_E_None) { - assert(false); + OSL_ASSERT(false); } if (FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uFileUrl) != FileBase::E_None) { - assert(false); + OSL_ASSERT(false); } } else @@ -70,7 +70,7 @@ OUString convertToFileUrl(char const * filename, sal_Int32 length) // absolute path name. if (FileBase::getFileURLFromSystemPath(uFileName, uFileUrl) != FileBase::E_None) { - assert(false); + OSL_ASSERT(false); } } } 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[] = { diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index 8e5fdfa18d2c..72e31c429cdc 100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -21,13 +21,12 @@ #include "osl/diagnose.h" #include <new> -#include <cassert> using salhelper::SimpleReferenceObject; SimpleReferenceObject::~SimpleReferenceObject() { - assert(m_nCount == 0); + OSL_ASSERT(m_nCount == 0); } void * SimpleReferenceObject::operator new(std::size_t nSize) diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index 4d09ffe9644a..c79f1fc03588 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -116,7 +116,7 @@ void Timer::start() TimerManager *pManager = TimerManager::getTimerManager(); - assert(pManager); + OSL_ASSERT(pManager); if ( pManager != nullptr ) { @@ -129,7 +129,7 @@ void Timer::stop() { TimerManager *pManager = TimerManager::getTimerManager(); - assert(pManager); + OSL_ASSERT(pManager); if ( pManager != nullptr ) { @@ -141,7 +141,7 @@ sal_Bool Timer::isTicking() const { TimerManager *pManager = TimerManager::getTimerManager(); - assert(pManager); + OSL_ASSERT(pManager); if (pManager) return pManager->lookupTimer(this); @@ -161,7 +161,7 @@ sal_Bool Timer::isExpired() const sal_Bool Timer::expiresBefore(const Timer* pTimer) const { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer != nullptr ) { @@ -245,7 +245,7 @@ TimerManager::TimerManager() { osl::MutexGuard Guard(theTimerManagerMutex::get()); - assert(m_pManager == nullptr); + OSL_ASSERT(m_pManager == nullptr); m_pManager = this; @@ -282,7 +282,7 @@ TimerManager* TimerManager::getTimerManager() void TimerManager::registerTimer(Timer* pTimer) { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer == nullptr ) { @@ -321,7 +321,7 @@ void TimerManager::registerTimer(Timer* pTimer) void TimerManager::unregisterTimer(Timer* pTimer) { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer == nullptr ) { @@ -347,7 +347,7 @@ void TimerManager::unregisterTimer(Timer* pTimer) bool TimerManager::lookupTimer(const Timer* pTimer) { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer == nullptr ) { diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index 904ad48fadcc..6b382befdab0 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -196,12 +196,12 @@ Reference < XInputStream > createStreamFromSequence( { Reference < XInterface > xOutStreamService = xSMgr->createInstance("com.sun.star.io.Pipe"); - assert( xOutStreamService.is() ); + OSL_ASSERT( xOutStreamService.is() ); Reference< XOutputStream > rOutStream( xOutStreamService , UNO_QUERY ); - assert( rOutStream.is() ); + OSL_ASSERT( rOutStream.is() ); Reference< XInputStream > rInStream( xOutStreamService , UNO_QUERY ); - assert( rInStream.is() ); + OSL_ASSERT( rInStream.is() ); rOutStream->writeBytes( seqBytes ); rOutStream->flush(); @@ -314,7 +314,7 @@ public: virtual void SAL_CALL endElement(const OUString& aName) throw (SAXException,RuntimeException) { - assert( m_iLevel ); + OSL_ASSERT( m_iLevel ); m_iLevel --; if( m_bPrint ) { int i; diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 3b7a030e8557..e846e381d250 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -3111,7 +3111,7 @@ void ScColumn::EndListening( sc::EndListeningContext& rCxt, const ScAddress& rAd return; SvtBroadcaster* pBC = sc::broadcaster_block::at(*it->data, aPos.second); - assert(pBC); + OSL_ASSERT(pBC); rListener.EndListening(*pBC); if (!pBC->HasListeners()) diff --git a/sc/source/core/data/columniterator.cxx b/sc/source/core/data/columniterator.cxx index 9bf86c850d69..bff9aa1e9033 100644 --- a/sc/source/core/data/columniterator.cxx +++ b/sc/source/core/data/columniterator.cxx @@ -62,7 +62,7 @@ void ScColumnTextWidthIterator::next() } // Reached the end. - assert(miBlockCur == miBlockEnd); + OSL_ASSERT(miBlockCur == miBlockEnd); } bool ScColumnTextWidthIterator::hasCell() const @@ -72,19 +72,19 @@ bool ScColumnTextWidthIterator::hasCell() const SCROW ScColumnTextWidthIterator::getPos() const { - assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd); + OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd); return static_cast<SCROW>(mnCurPos); } sal_uInt16 ScColumnTextWidthIterator::getValue() const { - assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd); + OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd); return miDataCur->mnTextWidth; } void ScColumnTextWidthIterator::setValue(sal_uInt16 nVal) { - assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd); + OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd); miDataCur->mnTextWidth = nVal; } @@ -141,7 +141,7 @@ void ScColumnTextWidthIterator::init(SCROW nStartRow, SCROW nEndRow) } // Not found. - assert(miBlockCur == miBlockEnd); + OSL_ASSERT(miBlockCur == miBlockEnd); } void ScColumnTextWidthIterator::getDataIterators(size_t nOffsetInBlock) diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 5a994713244a..31eaf827911f 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -659,7 +659,7 @@ uno::Reference< embed::XEmbeddedObject > void ScDocument::UpdateChartListenerCollection() { - assert(pChartListenerCollection); + OSL_ASSERT(pChartListenerCollection); bChartListenerCollectionNeedsUpdate = false; if (!pDrawLayer) @@ -735,7 +735,7 @@ void ScDocument::UpdateChartListenerCollection() void ScDocument::AddOLEObjectToCollection(const OUString& rName) { - assert(pChartListenerCollection); + OSL_ASSERT(pChartListenerCollection); ScChartListenerCollection::StringSetType& rNonOleObjects = pChartListenerCollection->getNonOleObjectNames(); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 7bad32c1449f..92c9645cf03c 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2064,7 +2064,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, CopyToDocument(0, 0, 0, MAXCOL, MAXROW, nTab1-1, InsertDeleteFlags::FORMULA, false, rDestDoc); sc::CopyToDocContext aCxt(rDestDoc); - assert( nTab2 < static_cast<SCTAB>(maTabs.size()) && nTab2 < static_cast<SCTAB>(rDestDoc.maTabs.size())); + OSL_ASSERT( nTab2 < static_cast<SCTAB>(maTabs.size()) && nTab2 < static_cast<SCTAB>(rDestDoc.maTabs.size())); for (SCTAB i = nTab1; i <= nTab2; i++) { if (maTabs[i] && rDestDoc.maTabs[i]) diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 1615150f277b..e73bee5e80d5 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -473,7 +473,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const bOk = pCellData->IsEmpty(); else { - assert(rEntry.IsQueryByNonEmpty()); + OSL_ASSERT(rEntry.IsQueryByNonEmpty()); bOk = !pCellData->IsEmpty(); } } diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index d71c3aca95fb..3a4cdc852a67 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -912,7 +912,7 @@ void ScSubOutlineIterator::DeleteLast() --nSubEntry; ScOutlineCollection& rColl = pArray->aCollections[nSubLevel]; - assert(nSubEntry < rColl.size()); + OSL_ASSERT(nSubEntry < rColl.size()); ScOutlineCollection::iterator it = rColl.begin(); std::advance(it, nSubEntry); rColl.erase(it); diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 5022c28fd999..2044a33b7708 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -315,7 +315,7 @@ public: */ ScSortInfo** GetFirstArray() const { - assert(pppInfo); + OSL_ASSERT(pppInfo); return pppInfo[0]; } @@ -324,7 +324,7 @@ public: */ ScSortInfo* Get( sal_uInt16 nSort, SCCOLROW nInd ) { - assert(pppInfo); + OSL_ASSERT(pppInfo); return (pppInfo[nSort])[ nInd - nStart ]; } @@ -333,7 +333,7 @@ public: */ void Swap( SCCOLROW nInd1, SCCOLROW nInd2 ) { - assert(pppInfo); + OSL_ASSERT(pppInfo); SCSIZE n1 = static_cast<SCSIZE>(nInd1 - nStart); SCSIZE n2 = static_cast<SCSIZE>(nInd2 - nStart); for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ ) @@ -2692,7 +2692,7 @@ bool ScTable::ValidQuery( aRes.first = !aCol[rEntry.nField].HasDataAt(nRow); else { - assert(rEntry.IsQueryByNonEmpty()); + OSL_ASSERT(rEntry.IsQueryByNonEmpty()); aRes.first = aCol[rEntry.nField].HasDataAt(nRow); } } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 04fa263ec723..ba885a6be13d 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -646,7 +646,7 @@ void ScChartListenerCollection::SetDiffDirty( for (auto const& it : m_Listeners) { ScChartListener *const pCL = it.second.get(); - assert(pCL); + OSL_ASSERT(pCL); const ScChartListener* pCLCmp = rCmp.findByName(pCL->GetName()); if (!pCLCmp || *pCL != *pCLCmp) { diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index c8481a83fe0a..4d0371285f0e 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -141,14 +141,14 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ ) { - assert(aOS.getLength() == 0); + OSL_ASSERT(aOS.getLength() == 0); aOS.append(pSpecDataType_LF); aOS.append(pKeyBOT); aOS.append('\n'); rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear()); for( nColCnt = rRange.aStart.Col() ; nColCnt <= nEndCol ; nColCnt++ ) { - assert(aOS.getLength() == 0); + OSL_ASSERT(aOS.getLength() == 0); bool bWriteStringData = false; ScRefCellValue aCell(*pDoc, ScAddress(nColCnt, nRowCnt, nTab)); @@ -196,7 +196,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, // sc/source/ui/docsh.cxx:ScDocShell::AsciiSave() // In fact we should create a common method if this would be // needed just one more time.. - assert(aOS.getLength() == 0); + OSL_ASSERT(aOS.getLength() == 0); OUString aTmpStr = aString; aOS.append(pStringData); rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet); @@ -257,7 +257,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, aPrgrsBar.SetState( nRowCnt ); } - assert(aOS.getLength() == 0); + OSL_ASSERT(aOS.getLength() == 0); aOS.append(pSpecDataType_LF); aOS.append(pKeyEOD); aOS.append('\n'); diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 577aa327cc7c..050f59ea4f93 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -719,7 +719,7 @@ void XclImpAutoFilterData::ReadAutoFilter( } else { - assert(eConn == SC_OR); + OSL_ASSERT(eConn == SC_OR); // Import only when both conditions are for simple equality, else // import only the 1st condition due to conflict with the ordering of // conditions. #i39464#. diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 3055a608c18f..d5a4c899e70a 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -262,7 +262,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, const OUString& sValue) { - assert(rCell.meType == CELLTYPE_VALUE); + OSL_ASSERT(rCell.meType == CELLTYPE_VALUE); SetValueAttributes(rCell.mfValue, sValue); SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); @@ -270,7 +270,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, cons void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell) { - assert(rCell.meType == CELLTYPE_STRING); + OSL_ASSERT(rCell.meType == CELLTYPE_STRING); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING); SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); @@ -284,7 +284,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell) void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell) { - assert(rCell.meType == CELLTYPE_EDIT); + OSL_ASSERT(rCell.meType == CELLTYPE_EDIT); OUString sString; if (rCell.mpEditText) @@ -307,7 +307,7 @@ void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell) void ScChangeTrackingExportHelper::WriteFormulaCell(const ScCellValue& rCell, const OUString& sValue) { - assert(rCell.meType == CELLTYPE_FORMULA); + OSL_ASSERT(rCell.meType == CELLTYPE_FORMULA); ScFormulaCell* pFormulaCell = rCell.mpFormula; OUString sAddress; diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index eed0961328d1..77d2711bbe2f 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -466,7 +466,7 @@ private: else { // Multi-item condition. - assert(rItems.size() > 1); + OSL_ASSERT(rItems.size() > 1); // Store the 1st value for backward compatibility. const ScQueryEntry::Item& rItem = rItems.front(); diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 8a464250ac1e..cfcf74a6b74f 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -605,7 +605,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint aEvent.EventId = AccessibleEventId::SELECTION_CHANGED; aEvent.NewValue <<= xChild; CommitChange(aEvent); - assert(m_mapSelectionSend.count(aNewCell) == 0 ); + OSL_ASSERT(m_mapSelectionSend.count(aNewCell) == 0 ); m_mapSelectionSend.insert(MAP_ADDR_XACC::value_type(aNewCell,xChild)); } @@ -743,7 +743,7 @@ void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData) } void ScAccessibleSpreadsheet::CommitFocusCell(const ScAddress &aNewCell) { - assert(!IsFormulaMode()); + OSL_ASSERT(!IsFormulaMode()); if(IsFormulaMode()) { return ; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 75182ada423c..69dfa163c1b6 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -535,7 +535,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) else pList = m_EntryLists[nColumn].get(); - assert(pList); + OSL_ASSERT(pList); std::vector<ScTypedStrData>::const_iterator it = pList->maList.begin(), itEnd = pList->maList.end(); for (; it != itEnd; ++it) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 5adbf08ed351..e0f0e9ec3b06 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -383,12 +383,12 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() */ if ( aStrVal.equals(aStrEmpty) ) { - assert(eOp == SC_EQUAL); + OSL_ASSERT(eOp == SC_EQUAL); rEntry.SetQueryByEmpty(); } else if ( aStrVal.equals(aStrNotEmpty) ) { - assert(eOp == SC_EQUAL); + OSL_ASSERT(eOp == SC_EQUAL); rEntry.SetQueryByNonEmpty(); } else diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index d91c4e3bf053..7fb1f3a19858 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1230,7 +1230,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb return UpdatePivotTable(*pOldObj, bRecord, bApi); } - assert(pOldObj && pNewObj && pOldObj != pNewObj); + OSL_ASSERT(pOldObj && pNewObj && pOldObj != pNewObj); ScDocShellModificator aModificator( rDocShell ); WaitObject aWait( ScDocShell::GetActiveDialogParent() ); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f9242c063dfd..25bac55420c2 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -130,7 +130,7 @@ void lcl_ChartInit(const uno::Reference <embed::XEmbeddedObject>& xObj, ScViewDa 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<chart2::data::XDataProvider> xDataProvider; @@ -702,8 +702,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL ) { // leave OLE inplace mode and unmark - assert( pViewShell ); - assert( pView ); + OSL_ASSERT( pViewShell ); + OSL_ASSERT( pView ); pViewShell->DeactivateOle(); pView->UnmarkAll(); @@ -711,15 +711,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV pPV = pView->GetSdrPageView(); // remove the chart - assert( pPV ); + OSL_ASSERT( pPV ); SdrPage * pPage( pPV->GetPage()); - assert( pPage ); - assert( pObj ); + OSL_ASSERT( pPage ); + OSL_ASSERT( pObj ); if( pPage ) { // Remove the OLE2 object from the sdr page. SdrObject* pRemoved = pPage->RemoveObject(pObj->GetOrdNum()); - assert(pRemoved == pObj); + OSL_ASSERT(pRemoved == pObj); SdrObject::Free(pRemoved); // Don't forget to free it. } @@ -734,7 +734,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV } else { - assert( nDialogRet == ui::dialogs::ExecutableDialogResults::OK ); + OSL_ASSERT( nDialogRet == ui::dialogs::ExecutableDialogResults::OK ); //@todo maybe move chart to different table } } diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 943a9756ec98..e182575863f3 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -383,7 +383,7 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() ERRORBOX( STR_INVALID_TABREF ); - assert(pEd); + OSL_ASSERT(pEd); if (pEd) pEd->GrabFocus(); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 6a133442d77b..034de933a539 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3314,7 +3314,7 @@ void ScCellRangesBase::ForceChartListener_Impl() for (auto const& it : rListeners) { ScChartListener *const p = it.second.get(); - assert(p); + OSL_ASSERT(p); if (p->GetUnoSource() == static_cast<chart::XChartData*>(this) && p->IsDirty()) p->Update(); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index c60af8f440d7..d44110def97e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -2514,7 +2514,7 @@ css::uno::Reference<css::uno::XInterface> ScModelObj::create( ( pDocShell->GetCreateMode() == SfxObjectCreateMode::INTERNAL )); // this should never happen, i.e. the temporary document should never be // loaded, because this unlinks the data - assert( bCreate ); + OSL_ASSERT( bCreate ); if ( !xRet.is() && bCreate ) { diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index eb93937d645d..88f70a8e7249 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2747,8 +2747,8 @@ void ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, Outpu void ScOutputData::DrawEditStandard(DrawEditParam& rParam) { - assert(rParam.meOrient == SVX_ORIENTATION_STANDARD); - assert(!rParam.mbAsianVertical); + OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD); + OSL_ASSERT(!rParam.mbAsianVertical); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); @@ -3271,7 +3271,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize, void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); const bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); const bool bShrink = !rParam.mbBreak && !bRepeat && lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet); @@ -3532,7 +3532,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); const bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); const bool bShrink = !rParam.mbBreak && !bRepeat && lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet); @@ -3787,7 +3787,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) void ScOutputData::DrawEditStacked(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); @@ -4131,9 +4131,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) { // When in asian vertical orientation, the orientation value is STANDARD, // and the asian vertical boolean is true. - assert(rParam.meOrient == SVX_ORIENTATION_STANDARD); - assert(rParam.mbAsianVertical); - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD); + OSL_ASSERT(rParam.mbAsianVertical); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index ea86cd3356fe..09bd3dbabc09 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -268,7 +268,7 @@ SvTreeListEntry* getReferenceEntry(SvTreeListBox& rTree, SvTreeListEntry* pCurEn while (pParent) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pParent); - assert(pUserData); + OSL_ASSERT(pUserData); if (pUserData->meType == ScOrcusXMLTreeParam::ElementRepeat) { // This is a repeat element. @@ -304,7 +304,7 @@ void ScXMLSourceDlg::TreeItemSelected() mpCurRefEntry = getReferenceEntry(*mpLbTree, pEntry); ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*mpCurRefEntry); - assert(pUserData); + OSL_ASSERT(pUserData); const ScAddress& rPos = pUserData->maLinkedPos; if (rPos.IsValid()) @@ -341,7 +341,7 @@ void ScXMLSourceDlg::DefaultElementSelected(SvTreeListEntry& rEntry) for (SvTreeListEntry* pChild = mpLbTree->FirstChild(&rEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild)) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild); - assert(pUserData); + OSL_ASSERT(pUserData); if (pUserData->meType != ScOrcusXMLTreeParam::Attribute) { // This child is not an attribute. Bail out. @@ -410,10 +410,10 @@ void ScXMLSourceDlg::AttributeSelected(SvTreeListEntry& rEntry) // parent element linked (but not range-linked). SvTreeListEntry* pParent = mpLbTree->GetParent(&rEntry); - assert(pParent); // attribute should have a parent element. + OSL_ASSERT(pParent); // attribute should have a parent element. ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pParent); - assert(pUserData); + OSL_ASSERT(pUserData); if (pUserData->maLinkedPos.IsValid() && pUserData->mbRangeParent) { // Parent element is range-linked. Bail out. @@ -486,7 +486,7 @@ bool ScXMLSourceDlg::IsChildrenDirty(SvTreeListEntry* pEntry) const for (SvTreeListEntry* pChild = mpLbTree->FirstChild(pEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild)) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild); - assert(pUserData); + OSL_ASSERT(pUserData); if (pUserData->maLinkedPos.IsValid()) // Already linked. return true; diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 7d527f48cd31..33f950c51c00 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -470,7 +470,7 @@ namespace dlgprov } else { - assert( m_xContext.is() ); + OSL_ASSERT( m_xContext.is() ); if ( m_xContext.is() ) { Reference< provider::XScriptProviderFactory > xFactory = diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index b3317fed95e1..3431ba90b026 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -1439,7 +1439,7 @@ sal_uInt16 SdDrawDocument::InsertPageSet ( aNotesPageName = sStandardPageName; } - assert(nNotesPageNum==nStandardPageNum+1); + OSL_ASSERT(nNotesPageNum==nStandardPageNum+1); if (nInsertPosition < 0) nInsertPosition = nStandardPageNum; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index e8c51ba6d7e7..576c17805ce9 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -717,7 +717,7 @@ void SAL_CALL SdStyleSheet::release( ) throw () exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } - assert( mrBHelper.bDisposed ); + OSL_ASSERT( mrBHelper.bDisposed ); SdStyleSheetBase::release(); } } diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 9dc062ad7ebb..57c792ea5b0c 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -35,8 +35,8 @@ SimpleReferenceComponent::SimpleReferenceComponent() SimpleReferenceComponent::~SimpleReferenceComponent() { - assert(m_nCount == 0); - assert(mbDisposed); + OSL_ASSERT(m_nCount == 0); + OSL_ASSERT(mbDisposed); } void SimpleReferenceComponent::acquire() diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index c18898a006bc..c3ac9d6aa3cf 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -228,7 +228,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent( sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() { - assert(getAccessibleParent().is()); + OSL_ASSERT(getAccessibleParent().is()); ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; sal_Int32 nIndexInParent(-1); @@ -756,7 +756,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces } else { - assert(nIndex>=0 && (sal_uInt32)nIndex<maPageObjects.size()); + OSL_ASSERT(nIndex>=0 && (sal_uInt32)nIndex<maPageObjects.size()); } return pChild; diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index 28676e4631a7..5190622366d5 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -73,7 +73,7 @@ AccessibleViewForwarder::~AccessibleViewForwarder() */ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const { - assert (mpView != nullptr); + OSL_ASSERT (mpView != nullptr); if((sal_uInt32)mnWindowId < mpView->PaintWindowCount()) { SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); @@ -87,7 +87,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const { - assert (mpView != nullptr); + OSL_ASSERT (mpView != nullptr); if((sal_uInt32)mnWindowId < mpView->PaintWindowCount()) { SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index bc5954653ba0..759c9eacd8da 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -171,7 +171,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W catch( Exception& e ) { (void)e; - assert(false); + OSL_ASSERT(false); } const sal_Int32 LAYOUT_BORDER_PIX = 7; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 0bba1914b561..614592536d9a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -604,7 +604,7 @@ void SdPageObjsTLB::AddShapeList ( while( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); - assert(pObj!=nullptr); + OSL_ASSERT(pObj!=nullptr); // Get the shape name. OUString aStr (GetObjectName( pObj ) ); @@ -1189,13 +1189,13 @@ void SdPageObjsTLB::DoDrag() ::sd::ViewShell* pViewShell = GetViewShellForDocShell(*pDocShell); if (pViewShell == nullptr) { - assert(pViewShell!=nullptr); + OSL_ASSERT(pViewShell!=nullptr); return; } sd::View* pView = pViewShell->GetView(); if (pView == nullptr) { - assert(pView!=nullptr); + OSL_ASSERT(pView!=nullptr); return; } diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index be74d1f9e22c..593742e1deed 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -241,7 +241,7 @@ void Configuration::PostEvent ( const Reference<XResourceId>& rxResourceId, const bool bActivation) { - assert(rxResourceId.is()); + OSL_ASSERT(rxResourceId.is()); if (mxBroadcaster.is()) { diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 1a0bb8a07d7c..fa1f75662a80 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -88,7 +88,7 @@ public: ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& rxController) : mxController(rxController) { - assert(mxController.is()); + OSL_ASSERT(mxController.is()); if (mxController.is()) mxController->lock(); @@ -149,7 +149,7 @@ void ConfigurationController::ProcessEvent() { if (mpImplementation.get() != nullptr) { - assert(mpImplementation->mpQueueProcessor.get()!=nullptr); + OSL_ASSERT(mpImplementation->mpQueueProcessor.get()!=nullptr); mpImplementation->mpQueueProcessor->ProcessOneEvent(); } @@ -174,7 +174,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - assert(mpImplementation.get()!=nullptr); + OSL_ASSERT(mpImplementation.get()!=nullptr); mpImplementation->mpBroadcaster->AddListener(rxListener, rsEventType, rUserData); } @@ -198,8 +198,8 @@ void SAL_CALL ConfigurationController::notifyEvent ( void SAL_CALL ConfigurationController::lock() { - assert(mpImplementation.get()!=nullptr); - assert(mpImplementation->mpConfigurationUpdater.get()!=nullptr); + OSL_ASSERT(mpImplementation.get()!=nullptr); + OSL_ASSERT(mpImplementation->mpConfigurationUpdater.get()!=nullptr); ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -219,7 +219,7 @@ void SAL_CALL ConfigurationController::unlock() if (rBHelper.bDisposed) ThrowIfDisposed(); - assert(mpImplementation->mnLockCount>0); + OSL_ASSERT(mpImplementation->mnLockCount>0); --mpImplementation->mnLockCount; if (mpImplementation->mnLockCount == 0) mpImplementation->mpConfigurationUpdaterLock.reset(); @@ -510,7 +510,7 @@ void ConfigurationController::ThrowIfDisposed () const if (mpImplementation.get() == nullptr) { - assert(mpImplementation.get() != nullptr); + OSL_ASSERT(mpImplementation.get() != nullptr); throw RuntimeException("ConfigurationController not initialized", const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index c6a5f2a85b5e..de2d7386fa45 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -104,7 +104,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( { if ( ! rxResourceId.is()) { - assert(rxResourceId.is()); + OSL_ASSERT(rxResourceId.is()); return; } @@ -249,7 +249,7 @@ void ConfigurationControllerResourceManager::AddResource ( { if ( ! rxResource.is()) { - assert(rxResource.is()); + OSL_ASSERT(rxResource.is()); return; } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index f0bc96a3babb..a537cb6a5574 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -124,7 +124,7 @@ void SAL_CALL BasicViewFactory::disposing() // ViewShellContainer::const_iterator iView; for (iView=mpViewShellContainer->begin(); iView!=mpViewShellContainer->end(); ++iView) { - assert((*iView)->mpViewShell.unique()); + OSL_ASSERT((*iView)->mpViewShell.unique()); } mpViewShellContainer.reset(); } diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index f032eadc4295..564354cbc34d 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -114,7 +114,7 @@ void SAL_CALL ModuleController::disposing() void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) { - assert(rValues.size() == snFactoryPropertyCount); + OSL_ASSERT(rValues.size() == snFactoryPropertyCount); // Get the service name of the factory. OUString sServiceName; @@ -166,7 +166,7 @@ void ModuleController::InstantiateStartupServices() void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) { - assert(rValues.size() == snStartupPropertyCount); + OSL_ASSERT(rValues.size() == snStartupPropertyCount); try { diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 05168fa5722b..a0c77e24b83f 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -112,7 +112,7 @@ void SAL_CALL ResourceManager::disposing() void SAL_CALL ResourceManager::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) { - assert(rEvent.ResourceId.is()); + OSL_ASSERT(rEvent.ResourceId.is()); sal_Int32 nEventType = 0; rEvent.UserData >>= nEventType; diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index ead5314e614f..2372158fe950 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -119,7 +119,7 @@ void SAL_CALL ShellStackGuard::disposing ( IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pIdle, void) { #ifdef DEBUG - assert(pIdle==&maPrinterPollingIdle); + OSL_ASSERT(pIdle==&maPrinterPollingIdle); #else (void)pIdle; #endif diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index e22fea6cdd2d..a469dce9ec7d 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -945,7 +945,7 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) LifetimeController::~LifetimeController() { - assert(!mbListeningToController && !mbListeningToViewShellBase); + OSL_ASSERT(!mbListeningToController && !mbListeningToViewShellBase); } void LifetimeController::disposing() diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5800adc74361..404b3be53d65 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -349,7 +349,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) avoid the restoration of an no more existing object in ::SelectionHasChanged after deletion. All other OLE objects are not affected. */ - assert (mpViewShell->GetViewShell()!=nullptr); + OSL_ASSERT (mpViewShell->GetViewShell()!=nullptr); Client* pIPClient = static_cast<Client*>( mpViewShell->GetViewShell()->GetIPClient()); if (pIPClient && pIPClient->IsObjectInPlaceActive()) diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 4d061fc43eaf..846b2e208cc5 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -360,7 +360,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if ( !rMEvt.IsShift() && !rMEvt.IsMod2() ) { - assert (mpViewShell->GetViewShell()!=nullptr); + OSL_ASSERT (mpViewShell->GetViewShell()!=nullptr); Client* pIPClient = static_cast<Client*>( mpViewShell->GetViewShell()->GetIPClient()); diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 56c53a50f31e..958f7f906a1e 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -111,7 +111,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); ScopedVclPtr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg(mpViewShell->GetActiveWindow(), aNewAttr, mpView) : nullptr); - assert(pDlg); + OSL_ASSERT(pDlg); if (!pDlg) return; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 19b4529c2f25..a55330d3865b 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -99,7 +99,7 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides ( const Reference<XInterface>& rxDocument) { ThrowIfDisposed(); - assert(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext.get()!=nullptr); mpCacheContext->SetDocumentSlides(rxSlides, rxDocument); } @@ -109,7 +109,7 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange ( sal_Int32 nLastVisibleSlideIndex) { ThrowIfDisposed(); - assert(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext.get()!=nullptr); mpCacheContext->SetVisibleSlideRange (nFirstVisibleSlideIndex, nLastVisibleSlideIndex); } @@ -118,7 +118,7 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize ( const css::geometry::IntegerSize2D& rSize) { ThrowIfDisposed(); - assert(mpCache.get()!=nullptr); + OSL_ASSERT(mpCache.get()!=nullptr); maPreviewSize = Size(rSize.Width, rSize.Height); mpCache->ChangeSize(maPreviewSize, Bitmap::HasFastScale()); @@ -129,7 +129,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( const Reference<rendering::XCanvas>& rxCanvas) { ThrowIfDisposed(); - assert(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext.get()!=nullptr); cppcanvas::CanvasSharedPtr pCanvas ( cppcanvas::VCLFactory::createCanvas(rxCanvas)); @@ -166,14 +166,14 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( void SAL_CALL PresenterPreviewCache::pause() { ThrowIfDisposed(); - assert(mpCache.get()!=nullptr); + OSL_ASSERT(mpCache.get()!=nullptr); mpCache->Pause(); } void SAL_CALL PresenterPreviewCache::resume() { ThrowIfDisposed(); - assert(mpCache.get()!=nullptr); + OSL_ASSERT(mpCache.get()!=nullptr); mpCache->Resume(); } diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 3e59d9e4aa14..0512139aaf90 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -90,7 +90,7 @@ void CurrentMasterPagesSelector::dispose() } else { - assert(mrDocument.GetDocSh() != nullptr); + OSL_ASSERT(mrDocument.GetDocSh() != nullptr); } Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener)); @@ -109,7 +109,7 @@ void CurrentMasterPagesSelector::LateInit() } else { - assert(mrDocument.GetDocSh() != nullptr); + OSL_ASSERT(mrDocument.GetDocSh() != nullptr); } } diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 4cc72acb2189..d6d7c9fd7585 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -311,7 +311,7 @@ void DocumentHelper::AssignMasterPageToPageList ( ::std::vector<SdPage*> aCleanedList; for (iPage=rpPageList->begin(); iPage!=rpPageList->end(); ++iPage) { - assert(*iPage!=nullptr && (*iPage)->GetModel() == &rTargetDocument); + OSL_ASSERT(*iPage!=nullptr && (*iPage)->GetModel() == &rTargetDocument); if (*iPage != nullptr && (*iPage)->GetLayoutName() != sFullLayoutName) { aCleanedList.push_back(*iPage); @@ -477,7 +477,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( if (pMasterPage == nullptr) { // The caller should make sure that the master page is valid. - assert(pMasterPage != nullptr); + OSL_ASSERT(pMasterPage != nullptr); return nullptr; } SdDrawDocument* pSourceDocument = static_cast<SdDrawDocument*>(pMasterPage->GetModel()); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 72f1aa1d5a1a..9deef401d79e 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -265,7 +265,7 @@ void MasterPageContainer::ReleaseToken (Token aToken) SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); if (pDescriptor.get() != nullptr) { - assert(pDescriptor->mnUseCount>0); + OSL_ASSERT(pDescriptor->mnUseCount>0); --pDescriptor->mnUseCount; if (pDescriptor->mnUseCount <= 0) { @@ -527,7 +527,7 @@ void MasterPageContainer::Implementation::LateInit() { meInitializationState = INITIALIZING; - assert(Instance().get()==this); + OSL_ASSERT(Instance().get()==this); mpRequestQueue.reset(MasterPageContainerQueue::Create( std::shared_ptr<MasterPageContainerQueue::ContainerAdapter>(Instance()))); @@ -576,7 +576,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel() if (*iDescriptor!=nullptr && (*iDescriptor)->mpMasterPage != nullptr) { Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize()); - assert(aPageSize.Width() > 0 && aPageSize.Height() > 0); + OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0); if (aPageSize.Width() > 0) nWidth = aPageSize.Width(); if (aPageSize.Height() > 0) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index bd6f4a16faf9..51e2c0bfb094 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -637,7 +637,7 @@ void SAL_CALL SlideShow::end() // The mbIsInStartup flag should have been reset during the start of the // slide show. Reset it here just in case that something has horribly // gone wrong. - assert(!mbIsInStartup); + OSL_ASSERT(!mbIsInStartup); mbIsInStartup = false; rtl::Reference< SlideshowImpl > xController( mxController ); @@ -791,7 +791,7 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr // Stop a running show before starting a new one. if( mxController.is() ) { - assert(!mbIsInStartup); + OSL_ASSERT(!mbIsInStartup); end(); } else if (mbIsInStartup) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 458a5b3cf375..8de1e7ac82d2 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1740,7 +1740,7 @@ void SlideshowImpl::updateSlideShow() // Make sure that the maximum frame count has not been set // too high (only then conversion to milliseconds and long // integer may lead to zero value.) - assert(static_cast<sal_uLong>(fUpdate * 1000.0) > 0); + OSL_ASSERT(static_cast<sal_uLong>(fUpdate * 1000.0) > 0); } // Use our high resolution timers for the asynchronous callback. diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index b45c2ade3cd0..e783d059ade7 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -441,7 +441,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe break; default: - assert(false); + OSL_ASSERT(false); break; } } diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 4adac147c359..ec5e6fbf5ea7 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -106,7 +106,7 @@ Bitmap GenericPageCache::GetPreviewBitmap ( const CacheKey aKey, const bool bResize) { - assert(aKey != nullptr); + OSL_ASSERT(aKey != nullptr); Bitmap aPreview; bool bMayBeUpToDate = true; @@ -143,7 +143,7 @@ Bitmap GenericPageCache::GetPreviewBitmap ( Bitmap GenericPageCache::GetMarkedPreviewBitmap ( const CacheKey aKey) { - assert(aKey != nullptr); + OSL_ASSERT(aKey != nullptr); ProvideCacheAndProcessor(); const SdrPage* pPage = mpCacheContext->GetPage(aKey); @@ -156,7 +156,7 @@ void GenericPageCache::SetMarkedPreviewBitmap ( const CacheKey aKey, const Bitmap& rMarkedBitmap) { - assert(aKey != nullptr); + OSL_ASSERT(aKey != nullptr); ProvideCacheAndProcessor(); const SdrPage* pPage = mpCacheContext->GetPage(aKey); @@ -167,7 +167,7 @@ void GenericPageCache::RequestPreviewBitmap ( const CacheKey aKey, const bool bMayBeUpToDate) { - assert(aKey != nullptr); + OSL_ASSERT(aKey != nullptr); const SdrPage* pPage = mpCacheContext->GetPage(aKey); diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 6ad5e4a45dd3..9b7f551e57f0 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -264,7 +264,7 @@ void PageCacheManager::ReleaseCache (const std::shared_ptr<Cache>& rpCache) if (iCache != mpPageCaches->end()) { - assert(iCache->second == rpCache); + OSL_ASSERT(iCache->second == rpCache); PutRecentlyUsedCache(iCache->first.mpDocument,iCache->first.maPreviewSize,rpCache); @@ -290,7 +290,7 @@ std::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize ( PageCacheContainer::CompareWithCache(rpCache))); if (iCacheToChange != mpPageCaches->end()) { - assert(iCacheToChange->second == rpCache); + OSL_ASSERT(iCacheToChange->second == rpCache); // Now, we can change the preview size of the existing one by // removing the cache from the list and re-insert it with the @@ -306,7 +306,7 @@ std::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize ( } else { - assert(iCacheToChange != mpPageCaches->end()); + OSL_ASSERT(iCacheToChange != mpPageCaches->end()); } } diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 6954f51cc64d..a4ba8dd088ee 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -113,7 +113,7 @@ IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl, Timer *, void) void QueueProcessor::ProcessRequests() { - assert(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext.get()!=nullptr); // Never process more than one request at a time in order to prevent the // lock up of the edit view. diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 809fbf46ca01..8bc8bb3e74da 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -103,7 +103,7 @@ void RequestQueue::AddRequest ( { ::osl::MutexGuard aGuard (maMutex); - assert(eRequestClass>=MIN_CLASS && eRequestClass<=MAX_CLASS); + OSL_ASSERT(eRequestClass>=MIN_CLASS && eRequestClass<=MAX_CLASS); // If the request is already a member of the queue then remove it so // that the following insertion will use the new prioritization. @@ -174,7 +174,7 @@ void RequestQueue::ChangeClass ( { ::osl::MutexGuard aGuard (maMutex); - assert(eNewRequestClass>=MIN_CLASS && eNewRequestClass<=MAX_CLASS); + OSL_ASSERT(eNewRequestClass>=MIN_CLASS && eNewRequestClass<=MAX_CLASS); Container::const_iterator iRequest ( ::std::find_if ( diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 8a6bb541c727..dfbf1692ef8d 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -121,12 +121,12 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) mbIsContextMenuOpen(false) { sd::Window *pWindow (mrSlideSorter.GetContentWindow().get()); - assert(pWindow); + OSL_ASSERT(pWindow); if (pWindow) { // The whole background is painted by the view and controls. vcl::Window* pParentWindow = pWindow->GetParent(); - assert(pParentWindow!=nullptr); + OSL_ASSERT(pParentWindow!=nullptr); pParentWindow->SetBackground (Wallpaper()); // Connect the view with the window that has been created by our base @@ -217,50 +217,50 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( PageSelector& SlideSorterController::GetPageSelector() { - assert(mpPageSelector.get()!=nullptr); + OSL_ASSERT(mpPageSelector.get()!=nullptr); return *mpPageSelector.get(); } FocusManager& SlideSorterController::GetFocusManager() { - assert(mpFocusManager.get()!=nullptr); + OSL_ASSERT(mpFocusManager.get()!=nullptr); return *mpFocusManager.get(); } Clipboard& SlideSorterController::GetClipboard() { - assert(mpClipboard.get()!=nullptr); + OSL_ASSERT(mpClipboard.get()!=nullptr); return *mpClipboard.get(); } ScrollBarManager& SlideSorterController::GetScrollBarManager() { - assert(mpScrollBarManager.get()!=nullptr); + OSL_ASSERT(mpScrollBarManager.get()!=nullptr); return *mpScrollBarManager.get(); } std::shared_ptr<CurrentSlideManager> const & SlideSorterController::GetCurrentSlideManager() const { - assert(mpCurrentSlideManager.get()!=nullptr); + OSL_ASSERT(mpCurrentSlideManager.get()!=nullptr); return mpCurrentSlideManager; } std::shared_ptr<SlotManager> const & SlideSorterController::GetSlotManager() const { - assert(mpSlotManager.get()!=nullptr); + OSL_ASSERT(mpSlotManager.get()!=nullptr); return mpSlotManager; } std::shared_ptr<SelectionManager> const & SlideSorterController::GetSelectionManager() const { - assert(mpSelectionManager.get()!=nullptr); + OSL_ASSERT(mpSelectionManager.get()!=nullptr); return mpSelectionManager; } std::shared_ptr<InsertionIndicatorHandler> const & SlideSorterController::GetInsertionIndicatorHandler() const { - assert(mpInsertionIndicatorHandler.get()!=nullptr); + OSL_ASSERT(mpInsertionIndicatorHandler.get()!=nullptr); return mpInsertionIndicatorHandler; } @@ -881,7 +881,7 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex VisibleAreaManager& SlideSorterController::GetVisibleAreaManager() const { - assert(mpVisibleAreaManager); + OSL_ASSERT(mpVisibleAreaManager); return *mpVisibleAreaManager; } diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 19fe97286de0..fd6a63ebdf6a 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -74,7 +74,7 @@ Animator::~Animator() { if ( ! mbIsDisposed) { - assert(mbIsDisposed); + OSL_ASSERT(mbIsDisposed); Dispose(); } } @@ -102,7 +102,7 @@ Animator::AnimationId Animator::AddAnimation ( { // When the animator is already disposed then ignore this call // silently (well, we show an assertion, but do not throw an exception.) - assert( ! mbIsDisposed); + OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) return -1; @@ -123,7 +123,7 @@ Animator::AnimationId Animator::AddAnimation ( void Animator::RemoveAnimation (const Animator::AnimationId nId) { - assert( ! mbIsDisposed); + OSL_ASSERT( ! mbIsDisposed); const AnimationList::iterator iAnimation (::std::find_if( maAnimations.begin(), @@ -132,7 +132,7 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId) { return nId == pAnim->mnAnimationId; })); if (iAnimation != maAnimations.end()) { - assert((*iAnimation)->mnAnimationId == nId); + OSL_ASSERT((*iAnimation)->mnAnimationId == nId); (*iAnimation)->Expire(); maAnimations.erase(iAnimation); } @@ -166,7 +166,7 @@ bool Animator::ProcessAnimations (const double nTime) { bool bExpired (false); - assert( ! mbIsDisposed); + OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) return bExpired; @@ -182,7 +182,7 @@ bool Animator::ProcessAnimations (const double nTime) void Animator::CleanUpAnimationList() { - assert( ! mbIsDisposed); + OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) return; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 0c14dd8fe02c..47d2aa64e00c 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -162,7 +162,7 @@ void CurrentSlideManager::SwitchCurrentSlide ( void CurrentSlideManager::SetCurrentSlideAtViewShellBase (const SharedPageDescriptor& rpDescriptor) { - assert(rpDescriptor.get() != nullptr); + OSL_ASSERT(rpDescriptor.get() != nullptr); ViewShellBase* pBase = mrSlideSorter.GetViewShellBase(); if (pBase != nullptr) @@ -181,7 +181,7 @@ void CurrentSlideManager::SetCurrentSlideAtViewShellBase (const SharedPageDescri void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescriptor& rpDescriptor) { - assert(rpDescriptor.get() != nullptr); + OSL_ASSERT(rpDescriptor.get() != nullptr); ViewShellBase* pBase = mrSlideSorter.GetViewShellBase(); if (pBase != nullptr) @@ -199,7 +199,7 @@ void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescripto void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescriptor& rpDescriptor) { - assert(rpDescriptor.get() != nullptr); + OSL_ASSERT(rpDescriptor.get() != nullptr); try { diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 3c016a32c9b5..3ee0bb0677d0 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -93,12 +93,12 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) if (mnPageIndex < 0) { - assert(mnPageIndex>=0); + OSL_ASSERT(mnPageIndex>=0); mnPageIndex = 0; } else if (mnPageIndex >= nPageCount) { - assert(mnPageIndex<nPageCount); + OSL_ASSERT(mnPageIndex<nPageCount); mnPageIndex = nPageCount - 1; } diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index adfccf8b76a9..f162147acdd5 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -55,7 +55,7 @@ void InsertionIndicatorHandler::Start (const bool bIsOverSourceView) { if (mbIsActive) { - assert(!mbIsActive); + OSL_ASSERT(!mbIsActive); } mbIsReadOnly = mrSlideSorter.GetModel().IsReadOnly(); diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 4e5499d1f94c..271ff8ad02fa 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -575,7 +575,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); if (pDocument == nullptr) { - assert(pDocument!=nullptr); + OSL_ASSERT(pDocument!=nullptr); return; } pCacheManager->InvalidatePreviewBitmap(pDocument->getUnoModel(), pPage); @@ -597,7 +597,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } else { - assert(pCandidate!=nullptr && pCandidate->TRG_HasMasterPage()); + OSL_ASSERT(pCandidate!=nullptr && pCandidate->TRG_HasMasterPage()); } } } diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 639369daf677..bf35f39e54a8 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -353,7 +353,7 @@ void PageSelector::UpdateLock::Release() if (mpSelector != nullptr) { --mpSelector->mnUpdateLockCount; - assert(mpSelector->mnUpdateLockCount >= 0); + OSL_ASSERT(mpSelector->mnUpdateLockCount >= 0); if (mpSelector->mnUpdateLockCount == 0) mpSelector->UpdateCurrentPage(true); diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index bb75d83f4da3..ccf42d0db77e 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -548,7 +548,7 @@ void ScrollBarManager::Scroll( case Orientation_Horizontal: bIsVertical = false; break; case Orientation_Vertical: bIsVertical = true; break; default: - assert(eOrientation==Orientation_Horizontal || eOrientation==Orientation_Vertical); + OSL_ASSERT(eOrientation==Orientation_Horizontal || eOrientation==Orientation_Vertical); return; } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 766458d28cfe..08671ecbbd63 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -619,7 +619,7 @@ void SelectionFunction::GotoNextPage (int nOffset) if (pDescriptor.get() != nullptr) { SdPage* pPage = pDescriptor->GetPage(); - assert(pPage!=nullptr); + OSL_ASSERT(pPage!=nullptr); sal_Int32 nIndex = (pPage->GetPageNum()-1) / 2; GotoPage(nIndex + nOffset); } @@ -642,7 +642,7 @@ void SelectionFunction::GotoPage (int nIndex) mpModeHandler->SetCurrentPage(pNextPageDescriptor); else { - assert(pNextPageDescriptor.get() != nullptr); + OSL_ASSERT(pNextPageDescriptor.get() != nullptr); } ResetShiftKeySelectionAnchor(); } @@ -1549,7 +1549,7 @@ bool DragAndDropModeHandler::ProcessButtonUpEvent ( bool DragAndDropModeHandler::ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) { - assert(mpDragAndDropContext); + OSL_ASSERT(mpDragAndDropContext); if (rDescriptor.mbIsLeaving) { diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 50d865cbc513..60fc8565dc03 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -150,7 +150,7 @@ void SelectionManager::DeleteSelectedPages (const bool bSelectFollowingPage) void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& rSelectedPages) { // Prepare the deletion via the UNO API. - assert(mrSlideSorter.GetModel().GetEditMode() == EditMode::Page); + OSL_ASSERT(mrSlideSorter.GetModel().GetEditMode() == EditMode::Page); try { @@ -183,7 +183,7 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& rSelectedPages) { // Prepare the deletion via the UNO API. - assert(mrSlideSorter.GetModel().GetEditMode() == EditMode::MasterPage); + OSL_ASSERT(mrSlideSorter.GetModel().GetEditMode() == EditMode::MasterPage); try { @@ -230,7 +230,7 @@ void SelectionManager::SelectionHasChanged () pViewShell->Invalidate (SID_STATUS_PAGE); pViewShell->Invalidate (SID_STATUS_LAYOUT); - assert(mrController.GetCurrentSlideManager()); + OSL_ASSERT(mrController.GetCurrentSlideManager()); SharedPageDescriptor pDescriptor(mrController.GetCurrentSlideManager()->GetCurrentSlide()); if (pDescriptor.get() != nullptr) pViewShell->UpdatePreview(pDescriptor->GetPage()); @@ -297,7 +297,7 @@ void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition) else if (nInsertionPosition > mrSlideSorter.GetModel().GetPageCount()) { // Assert but then ignore invalid values. - assert(nInsertionPosition<=mrSlideSorter.GetModel().GetPageCount()); + OSL_ASSERT(nInsertionPosition<=mrSlideSorter.GetModel().GetPageCount()); return; } else diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 4f5a669fa339..cf1ed111faaf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -89,21 +89,21 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) void SelectionObserver::StartObservation() { - assert(!mbIsOvservationActive); + OSL_ASSERT(!mbIsOvservationActive); maInsertedPages.clear(); mbIsOvservationActive = true; } void SelectionObserver::AbortObservation() { - assert(mbIsOvservationActive); + OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; maInsertedPages.clear(); } void SelectionObserver::EndObservation() { - assert(mbIsOvservationActive); + OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 256d5399f9a0..b4dfa803e5db 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1177,7 +1177,7 @@ sal_Int32 SlotManager::GetInsertionPosition() return nIndex; // We should never get here. - assert(false); + OSL_ASSERT(false); return rSelector.GetPageCount() - 1; } @@ -1192,7 +1192,7 @@ sal_Int32 SlotManager::GetInsertionPosition() else { // We should never get here because there has to be at least one page. - assert(false); + OSL_ASSERT(false); return -1; } } diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index cf51887bc5c5..0416857d716a 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -78,19 +78,19 @@ namespace { if ( ! pDescriptor) { PrintModel(rModel); - assert(pDescriptor); + OSL_ASSERT(pDescriptor); return false; } if (nIndex != pDescriptor->GetPageIndex()) { PrintModel(rModel); - assert(nIndex == pDescriptor->GetPageIndex()); + OSL_ASSERT(nIndex == pDescriptor->GetPageIndex()); return false; } if (nIndex != pDescriptor->GetVisualState().mnPageId) { PrintModel(rModel); - assert(nIndex == pDescriptor->GetVisualState().mnPageId); + OSL_ASSERT(nIndex == pDescriptor->GetVisualState().mnPageId); return false; } } @@ -462,7 +462,7 @@ void SlideSorterModel::UpdatePageList() default: // We should never get here. - assert(false); + OSL_ASSERT(false); break; } } @@ -618,7 +618,7 @@ void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex) { if (rpDescriptor->GetPageIndex()!=nDescriptorIndex) { - assert(rpDescriptor->GetPageIndex()==nDescriptorIndex); + OSL_ASSERT(rpDescriptor->GetPageIndex()==nDescriptorIndex); } } else diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 0737d00cada6..39211e967b21 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -50,8 +50,8 @@ PageDescriptor::PageDescriptor ( mbIsMouseOver(false), mbHasTransition(false) { - assert(mpPage); - assert(mpPage == SdPage::getImplementation(rxPage)); + OSL_ASSERT(mpPage); + OSL_ASSERT(mpPage == SdPage::getImplementation(rxPage)); if (mpPage != nullptr) { if (mpPage->TRG_HasMasterPage()) @@ -125,7 +125,7 @@ bool PageDescriptor::HasState (const State eState) const return mpPage!=nullptr && mpPage->IsExcluded(); default: - assert(false); + OSL_ASSERT(false); return false; } } @@ -205,7 +205,7 @@ void PageDescriptor::SetCoreSelection() mpPage->SetSelected(false); else { - assert(mpPage!=nullptr); + OSL_ASSERT(mpPage!=nullptr); } } diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 80ff622427bd..37a710a45663 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -213,19 +213,19 @@ SlideSorter::~SlideSorter() model::SlideSorterModel& SlideSorter::GetModel() const { - assert(mpSlideSorterModel.get()!=nullptr); + OSL_ASSERT(mpSlideSorterModel.get()!=nullptr); return *mpSlideSorterModel; } view::SlideSorterView& SlideSorter::GetView() const { - assert(mpSlideSorterView.get()!=nullptr); + OSL_ASSERT(mpSlideSorterView.get()!=nullptr); return *mpSlideSorterView; } controller::SlideSorterController& SlideSorter::GetController() const { - assert(mpSlideSorterController.get()!=nullptr); + OSL_ASSERT(mpSlideSorterController.get()!=nullptr); return *mpSlideSorterController; } @@ -325,7 +325,7 @@ model::SlideSorterModel* SlideSorter::CreateModel() ViewShellBase* pViewShellBase = GetViewShellBase(); if (pViewShellBase != nullptr) { - assert (pViewShellBase->GetDocument() != nullptr); + OSL_ASSERT (pViewShellBase->GetDocument() != nullptr); return new model::SlideSorterModel(*this); } @@ -410,13 +410,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) std::shared_ptr<controller::Properties> const & SlideSorter::GetProperties() const { - assert(mpProperties); + OSL_ASSERT(mpProperties); return mpProperties; } std::shared_ptr<view::Theme> const & SlideSorter::GetTheme() const { - assert(mpTheme); + OSL_ASSERT(mpTheme); return mpTheme; } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index b72f1f48c717..1f015f1ae9bc 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -255,7 +255,7 @@ css::uno::Reference<css::accessibility::XAccessible> if (mpView == nullptr || mpSlideSorter.get() == nullptr) return nullptr; - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); ::accessibility::AccessibleSlideSorterView *pAccessibleView = new ::accessibility::AccessibleSlideSorterView( @@ -283,13 +283,13 @@ void SlideSorterViewShell::SwitchViewFireFocus(const css::uno::Reference< css::a SlideSorter& SlideSorterViewShell::GetSlideSorter() const { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); return *mpSlideSorter; } bool SlideSorterViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { - assert(mpSlideSorter); + OSL_ASSERT(mpSlideSorter); if ( ! mpSlideSorter) return false; @@ -357,32 +357,32 @@ SdPage* SlideSorterViewShell::GetActualPage() void SlideSorterViewShell::GetMenuState ( SfxItemSet& rSet) { ViewShell::GetMenuState(rSet); - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetSlotManager()->GetMenuState(rSet); } void SlideSorterViewShell::GetClipboardState ( SfxItemSet& rSet) { ViewShell::GetMenuState(rSet); - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetSlotManager()->GetClipboardState(rSet); } void SlideSorterViewShell::ExecCtrl (SfxRequest& rRequest) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().ExecCtrl(rRequest); } void SlideSorterViewShell::GetCtrlState (SfxItemSet& rSet) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetCtrlState(rSet); } void SlideSorterViewShell::FuSupport (SfxRequest& rRequest) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().FuSupport(rRequest); } @@ -391,7 +391,7 @@ void SlideSorterViewShell::FuSupport (SfxRequest& rRequest) */ void SlideSorterViewShell::FuTemporary (SfxRequest& rRequest) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); switch (rRequest.GetSlot()) { case SID_MODIFYPAGE: @@ -415,19 +415,19 @@ void SlideSorterViewShell::FuTemporary (SfxRequest& rRequest) void SlideSorterViewShell::GetStatusBarState (SfxItemSet& rSet) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetStatusBarState(rSet); } void SlideSorterViewShell::FuPermanent (SfxRequest& rRequest) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().FuPermanent(rRequest); } void SlideSorterViewShell::GetAttrState (SfxItemSet& rSet) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetAttrState(rSet); } @@ -440,7 +440,7 @@ void SlideSorterViewShell::Paint ( ::sd::Window* pWindow) { SetActiveWindow (pWindow); - assert(mpSlideSorter); + OSL_ASSERT(mpSlideSorter); if (mpSlideSorter) mpSlideSorter->GetController().Paint(rBBox,pWindow); } @@ -449,7 +449,7 @@ void SlideSorterViewShell::ArrangeGUIElements() { if (IsActive()) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->ArrangeGUIElements(maViewPos, maViewSize); mbIsArrangeGUIElementsPending = false; } @@ -503,14 +503,14 @@ void SlideSorterViewShell::Command ( const CommandEvent& rEvent, ::sd::Window* pWindow) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); if ( ! mpSlideSorter->GetController().Command (rEvent, pWindow)) ViewShell::Command (rEvent, pWindow); } void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); if (pFrameView != nullptr) { view::SlideSorterView& rView (mpSlideSorter->GetView()); @@ -546,7 +546,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) void SlideSorterViewShell::WriteFrameViewData() { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); if (mpFrameView != nullptr) { view::SlideSorterView& rView (mpSlideSorter->GetView()); @@ -584,7 +584,7 @@ void SlideSorterViewShell::SetZoom (long int ) void SlideSorterViewShell::SetZoomRect (const ::tools::Rectangle& rZoomRect) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); Size aPageSize (mpSlideSorter->GetView().GetLayouter().GetPageObjectSize()); ::tools::Rectangle aRect(rZoomRect); @@ -632,7 +632,7 @@ void SlideSorterViewShell::StartDrag ( const Point& rDragPt, vcl::Window* pWindow ) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetClipboard().StartDrag ( rDragPt, pWindow); @@ -645,7 +645,7 @@ sal_Int8 SlideSorterViewShell::AcceptDrop ( sal_uInt16 nPage, sal_uInt16 nLayer) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); return mpSlideSorter->GetController().GetClipboard().AcceptDrop ( rEvt, rTargetHelper, @@ -661,7 +661,7 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( sal_uInt16 nPage, sal_uInt16 nLayer) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); return mpSlideSorter->GetController().GetClipboard().ExecuteDrop ( rEvt, rTargetHelper, @@ -673,28 +673,28 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( std::shared_ptr<SlideSorterViewShell::PageSelection> SlideSorterViewShell::GetPageSelection() const { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); return mpSlideSorter->GetController().GetPageSelector().GetPageSelection(); } void SlideSorterViewShell::SetPageSelection ( const std::shared_ptr<PageSelection>& rSelection) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetPageSelector().SetPageSelection(rSelection, true); } void SlideSorterViewShell::AddSelectionChangeListener ( const Link<LinkParamNone*,void>& rCallback) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetSelectionManager()->AddSelectionChangeListener(rCallback); } void SlideSorterViewShell::RemoveSelectionChangeListener ( const Link<LinkParamNone*,void>& rCallback) { - assert(mpSlideSorter.get()!=nullptr); + OSL_ASSERT(mpSlideSorter.get()!=nullptr); mpSlideSorter->GetController().GetSelectionManager()->RemoveSelectionChangeListener(rCallback); } diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index ddca23bb17ff..3a98bfcb0cb6 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -174,7 +174,7 @@ SlideSorterView::~SlideSorterView() { if ( ! mbIsDisposed) { - assert(mbIsDisposed); + OSL_ASSERT(mbIsDisposed); Dispose(); } } @@ -198,7 +198,7 @@ void SlideSorterView::Dispose() // Deletion of the objects and the page will be done in SdrModel // destructor (as long as objects and pages are added) - assert(mpLayeredDevice.unique()); + OSL_ASSERT(mpLayeredDevice.unique()); mpLayeredDevice.reset(); mbIsDisposed = true; @@ -732,7 +732,7 @@ void SlideSorterView::RemoveVisibilityChangeListener(const Link<LinkParamNone*,v ToolTip& SlideSorterView::GetToolTip() const { - assert(mpToolTip); + OSL_ASSERT(mpToolTip); return *mpToolTip; } @@ -841,7 +841,7 @@ SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) SlideSorterView::DrawLock::~DrawLock() { - assert(mrView.mnLockRedrawSmph>0); + OSL_ASSERT(mrView.mnLockRedrawSmph>0); --mrView.mnLockRedrawSmph; if (mrView.mnLockRedrawSmph == 0) if (mpWindow) diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 110f493e8b21..05c97f6a6c51 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -43,9 +43,9 @@ FramePainter::FramePainter (const BitmapEx& rShadowBitmap) } else { - assert(rShadowBitmap.GetSizePixel().Width() == rShadowBitmap.GetSizePixel().Height()); - assert((rShadowBitmap.GetSizePixel().Width()-1)%2 == 0); - assert(((rShadowBitmap.GetSizePixel().Width()-1)/2)%2 == 1); + OSL_ASSERT(rShadowBitmap.GetSizePixel().Width() == rShadowBitmap.GetSizePixel().Height()); + OSL_ASSERT((rShadowBitmap.GetSizePixel().Width()-1)%2 == 0); + OSL_ASSERT(((rShadowBitmap.GetSizePixel().Width()-1)/2)%2 == 1); } } @@ -109,8 +109,8 @@ FramePainter::OffsetBitmap::OffsetBitmap ( : maBitmap(), maOffset() { - assert(nHorizontalPosition>=-1 && nHorizontalPosition<=+1); - assert(nVerticalPosition>=-1 && nVerticalPosition<=+1); + OSL_ASSERT(nHorizontalPosition>=-1 && nHorizontalPosition<=+1); + OSL_ASSERT(nVerticalPosition>=-1 && nVerticalPosition<=+1); const sal_Int32 nS (1); const sal_Int32 nC (::std::max<sal_Int32>(0,(rBitmap.GetSizePixel().Width()-nS)/2)); @@ -208,7 +208,7 @@ void FramePainter::OffsetBitmap::PaintSide ( else { // Diagonal sides indicates an error. - assert(false); + OSL_ASSERT(false); } } diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index e632dd59df61..7677b9015d0e 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -237,7 +237,7 @@ SharedPageObjectRun InsertAnimator::Implementation::GetRun ( nRow, nStartIndex, nEndIndex)).first; - assert(iRun != maRuns.end()); + OSL_ASSERT(iRun != maRuns.end()); } } } @@ -266,7 +266,7 @@ void InsertAnimator::Implementation::AddRun (const std::shared_ptr<PageObjectRun } else { - assert(rRun); + OSL_ASSERT(rRun); } } @@ -280,14 +280,14 @@ void InsertAnimator::Implementation::RemoveRun (const std::shared_ptr<PageObject InsertAnimator::Implementation::RunContainer::const_iterator iRun (FindRun(rRun->mnRunIndex)); if (iRun != maRuns.end()) { - assert(*iRun == rRun); + OSL_ASSERT(*iRun == rRun); maRuns.erase(iRun); } } } else { - assert(rRun); + OSL_ASSERT(rRun); } } diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index dce3744e2c80..276dc2cd791b 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -72,7 +72,7 @@ void DeviceCopy ( void ForAllRectangles (const vcl::Region& rRegion, const std::function<void (const ::tools::Rectangle&)>& aFunction) { - assert(aFunction); + OSL_ASSERT(aFunction); RectangleVector aRectangles; rRegion.GetRegionRectangles(aRectangles); @@ -174,7 +174,7 @@ void LayeredDevice::Invalidate ( { if (nLayer<0 || size_t(nLayer)>=mpLayers->size()) { - assert(nLayer>=0 && size_t(nLayer)<mpLayers->size()); + OSL_ASSERT(nLayer>=0 && size_t(nLayer)<mpLayers->size()); return; } @@ -197,15 +197,15 @@ void LayeredDevice::RegisterPainter ( const SharedILayerPainter& rpPainter, const sal_Int32 nLayer) { - assert(mpLayers); + OSL_ASSERT(mpLayers); if ( ! rpPainter) { - assert(rpPainter); + OSL_ASSERT(rpPainter); return; } if (nLayer<0 || nLayer>=gnMaximumLayerCount) { - assert(nLayer>=0 && nLayer<gnMaximumLayerCount); + OSL_ASSERT(nLayer>=0 && nLayer<gnMaximumLayerCount); return; } @@ -233,12 +233,12 @@ void LayeredDevice::RemovePainter ( { if ( ! rpPainter) { - assert(rpPainter); + OSL_ASSERT(rpPainter); return; } if (nLayer<0 || size_t(nLayer)>=mpLayers->size()) { - assert(nLayer>=0 && size_t(nLayer)<mpLayers->size()); + OSL_ASSERT(nLayer>=0 && size_t(nLayer)<mpLayers->size()); return; } @@ -360,7 +360,7 @@ bool LayeredDevice::HandleMapModeChange() else { // Can this happen? Lets trigger a warning when it does. - assert(false); + OSL_ASSERT(false); } maSavedMapMode = rMapMode; @@ -461,7 +461,7 @@ void Layer::Resize (const Size& rSize) void Layer::AddPainter (const SharedILayerPainter& rpPainter) { - assert(::std::find(maPainters.begin(), maPainters.end(), rpPainter) == maPainters.end()); + OSL_ASSERT(::std::find(maPainters.begin(), maPainters.end(), rpPainter) == maPainters.end()); maPainters.push_back(rpPainter); } diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index e276b5f95514..1728cc390c3f 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -325,7 +325,7 @@ bool Layouter::Rearrange ( const Size& rPageSize, const sal_uInt32 nPageCount) { - assert(mpWindow); + OSL_ASSERT(mpWindow); if (eOrientation != mpImplementation->GetOrientation()) mpImplementation.reset(Implementation::Create(*mpImplementation, eOrientation)); @@ -842,7 +842,7 @@ Size Layouter::Implementation::GetTargetSize ( return maPreferredSize; if ( ! (bCalculateWidth || bCalculateHeight)) { - assert(bCalculateWidth || bCalculateHeight); + OSL_ASSERT(bCalculateWidth || bCalculateHeight); return maPreferredSize; } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 39e25aec4800..b4d41cc4ddff 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -165,7 +165,7 @@ PageObjectLayouter::~PageObjectLayouter() const CoordinateSystem eCoordinateSystem, bool bIgnoreLocation) { - assert(rpPageDescriptor); + OSL_ASSERT(rpPageDescriptor); Point aLocation(0,0); if (rpPageDescriptor) aLocation = rpPageDescriptor->GetLocation( bIgnoreLocation ); @@ -228,7 +228,7 @@ Size PageObjectLayouter::GetGridMaxSize() Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) { - assert(mpWindow); + OSL_ASSERT(mpWindow); // Set the correct font. vcl::Font aOriginalFont (mpWindow->GetFont()); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 4695a1a2f129..51d361205b36 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -258,7 +258,7 @@ void PageObjectPainter::PaintPageNumber ( } // Paint the page number. - assert(rpDescriptor->GetPage()!=nullptr); + OSL_ASSERT(rpDescriptor->GetPage()!=nullptr); const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1); const OUString sPageNumber(OUString::number(nPageNumber)); rDevice.SetFont(*mpPageNumberFont); diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 2398bb938256..c204140ab45f 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -223,7 +223,7 @@ const BitmapEx& Theme::GetIcon (const IconType eType) return maIcons[eType]; else { - assert(eType>=0 && size_t(eType)<maIcons.size()); + OSL_ASSERT(eType>=0 && size_t(eType)<maIcons.size()); return maIcons[0]; } } @@ -234,7 +234,7 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) return maGradients[eType]; else { - assert(eType>=0 && size_t(eType)<maGradients.size()); + OSL_ASSERT(eType>=0 && size_t(eType)<maGradients.size()); return maGradients[0]; } } @@ -248,7 +248,7 @@ void Theme::InitializeIcon(const IconType eType, const OUString& rResourceId) } else { - assert(eType>=0 && size_t(eType)<maIcons.size()); + OSL_ASSERT(eType>=0 && size_t(eType)<maIcons.size()); } } diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 8707e5db3d99..515520b8371a 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -73,7 +73,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) sHelpText = pPage->GetName(); else { - assert(mpDescriptor->GetPage() != nullptr); + OSL_ASSERT(mpDescriptor->GetPage() != nullptr); } if (sHelpText.isEmpty()) { diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 038bfaf9c140..69878f2ef874 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -220,7 +220,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) rReq.Ignore(); SfxViewShell* pViewShell = GetViewShell(); - assert (pViewShell!=nullptr); + OSL_ASSERT (pViewShell!=nullptr); SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_INSERT_TABLE, true ); break; diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 48e29d5709fd..d8096c27e53c 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -376,7 +376,7 @@ void PreviewRenderer::SetupOutputSize ( else { // We should never get here. - assert(false); + OSL_ASSERT(false); aMapMode.SetScaleX(1.0); aMapMode.SetScaleY(1.0); } diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 17e0184b36b1..f1c6d3186a0d 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -301,7 +301,7 @@ namespace { // Set the visible layers SdrPageView* pPageView = rPrintView.GetSdrPageView(); - assert(pPageView!=nullptr); + OSL_ASSERT(pPageView!=nullptr); pPageView->SetVisibleLayers(rVisibleLayers); pPageView->SetPrintableLayers(rPrintableLayers); @@ -1183,7 +1183,7 @@ public: */ void ProcessProperties (const css::uno::Sequence<css::beans::PropertyValue >& rOptions) { - assert(!mbIsDisposed); + OSL_ASSERT(!mbIsDisposed); if (mbIsDisposed) return; @@ -1222,7 +1222,7 @@ public: */ sal_Int32 GetPrintPageCount() { - assert(!mbIsDisposed); + OSL_ASSERT(!mbIsDisposed); if (mbIsDisposed) return 0; else @@ -1256,7 +1256,7 @@ public: */ void PrintPage (const sal_Int32 nIndex) { - assert(!mbIsDisposed); + OSL_ASSERT(!mbIsDisposed); if (mbIsDisposed) return; @@ -1267,7 +1267,7 @@ public: return; SdDrawDocument* pDocument = pViewShell->GetDoc(); - assert(pDocument!=nullptr); + OSL_ASSERT(pDocument!=nullptr); std::shared_ptr<DrawViewShell> pDrawViewShell( std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); @@ -1279,7 +1279,7 @@ public: return; const std::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]); - assert(pPage); + OSL_ASSERT(pPage); if ( ! pPage) return; @@ -1580,8 +1580,8 @@ private: const sal_Int32 nPageIndex, const PageKind ePageKind) const { - assert(mrBase.GetDocument() != nullptr); - assert(nPageIndex>=0); + OSL_ASSERT(mrBase.GetDocument() != nullptr); + OSL_ASSERT(nPageIndex>=0); SdPage* pPage = mrBase.GetDocument()->GetSdPage( sal::static_int_cast<sal_uInt16>(nPageIndex), ePageKind); @@ -1756,7 +1756,7 @@ private: void PrepareHandout (PrintInfo& rInfo) { SdDrawDocument* pDocument = mrBase.GetDocument(); - assert(pDocument != nullptr); + OSL_ASSERT(pDocument != nullptr); SdPage& rHandoutPage (*pDocument->GetSdPage(0, PageKind::Handout)); const bool bScalePage (mpOptions->IsPageSize()); @@ -1871,7 +1871,7 @@ private: const PageKind ePageKind, PrintInfo& rInfo) { - assert(rInfo.mpPrinter != nullptr); + OSL_ASSERT(rInfo.mpPrinter != nullptr); // Fill in page kind specific data. SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc(); diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 68cbbb1bdfb0..c5b324aede8b 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -146,7 +146,7 @@ void FormShellManager::RegisterAtCenterPane() WindowEventHandler)); // Create a shell factory and with it activate the form shell. - assert(mpSubShellFactory.get()==nullptr); + OSL_ASSERT(mpSubShellFactory.get()==nullptr); mpSubShellFactory.reset(new FormShellManagerFactory(*pShell, *this)); mrBase.GetViewShellManager()->AddSubShellFactory(pShell,mpSubShellFactory); mrBase.GetViewShellManager()->ActivateSubShell(*pShell, RID_FORMLAYER_TOOLBOX); @@ -264,7 +264,7 @@ void FormShellManager::Notify(SfxBroadcaster&, const SfxHint& rHint) // If all goes well this listener is called after the // FormShellManager was notified about the dying form shell by the // FormShellManagerFactory. - assert(mpFormShell==nullptr); + OSL_ASSERT(mpFormShell==nullptr); if (mpFormShell != nullptr) { mpFormShell = nullptr; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 33c289a2c391..0cd8df02d24e 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -476,7 +476,7 @@ bool SdOutliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) { - assert(pViewShell); + OSL_ASSERT(pViewShell); return true; } @@ -539,7 +539,7 @@ void SdOutliner::Initialize (bool bDirectionIsForward) std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) { - assert(pViewShell); + OSL_ASSERT(pViewShell); return; } @@ -604,7 +604,7 @@ bool SdOutliner::SearchAndReplaceAll() std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) { - assert(pViewShell); + OSL_ASSERT(pViewShell); return true; } @@ -945,7 +945,7 @@ void SdOutliner::RememberStartPosition() std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) { - assert(pViewShell); + OSL_ASSERT(pViewShell); return; } @@ -1128,7 +1128,7 @@ void SdOutliner::EndOfSearch() std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) { - assert(pViewShell); + OSL_ASSERT(pViewShell); return; } @@ -1379,7 +1379,7 @@ void SdOutliner::SetViewMode (PageKind ePageKind) // Save edit mode so that it can be restored when switching the view // shell again. pDrawViewShell = std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell); - assert(pDrawViewShell.get()!=nullptr); + OSL_ASSERT(pDrawViewShell.get()!=nullptr); if (pDrawViewShell.get() != nullptr) mpImpl->meOriginalEditMode = pDrawViewShell->GetEditMode(); } @@ -1392,7 +1392,7 @@ void SdOutliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); std::shared_ptr<sd::DrawViewShell> pDrawViewShell( std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell)); - assert(pDrawViewShell.get()!=nullptr); + OSL_ASSERT(pDrawViewShell.get()!=nullptr); if (pDrawViewShell.get() != nullptr) { pDrawViewShell->ChangeEditMode(eEditMode, false); diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 11b83861e922..0126a1d3a57b 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -187,7 +187,7 @@ Iterator OutlinerContainer::CreateSelectionIterator ( bool bDirectionIsForward, IteratorLocation aLocation) { - assert(rpViewShell.get()); + OSL_ASSERT(rpViewShell.get()); sal_Int32 nObjectIndex; @@ -226,7 +226,7 @@ Iterator OutlinerContainer::CreateDocumentIterator ( bool bDirectionIsForward, IteratorLocation aLocation) { - assert(rpViewShell.get()); + OSL_ASSERT(rpViewShell.get()); PageKind ePageKind; EditMode eEditMode; @@ -292,7 +292,7 @@ sal_Int32 OutlinerContainer::GetPageIndex ( bool bDirectionIsForward, IteratorLocation aLocation) { - assert(rpViewShell); + OSL_ASSERT(rpViewShell); sal_Int32 nPageIndex; sal_Int32 nPageCount; diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 8949d7b0392b..c4e2e6fd6561 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -743,7 +743,7 @@ void ToolBarManager::Implementation::LockUpdate() DBG_ASSERT(mnLockCount<100, "ToolBarManager lock count unusually high"); if (mnLockCount == 0) { - assert(mpSynchronousLayouterLock.get()==nullptr); + OSL_ASSERT(mpSynchronousLayouterLock.get()==nullptr); mpSynchronousLayouterLock.reset(new LayouterLock(mxLayouter)); } @@ -755,7 +755,7 @@ void ToolBarManager::Implementation::UnlockUpdate() SAL_INFO("sd.view", OSL_THIS_FUNC << ": UnlockUpdate " << mnLockCount); ::osl::MutexGuard aGuard(maMutex); - assert(mnLockCount>0); + OSL_ASSERT(mnLockCount>0); --mnLockCount; if (mnLockCount == 0) { diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 65913edae752..308e28f890af 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -487,7 +487,7 @@ void ViewShellBase::OuterResizePixel (const Point& rOrigin, const Size &rSize) void ViewShellBase::Rearrange() { - assert(GetViewFrame()!=nullptr); + OSL_ASSERT(GetViewFrame()!=nullptr); // There is a bug in the communication between embedded objects and the // framework::LayoutManager that leads to missing resize updates. The @@ -526,7 +526,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable() SfxPrinter* ViewShellBase::GetPrinter (bool bCreate) { - assert(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); return GetDocShell()->GetPrinter (bCreate); } @@ -535,7 +535,7 @@ sal_uInt16 ViewShellBase::SetPrinter ( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags) { - assert(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); GetDocShell()->SetPrinter(pNewPrinter); @@ -917,8 +917,8 @@ OUString ViewShellBase::GetInitialViewShellType() std::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer() { - assert(mpImpl.get()!=nullptr); - assert(mpImpl->mpEventMultiplexer.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=nullptr); return mpImpl->mpEventMultiplexer; } @@ -930,37 +930,37 @@ const ::tools::Rectangle& ViewShellBase::getClientRectangle() const std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const { - assert(mpImpl.get()!=nullptr); - assert(mpImpl->mpToolBarManager.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl->mpToolBarManager.get()!=nullptr); return mpImpl->mpToolBarManager; } std::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const { - assert(mpImpl.get()!=nullptr); - assert(mpImpl->mpFormShellManager.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl->mpFormShellManager.get()!=nullptr); return mpImpl->mpFormShellManager; } DrawController& ViewShellBase::GetDrawController() const { - assert(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); return *mpImpl->mpController; } void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabBar) { - assert(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); mpImpl->mpViewTabBar = rViewTabBar; } vcl::Window* ViewShellBase::GetViewWindow() { - assert(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl.get()!=nullptr); return mpImpl->mpViewWindow.get(); } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 4dac411b5589..8990f5aa76ef 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -712,7 +712,7 @@ SfxShell* ViewShellManager::Implementation::GetShell (ShellId nId) const SfxShell* ViewShellManager::Implementation::GetTopShell() const { - assert(mpTopShell == mrBase.GetSubShell(0)); + OSL_ASSERT(mpTopShell == mrBase.GetSubShell(0)); return mpTopShell; } @@ -734,7 +734,7 @@ void ViewShellManager::Implementation::UnlockUpdate() if (mnUpdateLockCount < 0) { // This should not happen. - assert (mnUpdateLockCount>=0); + OSL_ASSERT (mnUpdateLockCount>=0); mnUpdateLockCount = 0; } if (mnUpdateLockCount == 0) @@ -1060,7 +1060,7 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( void ViewShellManager::Implementation::DestroyViewShell ( ShellDescriptor& rDescriptor) { - assert(rDescriptor.mpShell != nullptr); + OSL_ASSERT(rDescriptor.mpShell != nullptr); if (rDescriptor.mbIsListenerAddedToWindow) { @@ -1089,7 +1089,7 @@ void ViewShellManager::Implementation::DestroySubShell ( const ShellDescriptor& rDescriptor) { (void)rParentShell; - assert(rDescriptor.mpFactory.get() != nullptr); + OSL_ASSERT(rDescriptor.mpFactory.get() != nullptr); rDescriptor.mpFactory->ReleaseShell(rDescriptor.mpShell); } @@ -1169,7 +1169,7 @@ void ViewShellManager::Implementation::DumpSfxShellStack() void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) { - assert(pShell!=nullptr); + OSL_ASSERT(pShell!=nullptr); // We have to end a text edit for view shells that are to be taken from // the shell stack. diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 6f9637a987b4..2ea8063470ab 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -747,7 +747,7 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) bActivated = ViewShell::ActivateObject(pObj, nVerb); - assert(GetViewShell()!=nullptr); + OSL_ASSERT(GetViewShell()!=nullptr); Client* pClient = static_cast<Client*>(GetViewShell()->GetIPClient()); if (pClient) pClient->SetSdrGrafObj(nullptr); @@ -842,7 +842,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) } else { - assert(mpFrameView!=nullptr); + OSL_ASSERT(mpFrameView!=nullptr); mpFrameView->SetSelectedPage(nSelectedPage); if (GetDoc()->GetSdPageCount(mePageKind) > nSelectedPage) @@ -932,7 +932,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { // tighten VisArea, to possibly deactivate objects // !!! only if we are not in presentation mode (#96279) !!! - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); GetViewShell()->DisconnectAllClients(); VisAreaChanged(::tools::Rectangle(Point(), Size(1, 1))); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index af4d8f51de31..2a3aedf19bba 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -327,7 +327,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_OBJECTRESIZE: { // The server likes to change the client size - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index bd6220c032ff..6bc0613f250a 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -831,7 +831,7 @@ void DrawViewShell::ShowMousePosInfo(const ::tools::Rectangle& rRect, } // display with coordinates in StatusBar - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); if ( !GetViewShell()->GetUIActiveClient() ) { SfxItemSet aSet(GetPool(), SID_CONTEXT, SID_CONTEXT, diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index f1c6b613c6d3..9ba7f6bb4dce 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -116,7 +116,7 @@ void DrawViewShell::ArrangeGUIElements() maTabControl->Hide(); - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); Client* pIPClient = static_cast<Client*>(GetViewShell()->GetIPClient()); bool bClientActive = false; if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index ee7873d10419..c623adcb6517 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -136,7 +136,7 @@ DrawViewShell::~DrawViewShell() mpAnnotationManager.reset(); mpViewOverlayManager.reset(); - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); if( mxScannerListener.is() ) static_cast< ScannerEventListener* >( mxScannerListener.get() )->ParentDestroyed(); @@ -206,7 +206,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mpFrameView->Connect(); - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); SetPool( &GetDoc()->GetPool() ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 9fd244e7904d..39688be50520 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1555,7 +1555,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER; - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = GetViewShell()->GetIPClient(); if (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive()) { diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index b6f19b8cdc4e..25bf6e858a9b 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1836,7 +1836,7 @@ void OutlineViewShell::VisAreaChanged(const ::tools::Rectangle& rRect) css::uno::Reference<css::accessibility::XAccessible> OutlineViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); if (GetViewShell()->GetController() != nullptr) { ::accessibility::AccessibleOutlineView* pDocumentView = diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 59f8b4cfc7b3..5fa5158618bf 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -276,7 +276,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if (mpViewSh != nullptr) { - assert (mpViewSh->GetViewShell()!=nullptr); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); if( dynamic_cast< ::sd::slidesorter::SlideSorterViewShell *>( mpViewSh ) != nullptr || (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive())) @@ -1001,7 +1001,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if (mpViewSh!=nullptr) { - assert (mpViewSh->GetViewShell()!=nullptr); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); if (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive()) @@ -1171,7 +1171,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if (mpViewSh!=nullptr) { - assert (mpViewSh->GetViewShell()!=nullptr); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); if (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive()) diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 4c7f60b3c2c1..af1bafb11a81 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -543,7 +543,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) if (mpViewSh != nullptr) { - assert (mpViewSh->GetViewShell()!=nullptr); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); if (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive()) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 27900d92d086..c56e19ac138e 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -477,7 +477,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, OUString aString(SdResId(STR_UNDO_CHANGE_PAGEFORMAT)); pUndoGroup->SetComment(aString); SfxViewShell* pViewShell = GetViewShell(); - assert (pViewShell!=nullptr); + OSL_ASSERT (pViewShell!=nullptr); sal_uInt16 i, nPageCnt = GetDoc()->GetMasterSdPageCount(ePageKind); @@ -639,7 +639,7 @@ void ViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction&) void ViewShell::SetActiveWindow (::sd::Window* pWin) { SfxViewShell* pViewShell = GetViewShell(); - assert (pViewShell!=nullptr); + OSL_ASSERT (pViewShell!=nullptr); if (pViewShell->GetWindow() != pWin) { @@ -722,7 +722,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) bool bAbort = false; GetDocSh()->SetWaitCursor( true ); SfxViewShell* pViewShell = GetViewShell(); - assert (pViewShell!=nullptr); + OSL_ASSERT (pViewShell!=nullptr); bool bChangeDefaultsForChart = false; OUString aName; @@ -934,7 +934,7 @@ void ViewShell::SetRuler(bool bRuler) } } - assert(GetViewShell()!=nullptr); + OSL_ASSERT(GetViewShell()!=nullptr); if (IsMainViewShell()) GetViewShell()->InvalidateBorder(); } @@ -966,7 +966,7 @@ void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert const sal_Int32 nIndex = rSequence.getLength(); rSequence.realloc( nIndex + 1 ); - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); // Get the view id from the view shell in the center pane. This will // usually be the called view shell, but to be on the safe side we call // the main view shell explicitly. @@ -986,7 +986,7 @@ void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::Pr void ViewShell::VisAreaChanged(const ::tools::Rectangle& /*rRect*/) { - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); GetViewShell()->VisAreaChanged(); } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index d16323842a90..b741231d7986 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -133,7 +133,7 @@ SfxViewFrame* ViewShell::GetViewFrame() const } else { - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); return nullptr; } } @@ -195,7 +195,7 @@ void ViewShell::construct() mpImpl.reset(new Implementation(*this)); meShellType = ST_NONE; - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); if (IsMainViewShell()) GetDocSh()->Connect (this); @@ -326,7 +326,7 @@ void ViewShell::Activate(bool bIsMDIActivate) { &aItem }); SfxViewShell* pViewShell = GetViewShell(); - assert (pViewShell!=nullptr); + OSL_ASSERT (pViewShell!=nullptr); SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_3D_STATE, true ); @@ -349,13 +349,13 @@ void ViewShell::Activate(bool bIsMDIActivate) void ViewShell::UIActivating( SfxInPlaceClient* ) { - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); GetViewShellBase().GetToolBarManager()->ToolBarsDestroyed(); } void ViewShell::UIDeactivated( SfxInPlaceClient* ) { - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); GetViewShellBase().GetToolBarManager()->ToolBarsDestroyed(); if ( GetDrawView() ) GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*this, *GetDrawView()); @@ -372,7 +372,7 @@ void ViewShell::Deactivate(bool bIsMDIActivate) if( pDragTransferable ) pDragTransferable->SetView( nullptr ); - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); // remember view attributes of FrameView WriteFrameViewData(); @@ -411,7 +411,7 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { // give key input first to SfxViewShell to give CTRL+Key // (e.g. CTRL+SHIFT+'+', to front) priority. - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); bReturn = GetViewShell()->KeyInput(rKEvt); } @@ -472,7 +472,7 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) // selection; this changes the window size and thus the mouse position // in model coordinates: with respect to model coordinates the mouse // moves.) - assert(mpImpl->mpUpdateLockForMouse.expired()); + OSL_ASSERT(mpImpl->mpUpdateLockForMouse.expired()); mpImpl->mpUpdateLockForMouse = ViewShell::Implementation::ToolBarManagerLock::Create( GetViewShellBase().GetToolBarManager()); @@ -1081,7 +1081,7 @@ void ViewShell::ArrangeGUIElements() bool bSlideShowActive = (xSlideShow.is() && xSlideShow->isRunning()) && !xSlideShow->isFullScreen() && xSlideShow->getAnimationMode() == ANIMATIONMODE_SHOW; if ( !bSlideShowActive) { - assert (GetViewShell()!=nullptr); + OSL_ASSERT (GetViewShell()!=nullptr); if (mpContentWindow) mpContentWindow->SetPosSizePixel( diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 0bc8c605c0b7..b44ef77db127 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -114,7 +114,7 @@ ImageId ImageContainer::addImage( const uno::Sequence<beans::PropertyValue>& xBi void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContext ) { - assert( nId >= 0 && nId < ImageId( m_aImages.size()) ); + OSL_ASSERT( nId >= 0 && nId < ImageId( m_aImages.size()) ); const uno::Sequence<beans::PropertyValue>& rEntry( m_aImages[nId] ); diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 25391e80d9bf..cdbcd2ddb6eb 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -826,7 +826,7 @@ void Parser::parseLine( const OString& rLine ) const OString& rCmd = readNextToken(); const hash_entry* pEntry = PdfKeywordHash::in_word_set( rCmd.getStr(), rCmd.getLength() ); - assert(pEntry); + OSL_ASSERT(pEntry); switch( pEntry->eKey ) { case CLIPPATH: @@ -1017,7 +1017,7 @@ bool xpdf_ImportFromFile( const OUString& rURL, const uno::Reference< uno::XComponentContext >& xContext, const OUString& rFilterOptions ) { - assert(rSink); + OSL_ASSERT(rSink); OUString aSysUPath; if( osl_getSystemPathFromFileURL( rURL.pData, &aSysUPath.pData ) != osl_File_E_None ) @@ -1196,8 +1196,8 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xI const uno::Reference< uno::XComponentContext >& xContext, const OUString& rFilterOptions ) { - assert(xInput.is()); - assert(rSink); + OSL_ASSERT(xInput.is()); + OSL_ASSERT(rSink); // convert XInputStream to local temp file oslFileHandle aFile = nullptr; diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index fbe4e0a742ac..3dd042d6cc79 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -1846,8 +1846,8 @@ AccessibleFocusManager::AccessibleFocusManager() void AccessibleFocusManager::AddFocusableObject ( const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject) { - assert(rpObject.is()); - assert(::std::find(maFocusableObjects.begin(),maFocusableObjects.end(), rpObject)==maFocusableObjects.end()); + OSL_ASSERT(rpObject.is()); + OSL_ASSERT(::std::find(maFocusableObjects.begin(),maFocusableObjects.end(), rpObject)==maFocusableObjects.end()); maFocusableObjects.push_back(rpObject); } @@ -1862,7 +1862,7 @@ void AccessibleFocusManager::RemoveFocusableObject ( maFocusableObjects.erase(iObject); else { - assert(iObject!=maFocusableObjects.end()); + OSL_ASSERT(iObject!=maFocusableObjects.end()); } } diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 25cc120ff1b5..ea39f17e2588 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -136,7 +136,7 @@ void PresenterBitmapContainer::LoadBitmaps ( } catch (Exception&) { - assert(false); + OSL_ASSERT(false); } } @@ -165,7 +165,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( } catch (Exception&) { - assert(false); + OSL_ASSERT(false); } } @@ -193,8 +193,8 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const SharedBitmapDescriptor& rpDefault) { - assert(rxCanvas.is()); - assert(rxPresenterHelper.is()); + OSL_ASSERT(rxCanvas.is()); + OSL_ASSERT(rxPresenterHelper.is()); SharedBitmapDescriptor pBitmap (new BitmapDescriptor(rpDefault)); diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index aa2eab3dd0a7..4487e70bad0e 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -302,7 +302,7 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent if (meState == PresenterBitmapDescriptor::ButtonDown) { - assert(mpPresenterController.get()!=nullptr); + OSL_ASSERT(mpPresenterController.get()!=nullptr); mpPresenterController->DispatchUnoCommand(msAction); meState = PresenterBitmapDescriptor::Normal; @@ -420,7 +420,7 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap ( return mpIcon->GetBitmap(eMode); else { - assert(mpIcon.get()!=nullptr); + OSL_ASSERT(mpIcon.get()!=nullptr); return nullptr; } } diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 6a275e1a0fc1..4903a87e1afe 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -249,7 +249,7 @@ void PresenterCanvasHelper::SetDeviceColor( { // Other component counts then 4 (RGBA) are not accepted (anymore). - assert(rRenderState.DeviceColor.getLength() == 4); + OSL_ASSERT(rRenderState.DeviceColor.getLength() == 4); if (rRenderState.DeviceColor.getLength() == 4) { rRenderState.DeviceColor[0] = ((aColor >> 16) & 0x0ff) / 255.0; diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 893cf254737b..23867f4bc931 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -194,7 +194,7 @@ void PresenterConfigurationAccess::ForAll ( const OUString& rsKey (aKeys[nItemIndex]); Reference<container::XNameAccess> xSetItem (rxContainer->getByName(rsKey), UNO_QUERY); Reference<beans::XPropertySet> xSet (xSetItem, UNO_QUERY); - assert(xSet.is()); + OSL_ASSERT(xSet.is()); if (xSetItem.is()) { // Get from the current item of the container the children @@ -268,7 +268,7 @@ Any PresenterConfigurationAccess::GetProperty ( const Reference<beans::XPropertySet>& rxProperties, const OUString& rsKey) { - assert(rxProperties.is()); + OSL_ASSERT(rxProperties.is()); if ( ! rxProperties.is()) return Any(); try diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index ce57350fe738..477ad680ff7c 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -116,7 +116,7 @@ PresenterController::PresenterController ( mpAccessibleObject(), mbIsAccessibilityActive(false) { - assert(mxController.is()); + OSL_ASSERT(mxController.is()); if ( ! mxSlideShowController.is()) throw lang::IllegalArgumentException( @@ -368,7 +368,7 @@ void PresenterController::UpdatePaneTitles() PresenterPaneContainer::PaneList::const_iterator iPane; for (iPane=mpPaneContainer->maPanes.begin(); iPane!=mpPaneContainer->maPanes.end(); ++iPane) { - assert((*iPane).get() != nullptr); + OSL_ASSERT((*iPane).get() != nullptr); OUString sTemplate (IsAccessibilityActive() ? (*iPane)->msAccessibleTitleTemplate @@ -1166,7 +1166,7 @@ double PresenterController::GetSlideAspectRatio() const } catch (RuntimeException&) { - assert(false); + OSL_ASSERT(false); } return nSlideAspectRatio; diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index bed7c089b76e..6ed5f744afe5 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -531,7 +531,7 @@ bool LineDescriptor::IsEmpty() const void LineDescriptor::CalculateSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont) { - assert(rxFont.is()); + OSL_ASSERT(rxFont.is()); rendering::StringContext aContext (msLine, 0, msLine.getLength()); Reference<rendering::XTextLayout> xLayout ( diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 668c4545f81f..4fc1ac3a4995 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -456,7 +456,7 @@ void PresenterNotesView::Layout() } catch(beans::UnknownPropertyException&) { - assert(false); + OSL_ASSERT(false); } if(AllSettings::GetLayoutRTL()) { @@ -552,7 +552,7 @@ void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox) } // Paint the horizontal separator. - assert(mxViewId.is()); + OSL_ASSERT(mxViewId.is()); PresenterCanvasHelper::SetDeviceColor(aRenderState, maSeparatorColor); mxCanvas->drawLine( @@ -660,7 +660,7 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange) } catch (Exception&) { - assert(false); + OSL_ASSERT(false); } } } @@ -680,7 +680,7 @@ void PresenterNotesView::UpdateScrollBar() } catch(beans::UnknownPropertyException&) { - assert(false); + OSL_ASSERT(false); } mpScrollBar->SetLineHeight(mpFont->mnSize*1.2); diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 5b6eb6f409ce..295e76c94284 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -109,8 +109,8 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle) { msTitle = rsTitle; - assert(mpPresenterController.get()!=nullptr); - assert(mpPresenterController->GetPaintManager().get()!=nullptr); + OSL_ASSERT(mpPresenterController.get()!=nullptr); + OSL_ASSERT(mpPresenterController->GetPaintManager().get()!=nullptr); mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } @@ -345,7 +345,7 @@ void PresenterPaneBase::PaintBorderBackground ( void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) { - assert(mxPaneId.is()); + OSL_ASSERT(mxPaneId.is()); if (mxBorderPainter.is() && mxBorderWindow.is() && mxBorderCanvas.is()) { @@ -365,9 +365,9 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) void PresenterPaneBase::LayoutContextWindow() { - assert(mxPaneId.is()); - assert(mxBorderWindow.is()); - assert(mxContentWindow.is()); + OSL_ASSERT(mxPaneId.is()); + OSL_ASSERT(mxBorderWindow.is()); + OSL_ASSERT(mxContentWindow.is()); if (mxBorderPainter.is() && mxPaneId.is() && mxBorderWindow.is() && mxContentWindow.is()) { const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize()); diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 284713eaac44..f35662ebebbc 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -565,7 +565,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( std::shared_ptr<RendererPaneStyle> PresenterPaneBorderPainter::Renderer::GetRendererPaneStyle (const OUString& rsResourceURL) { - assert(mpTheme.get()!=nullptr); + OSL_ASSERT(mpTheme.get()!=nullptr); RendererPaneStyleContainer::const_iterator iStyle (maRendererPaneStyles.find(rsResourceURL)); if (iStyle == maRendererPaneStyles.end()) @@ -810,14 +810,14 @@ RendererPaneStyle::RendererPaneStyle ( try { ::std::vector<sal_Int32> aInnerBorder (rpTheme->GetBorderSize(rsStyleName, false)); - assert(aInnerBorder.size()==4); + OSL_ASSERT(aInnerBorder.size()==4); maInnerBorderSize.mnLeft = aInnerBorder[0]; maInnerBorderSize.mnTop = aInnerBorder[1]; maInnerBorderSize.mnRight = aInnerBorder[2]; maInnerBorderSize.mnBottom = aInnerBorder[3]; ::std::vector<sal_Int32> aOuterBorder (rpTheme->GetBorderSize(rsStyleName, true)); - assert(aOuterBorder.size()==4); + OSL_ASSERT(aOuterBorder.size()==4); maOuterBorderSize.mnLeft = aOuterBorder[0]; maOuterBorderSize.mnTop = aOuterBorder[1]; maOuterBorderSize.mnRight = aOuterBorder[2]; @@ -825,7 +825,7 @@ RendererPaneStyle::RendererPaneStyle ( } catch(beans::UnknownPropertyException&) { - assert(false); + OSL_ASSERT(false); } UpdateBorderSizes(); diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 27448bed3b4f..66eef2cef50f 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -199,7 +199,7 @@ PresenterPaneContainer::SharedPaneDescriptor } catch (RuntimeException&) { - assert(false); + OSL_ASSERT(false); } } } @@ -339,7 +339,7 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor) for (iPane=maPanes.begin(); iPane!=iEnd; ++iPane) if (iPane->get() == rpDescriptor.get()) break; - assert(iPane!=iEnd); + OSL_ASSERT(iPane!=iEnd); if (iPane == iEnd) return; diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 33519be65aa3..a2a83d8cc27b 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -101,7 +101,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont } catch (RuntimeException&) { - assert(false); + OSL_ASSERT(false); if (xCC.is()) xCC->removeResourceFactoryForReference(this); mxConfigurationControllerWeak = WeakReference<XConfigurationController>(); @@ -242,7 +242,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( } catch (Exception&) { - assert(false); + OSL_ASSERT(false); } return nullptr; diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 927b57ae460e..240ba57e7aab 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -280,7 +280,7 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume } catch (RuntimeException&) { - assert(false); + OSL_ASSERT(false); } } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index e6db514f3447..1739468f360f 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -496,7 +496,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( } catch (const beans::UnknownPropertyException&) { - assert(false); + OSL_ASSERT(false); // For some reason we can not access the screen number. Use // the default instead. } @@ -605,7 +605,7 @@ void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxCo } catch (const RuntimeException&) { - assert(false); + OSL_ASSERT(false); } } @@ -621,7 +621,7 @@ void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxCo } catch (const RuntimeException&) { - assert(false); + OSL_ASSERT(false); } } @@ -725,7 +725,7 @@ void PresenterScreen::ProcessViewDescriptions ( } catch (const RuntimeException&) { - assert(false); + OSL_ASSERT(false); } } @@ -771,7 +771,7 @@ void PresenterScreen::ProcessComponent ( } catch (const Exception&) { - assert(false); + OSL_ASSERT(false); } } @@ -798,7 +798,7 @@ void PresenterScreen::ProcessViewDescription ( } catch (const Exception&) { - assert(false); + OSL_ASSERT(false); } } @@ -824,7 +824,7 @@ void PresenterScreen::SetupView( aViewDescriptor = iDescriptor->second; // Prepare the pane. - assert(mpPaneContainer.get() != nullptr); + OSL_ASSERT(mpPaneContainer.get() != nullptr); mpPaneContainer->PreparePane( xPaneId, rsViewURL, diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 9613f00d494b..89ac7f52ce16 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -220,7 +220,7 @@ void PresenterScrollBar::SetTotalSize (const double nTotalSize) void PresenterScrollBar::SetThumbSize (const double nThumbSize) { - assert(nThumbSize>=0); + OSL_ASSERT(nThumbSize>=0); if (mnThumbSize != nThumbSize) { mnThumbSize = nThumbSize; @@ -258,7 +258,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx } catch(Exception&) { - assert(false); + OSL_ASSERT(false); } } else @@ -296,8 +296,8 @@ void PresenterScrollBar::Paint ( { if ( ! mxCanvas.is() || ! mxWindow.is()) { - assert(mxCanvas.is()); - assert(mxWindow.is()); + OSL_ASSERT(mxCanvas.is()); + OSL_ASSERT(mxWindow.is()); return; } @@ -446,7 +446,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven geometry::RealRectangle2D const & PresenterScrollBar::GetRectangle (const Area eArea) const { - assert(eArea>=0 && eArea<AreaCount); + OSL_ASSERT(eArea>=0 && eArea<AreaCount); return maBox[eArea]; } @@ -581,7 +581,7 @@ PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMo bool PresenterScrollBar::IsDisabled (const Area eArea) const { - assert(eArea>=0 && eArea<AreaCount); + OSL_ASSERT(eArea>=0 && eArea<AreaCount); return ! maEnabledState[eArea]; } diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index d106f50d6068..978a6577ac45 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -222,7 +222,7 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag } catch (beans::UnknownPropertyException&) { - assert(false); + OSL_ASSERT(false); } } diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index f8267de9d059..7953b2b560cc 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -529,8 +529,8 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r break; case 2: - assert(mpPresenterController.get()!=nullptr); - assert(mpPresenterController->GetWindowManager().get()!=nullptr); + OSL_ASSERT(mpPresenterController.get()!=nullptr); + OSL_ASSERT(mpPresenterController->GetWindowManager().get()!=nullptr); mpPresenterController->GetWindowManager()->SetSlideSorterState(false); GotoSlide(nSlideIndex); break; @@ -613,7 +613,7 @@ void SAL_CALL PresenterSlideSorter::propertyChange ( void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( sal_Int32 nSlideIndex) { - assert(mpLayout.get()!=nullptr); + OSL_ASSERT(mpLayout.get()!=nullptr); awt::Rectangle aBBox (mpLayout->GetBoundingBox(nSlideIndex)); mpPresenterController->GetPaintManager()->Invalidate(mxWindow, aBBox, true); @@ -807,7 +807,7 @@ void PresenterSlideSorter::ClearBackground ( const Reference<rendering::XCanvas>& rxCanvas, const awt::Rectangle& rUpdateBox) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); const awt::Rectangle aWindowBox (mxWindow->getPosSize()); mpPresenterController->GetCanvasHelper()->Paint( @@ -840,7 +840,7 @@ double PresenterSlideSorter::GetSlideAspectRatio() const } catch (RuntimeException&) { - assert(false); + OSL_ASSERT(false); } return nSlideAspectRatio; @@ -861,7 +861,7 @@ void PresenterSlideSorter::PaintPreview ( const css::awt::Rectangle& rUpdateBox, const sal_Int32 nSlideIndex) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); geometry::IntegerSize2D aSize (mpLayout->maPreviewSize); @@ -994,7 +994,7 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox) if (mpLayout->mnRowCount<=0 || mpLayout->mnColumnCount<=0) { - assert(mpLayout->mnRowCount>0 || mpLayout->mnColumnCount>0); + OSL_ASSERT(mpLayout->mnRowCount>0 || mpLayout->mnColumnCount>0); return; } @@ -1928,7 +1928,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce( const double nX, const double nY) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); if ( ! rxBitmap.is()) return; @@ -1959,7 +1959,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled( const double nWidth, const double nHeight) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); if ( ! rxBitmap.is()) return; diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index a7da7fb3d0e3..f951258cd053 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -174,8 +174,8 @@ void PresenterSpritePane::CreateCanvases ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) { - assert(!mxParentWindow.is() || mxParentWindow==rxParentWindow); - assert(!mxParentCanvas.is() || mxParentCanvas==rxParentCanvas); + OSL_ASSERT(!mxParentWindow.is() || mxParentWindow==rxParentWindow); + OSL_ASSERT(!mxParentCanvas.is() || mxParentCanvas==rxParentCanvas); mxParentWindow = rxParentWindow; mxParentCanvas = rxParentCanvas; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 2b71b407cb09..f876ea729194 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -627,7 +627,7 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary( const sal_Int32 nLocalCharacterIndex, const sal_Int32 nDistance) { - assert(nDistance==-1 || nDistance==+1); + OSL_ASSERT(nDistance==-1 || nDistance==+1); if (nLocalCharacterIndex < 0) { @@ -1207,7 +1207,7 @@ void PresenterTextParagraph::Line::ProvideCellBoxes() maCellBoxes = mxLayoutedLine->queryInkMeasures(); else { - assert(mxLayoutedLine.is()); + OSL_ASSERT(mxLayoutedLine.is()); } } } diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index ee3a09e6af3c..881aa4e12e34 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -317,7 +317,7 @@ OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const const OUString& rsStyleName, const bool bOuter) const { - assert(mpTheme.get() != nullptr); + OSL_ASSERT(mpTheme.get() != nullptr); SharedPaneStyle pPaneStyle (mpTheme->GetPaneStyle(rsStyleName)); if (pPaneStyle.get() != nullptr) @@ -725,7 +725,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont ( } catch (Exception&) { - assert(false); + OSL_ASSERT(false); } return PresenterTheme::SharedFontDescriptor(); @@ -755,7 +755,7 @@ Any ReadContext::GetByName ( const Reference<container::XNameAccess>& rxNode, const OUString& rsName) { - assert(rxNode.is()); + OSL_ASSERT(rxNode.is()); if (rxNode->hasByName(rsName)) return rxNode->getByName(rsName); else diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 96578da5e01c..de0a63e2d355 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -424,7 +424,7 @@ void SAL_CALL PresenterToolBar::disposing() ElementContainer::const_iterator iEnd (maElementContainer.end()); for ( ; iPart!=iEnd; ++iPart) { - assert(iPart->get()!=nullptr); + OSL_ASSERT(iPart->get()!=nullptr); ElementContainerPart::iterator iElement ((*iPart)->begin()); ElementContainerPart::const_iterator iPartEnd ((*iPart)->end()); for ( ; iElement!=iPartEnd; ++iElement) @@ -959,7 +959,7 @@ void PresenterToolBar::Paint ( const awt::Rectangle& rUpdateBox, const rendering::ViewState& rViewState) { - assert(mxCanvas.is()); + OSL_ASSERT(mxCanvas.is()); ElementContainer::iterator iPart; ElementContainer::const_iterator iEnd (maElementContainer.end()); @@ -1190,8 +1190,8 @@ Element::Element ( { if (mpToolBar.get() != nullptr) { - assert(mpToolBar->GetPresenterController().is()); - assert(mpToolBar->GetPresenterController()->GetWindowManager().is()); + OSL_ASSERT(mpToolBar->GetPresenterController().is()); + OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is()); } } @@ -1292,7 +1292,7 @@ bool Element::SetState ( void Element::Invalidate (const bool bSynchronous) { - assert(mpToolBar.is()); + OSL_ASSERT(mpToolBar.is()); mpToolBar->InvalidateArea(GetBoundingBox(), bSynchronous); } @@ -1318,8 +1318,8 @@ bool Element::IsFilling() const void Element::UpdateState() { - assert(mpToolBar.get() != nullptr); - assert(mpToolBar->GetPresenterController().get() != nullptr); + OSL_ASSERT(mpToolBar.get() != nullptr); + OSL_ASSERT(mpToolBar->GetPresenterController().get() != nullptr); if (mpMode.get() == nullptr) return; @@ -1430,7 +1430,7 @@ void ElementMode::ReadElementMode ( } catch(Exception&) { - assert(false); + OSL_ASSERT(false); } } @@ -1453,9 +1453,9 @@ Button::Button ( : Element(rpToolBar), mbIsListenerRegistered(false) { - assert(mpToolBar.get() != nullptr); - assert(mpToolBar->GetPresenterController().is()); - assert(mpToolBar->GetPresenterController()->GetWindowManager().is()); + OSL_ASSERT(mpToolBar.get() != nullptr); + OSL_ASSERT(mpToolBar->GetPresenterController().is()); + OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is()); } void Button::Initialize() @@ -1466,12 +1466,12 @@ void Button::Initialize() void Button::disposing() { - assert(mpToolBar.get() != nullptr); + OSL_ASSERT(mpToolBar.get() != nullptr); if (mpToolBar.get() != nullptr && mbIsListenerRegistered) { - assert(mpToolBar->GetPresenterController().is()); - assert(mpToolBar->GetPresenterController()->GetWindowManager().is()); + OSL_ASSERT(mpToolBar->GetPresenterController().is()); + OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is()); mbIsListenerRegistered = false; mpToolBar->GetPresenterController()->GetWindowManager()->RemoveLayoutListener(this); @@ -1483,7 +1483,7 @@ void Button::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); if (mpMode.get() == nullptr) return; @@ -1615,7 +1615,7 @@ awt::Size Label::CreateBoundingSize ( void Label::SetText (const OUString& rsText) { - assert(mpToolBar.get() != nullptr); + OSL_ASSERT(mpToolBar.get() != nullptr); if (mpMode.get() == nullptr) return; @@ -1635,7 +1635,7 @@ void Label::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); if (mpMode.get() == nullptr) return; @@ -1692,7 +1692,7 @@ void Text::Paint ( const awt::Point& rOffset) { (void)rOffset; - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); if (msText.isEmpty()) return; @@ -1919,7 +1919,7 @@ void VerticalSeparator::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); awt::Rectangle aBBox (GetBoundingBox()); @@ -1970,7 +1970,7 @@ void HorizontalSeparator::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) { - assert(rxCanvas.is()); + OSL_ASSERT(rxCanvas.is()); awt::Rectangle aBBox (GetBoundingBox()); diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 85a68df9edc4..e70cf2786ad8 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -164,7 +164,7 @@ void PresenterViewFactory::Register (const Reference<frame::XController>& rxCont } catch (RuntimeException&) { - assert(false); + OSL_ASSERT(false); if (mxConfigurationController.is()) mxConfigurationController->removeResourceFactoryForReference(this); mxConfigurationController = nullptr; diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 96a27c08b368..749e8a58d08a 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -166,7 +166,7 @@ void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView) { PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( mpPaneContainer->FindPaneId(rxView->getResourceId()->getAnchor())); - assert(pDescriptor.get() != nullptr); + OSL_ASSERT(pDescriptor.get() != nullptr); if (pDescriptor.get() != nullptr) { Layout(); @@ -403,7 +403,7 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode) { - assert(mpPresenterController.get() != nullptr); + OSL_ASSERT(mpPresenterController.get() != nullptr); if (meLayoutMode != eMode || mbIsSlideSorterActive @@ -611,7 +611,7 @@ void PresenterWindowManager::Layout() } catch (Exception&) { - assert(false); + OSL_ASSERT(false); throw; } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index ac5a16aa92c2..d7bc5ff8d7b9 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -296,7 +296,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert return; } - assert(nCount > 0); + OSL_ASSERT(nCount > 0); #ifdef DBG_UTIL // detect parameters that don't match to any formal argument or one of its members diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 82e68a9e4af5..f6a537ec72bb 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -535,7 +535,7 @@ void ShutdownIcon::terminateDesktop() ShutdownIcon* ShutdownIcon::getInstance() { - assert( pShutdownIcon ); + OSL_ASSERT( pShutdownIcon ); return pShutdownIcon; } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 385a6552030b..ac01c0fc6e6f 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -305,7 +305,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( bool bPrivateProtocol = ( aFileObj.GetProtocol() == INetProtocol::PrivSoffice ); bHasLocation = !aLocation.isEmpty() && !bPrivateProtocol; - assert( !bPrivateProtocol ); + OSL_ASSERT( !bPrivateProtocol ); } if ( !rType.isEmpty() ) bStoreTo = true; @@ -464,8 +464,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( aFileName.isEmpty() ) return eRet; - assert( !aFilterName.isEmpty() ); - assert( !aFileName.isEmpty() ); + OSL_ASSERT( !aFilterName.isEmpty() ); + OSL_ASSERT( !aFileName.isEmpty() ); // Creates a temporary directory to store a predefined file into it. // This makes it possible to store the file for "send document as e-mail" diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5fb7e5c78050..b2a323aa6fe7 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -341,7 +341,7 @@ SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Wi , pImpl(new SfxTemplateDialog_Impl(pBindings, this)) , mpBindings(pBindings) { - assert(mpBindings!=nullptr); + OSL_ASSERT(mpBindings!=nullptr); SetStyle(GetStyle() & ~WB_DOCKABLE); } diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 1721fd1b405e..5a37474148c5 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -302,7 +302,7 @@ sal_Int32 PlacePanels ( nPanelHeight = iItem->maLayoutSize.Preferred; break; default: - assert(false); + OSL_ASSERT(false); break; } @@ -453,7 +453,7 @@ void DistributeHeights ( if (nRemainingHeightToDistribute == 0) return; - assert(nRemainingHeightToDistribute > 0); + OSL_ASSERT(nRemainingHeightToDistribute > 0); // It is possible that not all of the height could be distributed // because of Maximum heights being smaller than expected. @@ -480,7 +480,7 @@ void DistributeHeights ( } } - assert(nRemainingHeightToDistribute==0); + OSL_ASSERT(nRemainingHeightToDistribute==0); } tools::Rectangle PlaceDeckTitle ( @@ -542,7 +542,7 @@ void SetupVerticalScrollBar( const sal_Int32 nContentHeight, const sal_Int32 nVisibleHeight) { - assert(nContentHeight > nVisibleHeight); + OSL_ASSERT(nContentHeight > nVisibleHeight); rVerticalScrollBar.SetRangeMin(0); rVerticalScrollBar.SetRangeMax(nContentHeight-1); diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 2f67fb100117..fe4d0b2aae6e 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -44,7 +44,7 @@ DeckTitleBar::DeckTitleBar (const OUString& rsTitle, , maCloserAction(rCloserAction) , mbIsCloserVisible(false) { - assert(pParentWindow != nullptr); + OSL_ASSERT(pParentWindow != nullptr); if (maCloserAction) SetCloserVisible(true); diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index e46f001f3459..fcb5e8f0ff6a 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -49,7 +49,7 @@ PanelTitleBar::PanelTitleBar(const OUString& rsTitle, mxFrame(), msMoreOptionsCommand() { - assert(mpPanel != nullptr); + OSL_ASSERT(mpPanel != nullptr); #ifdef DEBUG SetText(OUString("PanelTitleBar")); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index f3b83bda9d1c..b21be2dfbc05 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -336,7 +336,7 @@ void SidebarController::NotifyResize() { if (!mpTabBar) { - assert(mpTabBar!=nullptr); + OSL_ASSERT(mpTabBar!=nullptr); return; } diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index e350f1e52166..84a2834e5a34 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -37,8 +37,8 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi // Get the XFrame from the bindings. if (pSfxBindings==nullptr || pSfxBindings->GetDispatcher()==nullptr) { - assert(pSfxBindings!=nullptr); - assert(pSfxBindings->GetDispatcher()!=nullptr); + OSL_ASSERT(pSfxBindings!=nullptr); + OSL_ASSERT(pSfxBindings->GetDispatcher()!=nullptr); } else { diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 4e6830f8c6f6..7d4ee1419ef0 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -122,7 +122,7 @@ void TabBar::SetDecks(const ResourceManager::DeckContextDescriptorContainer& rDe std::shared_ptr<DeckDescriptor> xDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iDeck->msId); if (xDescriptor == nullptr) { - assert(xDescriptor!=nullptr); + OSL_ASSERT(xDescriptor!=nullptr); continue; } diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index db73bc21e273..2b29083f5bd9 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -61,7 +61,7 @@ Theme::~Theme() Image Theme::GetImage (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Image); + OSL_ASSERT(eType==PT_Image); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maImages[nIndex]; @@ -70,7 +70,7 @@ Image Theme::GetImage (const ThemeItem eItem) Color Theme::GetColor (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Color || eType==PT_Paint); + OSL_ASSERT(eType==PT_Color || eType==PT_Paint); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); if (eType == PT_Color) @@ -84,7 +84,7 @@ Color Theme::GetColor (const ThemeItem eItem) const Paint& Theme::GetPaint (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Paint); + OSL_ASSERT(eType==PT_Paint); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maPaints[nIndex]; @@ -98,7 +98,7 @@ const Wallpaper Theme::GetWallpaper (const ThemeItem eItem) sal_Int32 Theme::GetInteger (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Integer); + OSL_ASSERT(eType==PT_Integer); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maIntegers[nIndex]; @@ -107,7 +107,7 @@ sal_Int32 Theme::GetInteger (const ThemeItem eItem) bool Theme::GetBoolean (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Boolean); + OSL_ASSERT(eType==PT_Boolean); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maBooleans[nIndex]; @@ -337,7 +337,7 @@ void Theme::UpdateTheme() catch(beans::UnknownPropertyException& rException) { SAL_WARN("sfx", "unknown property: " << rException.Message); - assert(false); + OSL_ASSERT(false); } } @@ -884,7 +884,7 @@ sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType) return eItem - Bool_Rect_-1; default: - assert(false); + OSL_ASSERT(false); return 0; } } @@ -1049,7 +1049,7 @@ void Theme::ProcessNewValue ( break; } case PT_Invalid: - assert(eType != PT_Invalid); + OSL_ASSERT(eType != PT_Invalid); throw RuntimeException(); } } diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index e03f382bc246..22433123cd4c 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -167,7 +167,7 @@ void TitleBar::PaintFocus(vcl::RenderContext& rRenderContext, const tools::Recta IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) { (void)pToolBox; - assert(maToolBox.get()==pToolBox); + OSL_ASSERT(maToolBox.get()==pToolBox); const sal_uInt16 nItemId (maToolBox->GetHighlightItemId()); HandleToolBoxItemClick(nItemId); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 74ee50a7f3e8..5aed453f2392 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -104,7 +104,7 @@ SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true); static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { - assert( pWindow ); + OSL_ASSERT( pWindow ); if ( pWindow ) { // ->manually search topmost system window @@ -118,7 +118,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) pWindow = pWindow->GetParent(); } pWindow = pTopMostSysWin; - assert( pWindow ); + OSL_ASSERT( pWindow ); return pWindow; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index c73877ff5b57..dfb636d2e3a9 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -633,8 +633,8 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) aFileName = aFObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::NONE ); } - assert( !aFilterName.isEmpty() ); - assert( !aFileName.isEmpty() ); + OSL_ASSERT( !aFilterName.isEmpty() ); + OSL_ASSERT( !aFileName.isEmpty() ); // Creates a temporary directory to store our predefined file into it. ::utl::TempFile aTempDir( nullptr, true ); diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index aee2b31e5b66..31b6854091f3 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -78,7 +78,7 @@ namespace slideshow if( !isActive() ) return false; // no, early exit. - assert( ! mbFirstPerformCall ); + OSL_ASSERT( ! mbFirstPerformCall ); return true; } diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index d293a2ca4a79..83f72a96b457 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -119,10 +119,10 @@ bool BaseContainerNode::isChildNode( AnimationNodeSharedPtr const& pNode ) const bool BaseContainerNode::notifyDeactivatedChild( AnimationNodeSharedPtr const& pChildNode ) { - assert( pChildNode->getState() == FROZEN || + OSL_ASSERT( pChildNode->getState() == FROZEN || pChildNode->getState() == ENDED ); // early exit on invalid nodes - assert( getState() != INVALID ); + OSL_ASSERT( getState() != INVALID ); if( getState() == INVALID ) return false; @@ -132,7 +132,7 @@ bool BaseContainerNode::notifyDeactivatedChild( } std::size_t const nSize = maChildren.size(); - assert( mnFinishedChildren < nSize ); + OSL_ASSERT( mnFinishedChildren < nSize ); ++mnFinishedChildren; bool bFinished = (mnFinishedChildren >= nSize); diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 6d1ea6a1b441..7a7f63518c32 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -301,7 +301,7 @@ public: void clear() { if (meToState != INVALID) { - assert( (mpNode->meCurrentStateTransition & meToState) != 0 ); + OSL_ASSERT( (mpNode->meCurrentStateTransition & meToState) != 0 ); mpNode->meCurrentStateTransition &= ~meToState; meToState = INVALID; } @@ -432,7 +432,7 @@ bool BaseNode::resolve() if (! checkValidNode()) return false; - assert( meCurrState != RESOLVED ); + OSL_ASSERT( meCurrState != RESOLVED ); if (inStateOrTransition( RESOLVED )) return true; @@ -495,7 +495,7 @@ void BaseNode::activate() if (! checkValidNode()) return; - assert( meCurrState != ACTIVE ); + OSL_ASSERT( meCurrState != ACTIVE ); if (inStateOrTransition( ACTIVE )) return; @@ -551,7 +551,7 @@ void BaseNode::deactivate() if (inStateOrTransition( ENDED | FROZEN ) || !checkValidNode()) return; - if (isTransition( meCurrState, FROZEN, false /* no assert */ )) { + if (isTransition( meCurrState, FROZEN, false /* no OSL_ASSERT */ )) { // do transition to FROZEN: StateTransition st(this); if (st.enter( FROZEN, StateTransition::FORCE )) { @@ -612,7 +612,7 @@ void BaseNode::end() void BaseNode::notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ) { (void) rNotifier; // avoid warning - assert( rNotifier->getState() == FROZEN || + OSL_ASSERT( rNotifier->getState() == FROZEN || rNotifier->getState() == ENDED ); // TODO(F1): for end sync functionality, this might indeed be used some day } diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index aec8432e1a0b..68bda1a56999 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -113,9 +113,9 @@ void SequentialTimeContainer::notifyDeactivating( if (notifyDeactivatedChild( rNotifier )) return; - assert( mnFinishedChildren < maChildren.size() ); + OSL_ASSERT( mnFinishedChildren < maChildren.size() ); AnimationNodeSharedPtr const& pNextChild = maChildren[mnFinishedChildren]; - assert( pNextChild->getState() == UNRESOLVED ); + OSL_ASSERT( pNextChild->getState() == UNRESOLVED ); if (! resolveChild( pNextChild )) { // could not resolve child - since we risk to diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx index 131630488288..78dd0350d4ba 100644 --- a/slideshow/source/engine/delayevent.cxx +++ b/slideshow/source/engine/delayevent.cxx @@ -26,7 +26,7 @@ namespace internal { bool Delay::fire() { - assert( isCharged() ); + OSL_ASSERT( isCharged() ); if (isCharged()) { mbWasFired = true; maFunc(); diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index a318d9c2d9b7..96ba0e048281 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -164,7 +164,7 @@ bool EffectRewinder::rewind ( // Do not allow nested rewinds. if (mpAsynchronousRewindEvent) { - assert( ! mpAsynchronousRewindEvent); + OSL_ASSERT( ! mpAsynchronousRewindEvent); return false; } @@ -177,7 +177,7 @@ bool EffectRewinder::rewind ( { if ( ! rPreviousSlideFunctor) { - assert(rPreviousSlideFunctor); + OSL_ASSERT(rPreviousSlideFunctor); return false; } @@ -216,7 +216,7 @@ void EffectRewinder::skipAllMainSequenceEffects() // Do not allow nested rewinds. if (mpAsynchronousRewindEvent) { - assert(!mpAsynchronousRewindEvent); + OSL_ASSERT(!mpAsynchronousRewindEvent); return; } @@ -330,7 +330,7 @@ void EffectRewinder::asynchronousRewind ( const bool bRedisplayCurrentSlide, const std::function<void ()>& rSlideRewindFunctor) { - assert(mpAsynchronousRewindEvent); + OSL_ASSERT(mpAsynchronousRewindEvent); if (bRedisplayCurrentSlide) { @@ -372,7 +372,7 @@ void EffectRewinder::asynchronousRewind ( void EffectRewinder::asynchronousRewindToPreviousSlide ( const ::std::function<void ()>& rSlideRewindFunctor) { - assert(mpAsynchronousRewindEvent); + OSL_ASSERT(mpAsynchronousRewindEvent); mpAsynchronousRewindEvent.reset(); rSlideRewindFunctor(); diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index ffe37a16d266..c707af32e91e 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -411,7 +411,7 @@ void EventMultiplexerImpl::forEachView( XSlideShowViewFunc pViewMethod ) } else { - assert(xView.is()); + OSL_ASSERT(xView.is()); } } } diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 6f53bbd7e272..2b50addcd71c 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -155,7 +155,7 @@ void PointerSymbol::viewChanged( const UnoViewSharedPtr& rView ) ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); - assert( aModifiedEntry != maViews.end() ); + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index c3945fe8b0b3..861edc70144e 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -371,7 +371,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView ) { return rView == cp.first; } ) ); - assert( aModifiedEntry != maViews.end() ); + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; @@ -467,7 +467,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) cppcanvas::VCLFactory::createRenderer( canvas, metaFile, cppcanvas::Renderer::Parameters() ) ); const bool succ = renderer->draw(); - assert( succ ); + OSL_ASSERT( succ ); (void)succ; } diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index 5616f8e1ac4c..597da9daf600 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -198,12 +198,12 @@ namespace internal void ScreenUpdater::lockUpdates() { ++mpImpl->mnLockCount; - assert(mpImpl->mnLockCount>0); + OSL_ASSERT(mpImpl->mnLockCount>0); } void ScreenUpdater::unlockUpdates() { - assert(mpImpl->mnLockCount>0); + OSL_ASSERT(mpImpl->mnLockCount>0); if (mpImpl->mnLockCount > 0) { --mpImpl->mnLockCount; diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 7fdbc2f3a8fb..d4941f8300cf 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -581,7 +581,7 @@ sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime) void ActivityImpl::updateShapeAttributes( double fTime, basegfx::B2DRectangle const& parentBounds ) { - assert( meAnimKind != drawing::TextAnimationKind_NONE ); + OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); if( meAnimKind == drawing::TextAnimationKind_NONE ) return; @@ -780,7 +780,7 @@ ActivityImpl::ActivityImpl( uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW ); getPropertyValue( meAnimKind, xProps, "TextAnimationKind" ); - assert( meAnimKind != drawing::TextAnimationKind_NONE ); + OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE); mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE); diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index dfb7b89b892d..98f1cae40ac7 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -525,7 +525,7 @@ namespace slideshow if( pShape->hasIntrinsicAnimation() ) { - assert( pShape->maAnimationFrames.empty() ); + OSL_ASSERT( pShape->maAnimationFrames.empty() ); if( pShape->getNumberOfTreeNodes( DocTreeNode::NodeType::LogicalParagraph) > 0 ) { @@ -557,7 +557,7 @@ namespace slideshow if( pShape->hasIntrinsicAnimation() ) { - assert( !pShape->maAnimationFrames.empty() ); + OSL_ASSERT( !pShape->maAnimationFrames.empty() ); std::vector<double> aTimeout; std::transform( @@ -900,7 +900,7 @@ namespace slideshow maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } - assert( maHyperlinkIndices.size() == maHyperlinkRegions.size()); + OSL_ASSERT( maHyperlinkIndices.size() == maHyperlinkRegions.size()); } bool DrawShape::hasHyperlinks() const @@ -910,7 +910,7 @@ namespace slideshow HyperlinkArea::HyperlinkRegions DrawShape::getHyperlinkRegions() const { - assert( !maViewShapes.empty() ); + OSL_ASSERT( !maViewShapes.empty() ); if( !isVisible() ) return HyperlinkArea::HyperlinkRegions(); @@ -934,7 +934,7 @@ namespace slideshow pViewShape->getRenderer( pCanvas, mpCurrMtf, mpAttributeLayer ) ); - assert( pRenderer ); + OSL_ASSERT( pRenderer ); if (pRenderer) { diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 5229d1190d69..0aa3352192a8 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -56,7 +56,7 @@ namespace slideshow ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView ) { - assert( rNewView ); + OSL_ASSERT( rNewView ); ViewEntryVector::iterator aIter; const ViewEntryVector::iterator aEnd( maViewEntries.end() ); @@ -87,7 +87,7 @@ namespace slideshow ViewLayerSharedPtr Layer::removeView( const ViewSharedPtr& rView ) { - assert( rView ); + OSL_ASSERT( rView ); ViewEntryVector::iterator aIter; const ViewEntryVector::iterator aEnd( maViewEntries.end() ); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 0ccbb62e5562..e3c024398f6f 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -134,13 +134,13 @@ namespace slideshow mbActive = false; // only background layer left - assert( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() ); + OSL_ASSERT( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() ); } void LayerManager::viewAdded( const UnoViewSharedPtr& rView ) { // view must be member of mrViews container - assert( std::find(mrViews.begin(), + OSL_ASSERT( std::find(mrViews.begin(), mrViews.end(), rView) != mrViews.end() ); @@ -164,7 +164,7 @@ namespace slideshow void LayerManager::viewRemoved( const UnoViewSharedPtr& rView ) { // view must not be member of mrViews container anymore - assert( std::find(mrViews.begin(), + OSL_ASSERT( std::find(mrViews.begin(), mrViews.end(), rView) == mrViews.end() ); @@ -186,7 +186,7 @@ namespace slideshow (void)rView; // view must be member of mrViews container - assert( std::find(mrViews.begin(), + OSL_ASSERT( std::find(mrViews.begin(), mrViews.end(), rView) != mrViews.end() ); @@ -212,7 +212,7 @@ namespace slideshow void LayerManager::addShape( const ShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::addShape(): invalid Shape" ); // add shape to XShape hash map @@ -237,12 +237,12 @@ namespace slideshow void LayerManager::implAddShape( const ShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::implAddShape(): invalid Shape" ); LayerShapeMap::value_type aValue (rShape, LayerWeakPtr()); - assert( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already + OSL_ASSERT( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already mbLayerAssociationDirty = true; if( mbDisableAnimationZOrder ) @@ -258,7 +258,7 @@ namespace slideshow void LayerManager::implRemoveShape( const ShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::implRemoveShape(): invalid Shape" ); const LayerShapeMap::iterator aShapeEntry( maAllShapes.find(rShape) ); @@ -307,7 +307,7 @@ namespace slideshow AttributableShapeSharedPtr LayerManager::getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, const DocTreeNode& rTreeNode ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer AttributableShapeSharedPtr pSubset; @@ -338,11 +338,11 @@ namespace slideshow void LayerManager::revokeSubset( const AttributableShapeSharedPtr& rOrigShape, const AttributableShapeSharedPtr& rSubsetShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer if( rOrigShape->revokeSubset( rSubsetShape ) ) { - assert( maAllShapes.find(rSubsetShape) != maAllShapes.end() ); + OSL_ASSERT( maAllShapes.find(rSubsetShape) != maAllShapes.end() ); implRemoveShape( rSubsetShape ); @@ -355,7 +355,7 @@ namespace slideshow void LayerManager::enterAnimationMode( const AnimatableShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::enterAnimationMode(): invalid Shape" ); const bool bPrevAnimState( rShape->isBackgroundDetached() ); @@ -638,7 +638,7 @@ namespace slideshow void LayerManager::addUpdateArea( ShapeSharedPtr const& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::addUpdateArea(): invalid Shape" ); const LayerShapeMap::const_iterator aShapeEntry( maAllShapes.find(rShape) ); @@ -682,7 +682,7 @@ namespace slideshow LayerSharedPtr LayerManager::createForegroundLayer() const { - assert( mbActive ); + OSL_ASSERT( mbActive ); LayerSharedPtr pLayer( Layer::createLayer() ); @@ -696,8 +696,8 @@ namespace slideshow void LayerManager::updateShapeLayers( bool bBackgroundLayerPainted ) { - assert( !maLayers.empty() ); // always at least background layer - assert( mbActive ); + OSL_ASSERT( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( mbActive ); // do we need to process shapes? if( !mbLayerAssociationDirty ) @@ -762,7 +762,7 @@ namespace slideshow } } - assert( maLayers.size() == aWeakLayers.size() ); + OSL_ASSERT( maLayers.size() == aWeakLayers.size() ); // note: using indices here, since vector::insert // above invalidates iterators diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 571725304e4b..8e8023e0146f 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -923,7 +923,7 @@ SlideSharedPtr SlideShowImpl::makeSlide( void SlideShowImpl::requestWaitSymbol() { ++mnWaitSymbolRequestCount; - assert(mnWaitSymbolRequestCount>0); + OSL_ASSERT(mnWaitSymbolRequestCount>0); if (mnWaitSymbolRequestCount == 1) { @@ -940,7 +940,7 @@ void SlideShowImpl::requestWaitSymbol() void SlideShowImpl::releaseWaitSymbol() { --mnWaitSymbolRequestCount; - assert(mnWaitSymbolRequestCount>=0); + OSL_ASSERT(mnWaitSymbolRequestCount>=0); if (mnWaitSymbolRequestCount == 0) { @@ -1099,7 +1099,7 @@ void SlideShowImpl::displaySlide( else mpCurrentSlide = makeSlide( xSlide, xDrawPages, xRootNode ); - assert( mpCurrentSlide ); + OSL_ASSERT( mpCurrentSlide ); if (mpCurrentSlide) { basegfx::B2DSize oldSlideSize; @@ -2279,7 +2279,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) // save time at current drawpage: uno::Reference<beans::XPropertySet> xPropSet( mpCurrentSlide->getXDrawPage(), uno::UNO_QUERY ); - assert( xPropSet.is() ); + OSL_ASSERT( xPropSet.is() ); if (xPropSet.is()) { xPropSet->setPropertyValue( diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 9620ab7b4c08..4d13d8b1d05f 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -1021,7 +1021,7 @@ void SlideView::disposing( lang::EventObject const& evt ) if (mxView.is()) { - assert( evt.Source == mxView ); + OSL_ASSERT( evt.Source == mxView ); mxView.clear(); } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 1f10a158c2f7..cdc1d22134c8 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -308,7 +308,7 @@ bool SlideChangeBase::operator()( double nValue ) // between different canvases! // render the content - assert( getLeavingBitmap( rViewEntry ) ); + OSL_ASSERT( getLeavingBitmap( rViewEntry ) ); if( getLeavingBitmap( rViewEntry ) ) getLeavingBitmap( rViewEntry )->draw( pOutContentCanvas ); } @@ -430,7 +430,7 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView ) [rView]( const ViewEntry& rViewEntry ) { return rView == rViewEntry.getView(); } ) ); - assert( aModifiedEntry != maViewData.end() ); + OSL_ASSERT( aModifiedEntry != maViewData.end() ); if( aModifiedEntry == maViewData.end() ) return; diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index c38623780081..99b34d5d3af6 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -196,7 +196,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon res; if (m_diagonal) { - assert( m_opposite ); + OSL_ASSERT( m_opposite ); ::basegfx::B2DPolyPolygon half( calcHalfDiagonalSnake( t, false /* out */ ) ); // flip on x axis and rotate 90 degrees: diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index eea386f32284..e278d609c464 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -159,7 +159,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView ) ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); - assert( aModifiedEntry != maViews.end() ); + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index a097dd282a18..4db733bb0cd2 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -71,7 +71,7 @@ class Listener: public cppu::WeakImplHelper< css::frame::XDispatchResultListener > { public: - explicit Listener(Result * result): result_(result) { assert(result != nullptr); } + explicit Listener(Result * result): result_(result) { OSL_ASSERT(result != nullptr); } private: virtual void SAL_CALL disposing(css::lang::EventObject const &) override {} @@ -100,7 +100,7 @@ public: listener): dispatch_(dispatch), url_(url), arguments_(arguments), listener_(listener) - { assert(dispatch.is()); } + { OSL_ASSERT(dispatch.is()); } private: virtual void SAL_CALL notify(css::uno::Any const &) override diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index 95418f3df931..cf32d067f364 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -161,7 +161,7 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int nLevel) { case TDIVIDEBY: case TACUTE: - assert(false); + OSL_ASSERT(false); SAL_FALLTHROUGH; // the above are handled elsewhere, e.g. when handling BINHOR default: HandleText(pNode, nLevel); diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 203128099d2c..434776be2abf 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -242,7 +242,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName ) if (aRet.getValueTypeClass() == TypeClass_INTERFACE) { // type retrieved from tdmgr - assert( (*o3tl::forceAccess<Reference<XInterface>>(aRet))->queryInterface( + OSL_ASSERT( (*o3tl::forceAccess<Reference<XInterface>>(aRet))->queryInterface( cppu::UnoType<XTypeDescription>::get()).hasValue() ); css::uno::Reference< css::reflection::XConstantTypeDescription > diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 7428221c97cb..d5a3a2192d60 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -139,7 +139,7 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass() { OUString aName(getAttributeTypeDescr()->aBase.aBase.pTypeName); sal_Int32 i = aName.indexOf(':'); - assert(i >= 0); + OSL_ASSERT(i >= 0); _xDeclClass = getReflection()->forName(aName.copy(0, i)); } } @@ -412,7 +412,7 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass() { OUString aName(getMethodTypeDescr()->aBase.aBase.pTypeName); sal_Int32 i = aName.indexOf(':'); - assert(i >= 0); + OSL_ASSERT(i >= 0); _xDeclClass = getReflection()->forName(aName.copy(0, i)); } } @@ -755,7 +755,7 @@ Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses() for (sal_Int32 i = 0; i < pType->nBaseTypes; ++i) { _xSuperClasses[i] = getReflection()->forType( &pType->ppBaseTypes[i]->aBase); - assert(_xSuperClasses[i].is()); + OSL_ASSERT(_xSuperClasses[i].is()); } } return Sequence< Reference< XIdlClass > >(_xSuperClasses); diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 2ecd6743ae74..d32de8ff99d6 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1721,7 +1721,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRe rSMgr->createInstanceWithContext( spool().com_sun_star_registry_SimpleRegistry, xCtx ), UNO_QUERY); - assert( xReg.is() ); + OSL_ASSERT( xReg.is() ); return xReg; } diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx index cffd43171bc7..df24ca697ec2 100644 --- a/stoc/source/implementationregistration/mergekeys.cxx +++ b/stoc/source/implementationregistration/mergekeys.cxx @@ -89,7 +89,7 @@ static void mergeKeys( xDest->setStringListValue( xSource->getStringListValue() ); break; default: - assert(false); + OSL_ASSERT(false); break; } diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index d15e2951cf7c..b7b3620a5d61 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -191,10 +191,10 @@ inline void AdapterImpl::release() { t_ptr_map::iterator iFind( m_pFactory->m_receiver2adapters.find( m_key ) ); - assert( m_pFactory->m_receiver2adapters.end() != iFind ); + OSL_ASSERT( m_pFactory->m_receiver2adapters.end() != iFind ); t_ptr_set & adapter_set = iFind->second; if (adapter_set.erase( this ) != 1) { - assert( false ); + OSL_ASSERT( false ); } if (adapter_set.empty()) { @@ -260,7 +260,7 @@ bool AdapterImpl::coerce_assign( if (p_exc) // exception occurred { - assert( + OSL_ASSERT( p_exc->pType->eTypeClass == typelib_TypeClass_EXCEPTION ); if (typelib_typedescriptionreference_isAssignableFrom( cppu::UnoType<RuntimeException>::get().getTypeLibType(), p_exc->pType )) @@ -648,7 +648,7 @@ AdapterImpl::AdapterImpl( pInterface->m_pTypeDescr = nullptr; pTypes[nPos].getDescription( reinterpret_cast<typelib_TypeDescription **>(&pInterface->m_pTypeDescr) ); - assert( pInterface->m_pTypeDescr ); + OSL_ASSERT( pInterface->m_pTypeDescr ); if (! pInterface->m_pTypeDescr) { for ( sal_Int32 n = 0; n < nPos; ++n ) @@ -665,7 +665,7 @@ AdapterImpl::AdapterImpl( // map receiver m_pReceiver = static_cast<uno_Interface *>(m_pFactory->m_aCpp2Uno.mapInterface( xReceiver.get(), cppu::UnoType<decltype(xReceiver)>::get() )); - assert( nullptr != m_pReceiver ); + OSL_ASSERT( nullptr != m_pReceiver ); if (! m_pReceiver) { throw RuntimeException( "cannot map receiver!" ); @@ -699,7 +699,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) UNO_QUERY_THROW ); m_pConverter = static_cast<uno_Interface *>(m_aCpp2Uno.mapInterface( xConverter.get(), cppu::UnoType<decltype(xConverter)>::get() )); - assert( nullptr != m_pConverter ); + OSL_ASSERT( nullptr != m_pConverter ); // some type info: // sequence< any > @@ -851,7 +851,7 @@ Reference< XInterface > FactoryImpl::createAdapter( m_aUno2Cpp.mapInterface( reinterpret_cast<void **>(&xRet), pUnoI, cppu::UnoType<decltype(xRet)>::get() ); that->release(); - assert( xRet.is() ); + OSL_ASSERT( xRet.is() ); if (! xRet.is()) { throw RuntimeException( "mapping UNO to C++ failed!" ); diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index a46e9c858ac4..a4e9efe66e59 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -573,7 +573,7 @@ public: ~DetachCurrentThread() { if (m_jvm->DetachCurrentThread() != 0) { - assert(false); + OSL_ASSERT(false); } } @@ -823,7 +823,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) case JFW_E_RUNNING_JVM: { //This service should make sure that we do not start java twice. - assert(false); + OSL_ASSERT(false); break; } case JFW_E_NEED_RESTART: @@ -884,12 +884,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm)); case RETURN_VIRTUALMACHINE: - assert(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *)); + OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *)); return css::uno::makeAny( reinterpret_cast< sal_Int64 >( m_xUnoVirtualMachine->getVirtualMachine().get())); case RETURN_UNOVIRTUALMACHINE: - assert(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *)); + OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *)); return css::uno::makeAny( reinterpret_cast< sal_Int64 >(m_xUnoVirtualMachine.get())); } diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index da3eb0b65c67..ea3c7479c21d 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -152,7 +152,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface( m_uno2cpp.get() ); uno_any_destruct( exc, nullptr ); ::cppu::throwException( cpp_exc ); - assert( false ); // way of no return + OSL_ASSERT( false ); // way of no return return UnoInterfaceReference(); // for dummy } } @@ -197,7 +197,7 @@ static void SAL_CALL binuno_proxy_free( (void) pEnv; // avoid warning about unused parameter binuno_Proxy * proxy = static_cast< binuno_Proxy * >( static_cast< uno_Interface * >( pProxy ) ); - assert( proxy->m_root->m_factory->m_uno_env.get()->pExtEnv == pEnv ); + OSL_ASSERT( proxy->m_root->m_factory->m_uno_env.get()->pExtEnv == pEnv ); delete proxy; } @@ -210,13 +210,13 @@ static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI ) // rebirth of zombie uno_ExtEnvironment * uno_env = that->m_root->m_factory->m_uno_env.get()->pExtEnv; - assert( uno_env != nullptr ); + OSL_ASSERT( uno_env != nullptr ); (*uno_env->registerProxyInterface)( uno_env, reinterpret_cast< void ** >( &pUnoI ), binuno_proxy_free, that->m_oid.pData, reinterpret_cast< typelib_InterfaceTypeDescription * >( that->m_typeDescr.get() ) ); - assert( that == static_cast< binuno_Proxy * >( pUnoI ) ); + OSL_ASSERT( that == static_cast< binuno_Proxy * >( pUnoI ) ); } } @@ -228,7 +228,7 @@ static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI ) { uno_ExtEnvironment * uno_env = that->m_root->m_factory->m_uno_env.get()->pExtEnv; - assert( uno_env != nullptr ); + OSL_ASSERT( uno_env != nullptr ); (*uno_env->revokeInterface)( uno_env, pUnoI ); } } @@ -319,14 +319,14 @@ Any ProxyRoot::queryAggregation( Type const & rType ) { Reference< XInterface > xProxy; uno_ExtEnvironment * cpp_env = m_factory->m_cpp_env.get()->pExtEnv; - assert( cpp_env != nullptr ); + OSL_ASSERT( cpp_env != nullptr ); // mind a new delegator, calculate current root: Reference< XInterface > xRoot( static_cast< OWeakObject * >(this), UNO_QUERY_THROW ); OUString oid; (*cpp_env->getObjectIdentifier)( cpp_env, &oid.pData, xRoot.get() ); - assert( !oid.isEmpty() ); + OSL_ASSERT( !oid.isEmpty() ); (*cpp_env->getRegisteredInterface)( cpp_env, reinterpret_cast< void ** >( &xProxy ), @@ -353,7 +353,7 @@ Any ProxyRoot::queryAggregation( Type const & rType ) SAL_NO_ACQUIRE ); uno_ExtEnvironment * uno_env = m_factory->m_uno_env.get()->pExtEnv; - assert( uno_env != nullptr ); + OSL_ASSERT( uno_env != nullptr ); (*uno_env->registerProxyInterface)( uno_env, reinterpret_cast< void ** >( &proxy.m_pUnoI ), binuno_proxy_free, oid.pData, diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 4d173df5df02..6772d2ba2a8a 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -494,7 +494,7 @@ void AccessController::checkAndClearPostPoned() // check postponed permissions std::unique_ptr< t_rec_vec > rec( static_cast< t_rec_vec * >( m_rec.getData() ) ); m_rec.setData( nullptr ); // takeover ownership - assert( rec.get() ); + OSL_ASSERT( rec.get() ); if (rec.get()) { t_rec_vec const & vec = *rec.get(); @@ -502,20 +502,20 @@ void AccessController::checkAndClearPostPoned() { case SINGLE_USER: { - assert( m_singleUser_init ); + OSL_ASSERT( m_singleUser_init ); for (const auto & p : vec) { - assert( m_singleUserId.equals( p.first ) ); + OSL_ASSERT( m_singleUserId.equals( p.first ) ); m_singleUserPermissions.checkPermission( p.second ); } break; } case SINGLE_DEFAULT_USER: { - assert( m_defaultPerm_init ); + OSL_ASSERT( m_defaultPerm_init ); for (const auto & p : vec) { - assert( p.first.isEmpty() ); // default-user + OSL_ASSERT( p.first.isEmpty() ); // default-user m_defaultPermissions.checkPermission( p.second ); } break; @@ -530,7 +530,7 @@ void AccessController::checkAndClearPostPoned() MutexGuard guard( m_mutex ); pPermissions = m_user2permissions.lookup( p.first ); } - assert( pPermissions ); + OSL_ASSERT( pPermissions ); if (pPermissions) { pPermissions->checkPermission( p.second ); diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 948260fb119f..31bdcdbcc7c1 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -351,7 +351,7 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac ) PolicyReader::~PolicyReader() { if ( ::osl_closeFile( m_file ) != osl_File_E_None ) { - assert(false); + OSL_ASSERT( false ); } } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index d580e1461052..eb5685a29b76 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -671,7 +671,7 @@ void OServiceManager::disposing() m_xContext.clear(); // not only the Event should hold the object - assert( m_refCount != 1 ); + OSL_ASSERT( m_refCount != 1 ); } // XPropertySet @@ -806,7 +806,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( check_undisposed(); #if OSL_DEBUG_LEVEL > 0 Reference< beans::XPropertySet > xProps( xContext->getServiceManager(), UNO_QUERY ); - assert( xProps.is() ); + OSL_ASSERT( xProps.is() ); if (xProps.is()) { Reference< XComponentContext > xDefContext; @@ -860,7 +860,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( check_undisposed(); #if OSL_DEBUG_LEVEL > 0 Reference< beans::XPropertySet > xProps( xContext->getServiceManager(), UNO_QUERY ); - assert( xProps.is() ); + OSL_ASSERT( xProps.is() ); if (xProps.is()) { Reference< XComponentContext > xDefContext; diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index 20f4c4ffb6b9..2baa1f3b9b20 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -42,11 +42,11 @@ UriReference::UriReference( m_hasQuery(bHasQuery), m_hasFragment(false) { - assert(!scheme.isEmpty() || bIsHierarchical); - assert(!bHasAuthority || bIsHierarchical); - assert(authority.isEmpty() || bHasAuthority); - assert(!bHasQuery || bIsHierarchical); - assert(query.isEmpty() || bHasQuery); + OSL_ASSERT(!scheme.isEmpty() || bIsHierarchical); + OSL_ASSERT(!bHasAuthority || bIsHierarchical); + OSL_ASSERT(authority.isEmpty() || bHasAuthority); + OSL_ASSERT(!bHasQuery || bIsHierarchical); + OSL_ASSERT(query.isEmpty() || bHasQuery); } UriReference::~UriReference() {} diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index 231c31816df1..d246f07c9221 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -130,7 +130,7 @@ private: OUString UrlReference::expand( css::uno::Reference< css::util::XMacroExpander > const & expander) { - assert(expander.is()); + OSL_ASSERT(expander.is()); return expander->expandMacros( ::rtl::Uri::decode( getPath(), ::rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8)); diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index 757bbf719533..dc7fbf0015ff 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -91,7 +91,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::createVndSunStarPkgUrlReference( css::uno::Reference< css::uri::XUriReference > const & authority) { - assert(authority.is()); + OSL_ASSERT(authority.is()); if (authority->isAbsolute() && !authority->hasFragment()) { OUStringBuffer buf; buf.append("vnd.sun.star.pkg://"); @@ -102,7 +102,7 @@ Factory::createVndSunStarPkgUrlReference( css::uno::Reference< css::uri::XUriReference > uriRef( css::uri::UriReferenceFactory::create(m_context)->parse( buf.makeStringAndClear())); - assert(uriRef.is()); + OSL_ASSERT(uriRef.is()); return uriRef; } else { return css::uno::Reference< css::uri::XUriReference >(); diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index e09c8297ceae..e466904b4314 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -130,7 +130,7 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) // test: add cmd line rdbs to manager - assert( arguments.getLength() > 0 ); + OSL_ASSERT( arguments.getLength() > 0 ); css::uno::Reference<css::container::XSet> xSet( manager, css::uno::UNO_QUERY_THROW ); for ( sal_Int32 argPos = 0; argPos < arguments.getLength(); ++argPos ) { diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index bbca4088d856..1e9aae16ed42 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -642,13 +642,13 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) aRet = xConverter->convertTo( aRet, cppu::UnoType<XServiceInfo>::get()); aRet <<= SAL_CONST_INT64(0x7fffffffffffffff); aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_uInt64>::get()); - assert( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0x7fffffffffffffff) ); + OSL_ASSERT( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0x7fffffffffffffff) ); aRet <<= SAL_CONST_UINT64(0xffffffffffffffff); aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_uInt64>::get()); - assert( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0xffffffffffffffff) ); + OSL_ASSERT( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0xffffffffffffffff) ); aRet <<= SAL_CONST_INT64(-1); aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_Int8>::get()); - assert( *(const sal_Int8 *)aRet.getValue() == (-1) ); + OSL_ASSERT( *(const sal_Int8 *)aRet.getValue() == (-1) ); printf( "test_Conversion(): end.\n" ); } diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index df6542407d38..3b2a02cccd8a 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -348,11 +348,11 @@ SAL_IMPLEMENT_MAIN() OUString( "stoctest.rdb" ) ) ); Reference< XComponentContext > xContext; Reference< beans::XPropertySet > xProps( xMgr, UNO_QUERY ); - assert( xProps.is() ); + OSL_ASSERT( xProps.is() ); xProps->getPropertyValue( OUString( "DefaultContext" ) ) >>= xContext; - assert( xContext.is() ); + OSL_ASSERT( xContext.is() ); Reference< XIdlReflection > xRefl; xContext->getValueByName( diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index df947c5b5124..a335939b9659 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -309,8 +309,8 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName, Any aRet; - assert( rOutParam.getLength() == 0 ); - assert( rOutParamIndex.getLength() == 0 ); + OSL_ASSERT( rOutParam.getLength() == 0 ); + OSL_ASSERT( rOutParamIndex.getLength() == 0 ); try { @@ -334,7 +334,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName, if ( rFunctionName == "setValues" ) { - assert( rParams.getLength() == 17 ); + OSL_ASSERT( rParams.getLength() == 17 ); aBool = *(sal_Bool *)rParams[0].getValue(); aChar = *(sal_Unicode *)rParams[1].getValue(); rParams[2] >>= nByte; @@ -781,7 +781,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double, aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 ); - assert( equals( aData, aRet ) && equals( aData, aRet2 ) ); + OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) ); // set last retrieved values test::TestData aSV2ret = xLBT->setValues2( @@ -789,7 +789,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double, aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 ); - assert( equals( aData, aSV2ret ) && equals( aData, aRet2 ) ); + OSL_ASSERT( equals( aData, aSV2ret ) && equals( aData, aRet2 ) ); } { test::TestData aRet, aRet2; @@ -798,7 +798,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double, aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 ); - assert( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) ); + OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) ); // set last retrieved values xLBT->setBool( aRet.Bool ); diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 7579dce79631..ebc878696316 100644 --- a/stoc/test/testproxyfac.cxx +++ b/stoc/test/testproxyfac.cxx @@ -172,7 +172,7 @@ static void test_proxyfac_( (void)test; Reference< lang::XServiceInfo > xMaster_XServiceInfo( xMaster, UNO_QUERY_THROW ); - assert( xMaster_XServiceInfo->getImplementationName().equals( test ) ); + OSL_ASSERT( xMaster_XServiceInfo->getImplementationName().equals( test ) ); Reference< reflection::XProxyFactory > xTarget( xMaster, UNO_QUERY_THROW ); Reference< XCurrentContext > xTarget_XCurrentContext( @@ -180,34 +180,34 @@ static void test_proxyfac_( Reference< XCurrentContext > xMaster_XCurrentContext( xMaster, UNO_QUERY_THROW ); - assert( + OSL_ASSERT( xTarget_XCurrentContext->getValueByName( test ) == makeAny( test ) ); - assert( + OSL_ASSERT( xMaster_XCurrentContext->getValueByName( test ) == makeAny( test ) ); Reference< XAggregation > xFakeAgg( xTarget->createProxy( xTarget ) ); if (xFakeAgg.is()) { - assert( xTarget == xFakeAgg ); - assert( xMaster == xFakeAgg ); + OSL_ASSERT( xTarget == xFakeAgg ); + OSL_ASSERT( xMaster == xFakeAgg ); } Reference< lang::XServiceInfo > xTarget_XServiceInfo( xTarget, UNO_QUERY_THROW ); - assert( xTarget_XServiceInfo->getImplementationName().equals( test ) ); + OSL_ASSERT( xTarget_XServiceInfo->getImplementationName().equals( test ) ); Reference< lang::XServiceInfo > xTarget_XServiceInfo2( xTarget, UNO_QUERY_THROW ); - assert( xTarget_XServiceInfo2.get() == xTarget_XServiceInfo.get() ); + OSL_ASSERT( xTarget_XServiceInfo2.get() == xTarget_XServiceInfo.get() ); - assert( xTarget == xTarget_XCurrentContext ); - assert( xTarget_XCurrentContext == xMaster ); - assert( + OSL_ASSERT( xTarget == xTarget_XCurrentContext ); + OSL_ASSERT( xTarget_XCurrentContext == xMaster ); + OSL_ASSERT( xTarget_XCurrentContext.get() == xMaster_XCurrentContext.get() ); - assert( xTarget_XCurrentContext == xMaster ); - assert( xTarget == xMaster ); - assert( xTarget_XServiceInfo.get() == xMaster_XServiceInfo.get() ); - assert( xTarget_XServiceInfo == xMaster ); - assert( xMaster_XServiceInfo == xMaster ); + OSL_ASSERT( xTarget_XCurrentContext == xMaster ); + OSL_ASSERT( xTarget == xMaster ); + OSL_ASSERT( xTarget_XServiceInfo.get() == xMaster_XServiceInfo.get() ); + OSL_ASSERT( xTarget_XServiceInfo == xMaster ); + OSL_ASSERT( xMaster_XServiceInfo == xMaster ); try { diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index dfeeff42189e..b2dd4dd7051e 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -55,36 +55,33 @@ using namespace osl; namespace stoc_impreg { void SAL_CALL mergeKeys( - Reference< registry::XRegistryKey > const & xDest, - Reference< registry::XRegistryKey > const & xSource ); +Reference< registry::XRegistryKey > const & xDest, +Reference< registry::XRegistryKey > const & xSource ); } - static void mergeKeys( - Reference< registry::XSimpleRegistry > const & xDest, - OUString const & rBaseNode, - OUString const & rURL ) +Reference< registry::XSimpleRegistry > const & xDest, +OUString const & rBaseNode, +OUString const & rURL ) { - Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() ); - Reference< registry::XRegistryKey > xDestKey; - - if (rBaseNode.getLength()) - { - xDestKey = xDestRoot->createKey( rBaseNode ); - xDestRoot->closeKey(); - } - else - { - xDestKey = xDestRoot; - } - - Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() ); - xSimReg->open( rURL, sal_True, sal_False ); - assert( xSimReg->isValid() ); - Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() ); - ::stoc_impreg::mergeKeys( xDestKey, xSourceKey ); - xSourceKey->closeKey(); - xSimReg->close(); - xDestKey->closeKey(); +Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() ); +Reference< registry::XRegistryKey > xDestKey; +if (rBaseNode.getLength()) +{ +xDestKey = xDestRoot->createKey( rBaseNode ); +xDestRoot->closeKey(); +} +else +{ +xDestKey = xDestRoot; +} +Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() ); +xSimReg->open( rURL, sal_True, sal_False ); +OSL_ASSERT( xSimReg->isValid() ); +Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() ); +::stoc_impreg::mergeKeys( xDestKey, xSourceKey ); +xSourceKey->closeKey(); +xSimReg->close(); +xDestKey->closeKey(); } @@ -92,34 +89,33 @@ OString userRegEnv("STAR_USER_REGISTRY="); OUString getExePath() { - OUString exe; - OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None); +OUString exe; +OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None); #if defined(_WIN32) - exe = exe.copy(0, exe.getLength() - 16); +exe = exe.copy(0, exe.getLength() - 16); #else - exe = exe.copy(0, exe.getLength() - 12); +exe = exe.copy(0, exe.getLength() - 12); #endif - return exe; +return exe; } void setStarUserRegistry() { - Registry *myRegistry = new Registry(); - - RegistryKey rootKey, rKey, rKey2; +Registry *myRegistry = new Registry(); - OUString userReg = getExePath(); - userReg += "user.rdb"; +RegistryKey rootKey, rKey, rKey2; - if(myRegistry->open(userReg, RegAccessMode::READWRITE)) - { - OSL_VERIFY(!myRegistry->create(userReg)); - } +OUString userReg = getExePath(); +userReg += "user.rdb"; +if(myRegistry->open(userReg, RegAccessMode::READWRITE)) +{ +OSL_VERIFY(!myRegistry->create(userReg)); +} - OSL_VERIFY(!myRegistry->close()); - delete myRegistry; +OSL_VERIFY(!myRegistry->close()); +delete myRegistry; - userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US); +userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US); putenv((char *)userRegEnv.getStr()); } @@ -650,7 +646,7 @@ void test_DefaultRegistry( SAL_IMPLEMENT_MAIN() { // setStarUserRegistry(); - setLinkInDefaultRegistry(OUString("/Test/DefaultLink"), + setLinkInDefaultRegistry(OUString("/Test/DefaultLink"), OUString("/Test/FifthKey/MyFirstLink")); OUString reg1( "testreg1.rdb" ); @@ -658,10 +654,10 @@ SAL_IMPLEMENT_MAIN() OUString areg1( "atestreg1.rdb" ); OUString areg2( "atestreg2.rdb" ); - test_SimpleRegistry( reg1, reg2 ); - test_DefaultRegistry( reg1, reg2 ); - test_SimpleRegistry( areg1, areg2, true ); // use different merge - test_DefaultRegistry( areg1, areg2, true ); + test_SimpleRegistry( reg1, reg2 ); + test_DefaultRegistry( reg1, reg2 ); + test_SimpleRegistry( areg1, areg2, true ); // use different merge + test_DefaultRegistry( areg1, areg2, true ); Reference< XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() ); xSimReg->open( reg1, sal_False, sal_True ); diff --git a/stoc/test/testsmgr2.cxx b/stoc/test/testsmgr2.cxx index dd65f6733724..2e40c0444dca 100644 --- a/stoc/test/testsmgr2.cxx +++ b/stoc/test/testsmgr2.cxx @@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN() n ++; } // there are two services in two registries ! - assert( 2 == n ); + OSL_ASSERT( 2 == n ); if( 2 == n ) { printf( "test passed\n" ); @@ -101,7 +101,7 @@ SAL_IMPLEMENT_MAIN() { OString o = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ); printf( "%s\n" , o.getStr() ); - assert(0); + OSL_ASSERT( 0 ); return 1; } } diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index 6efb66501526..12208b1c597a 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -497,7 +497,7 @@ OStorePageBIOS::AceCache::create (sal_uInt32 addr) if (ace != nullptr) { // verify invariant state. - assert((ace->m_next == ace) && (ace->m_prev == ace)); + OSL_ASSERT((ace->m_next == ace) && (ace->m_prev == ace)); // initialize. ace->m_addr = addr; diff --git a/store/source/store.cxx b/store/source/store.cxx index 664c4938a513..7c06aee6f91e 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -113,7 +113,7 @@ storeError SAL_CALL store_createMemoryFile ( storeError eErrCode = MemoryLockBytes_createInstance(xLockBytes); if (eErrCode != store_E_None) return eErrCode; - assert(xLockBytes.is()); + OSL_ASSERT(xLockBytes.is()); Reference<OStorePageManager> xManager (new OStorePageManager()); if (!xManager.is()) @@ -151,7 +151,7 @@ storeError SAL_CALL store_openFile ( storeError eErrCode = FileLockBytes_createInstance (xLockBytes, pFilename, eAccessMode); if (eErrCode != store_E_None) return eErrCode; - assert(xLockBytes.is()); + OSL_ASSERT(xLockBytes.is()); Reference<OStorePageManager> xManager (new OStorePageManager()); if (!xManager.is()) diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index ceb518c4a012..fc12e7681ce4 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -127,7 +127,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) break; default: - assert(false); + OSL_ASSERT(false); break; } } diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 0fc546948f2b..1e36c637a388 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -257,7 +257,7 @@ sal_uInt64 SvInputStream::SeekPos(sal_uInt64 const nPos) try { sal_Int64 nLength = m_xSeekable->getLength(); - assert(nLength >= 0); + OSL_ASSERT(nLength >= 0); if (static_cast<sal_uInt64>(nLength) < STREAM_SEEK_TO_END) { diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index b78c66f954d2..6da98476fa06 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -136,7 +136,7 @@ enum Result { Success, GeneralFailure, SpecificFailure }; Result normalizePrefix( css::uno::Reference< css::ucb::XUniversalContentBroker > const & broker, OUString const & uri, OUString * normalized) { - assert(broker.is() && normalized != nullptr); + OSL_ASSERT(broker.is() && normalized != nullptr); css::uno::Reference< css::ucb::XContent > content; try { content = broker->queryContent(broker->createContentIdentifier(uri)); @@ -153,7 +153,7 @@ Result normalizePrefix( css::uno::Reference< css::ucb::XUniversalContentBroker > 0, css::uno::Reference< css::ucb::XCommandEnvironment >()) >>= *normalized); - assert(ok); + OSL_ASSERT(ok); } catch (css::uno::RuntimeException &) { throw; } catch (css::ucb::UnsupportedCommandException &) { @@ -255,7 +255,7 @@ URIHelper::normalizedMakeRelative( css::uno::Reference< css::uno::XComponentContext > const & context, OUString const & baseUriReference, OUString const & uriReference) { - assert(context.is()); + OSL_ASSERT(context.is()); css::uno::Reference< css::ucb::XUniversalContentBroker > broker( css::ucb::UniversalContentBroker::create(context)); css::uno::Reference< css::uri::XUriReferenceFactory > uriFactory( diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index bf55780dde80..638120cf1515 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -162,7 +162,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) break; default: - assert(false); + OSL_ASSERT(false); break; } } diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 69b02388ff98..92d23b77f701 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -46,7 +46,7 @@ namespace svtools { static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { - assert( pWindow ); + OSL_ASSERT( pWindow ); if ( pWindow ) { // ->manually search topmost system window @@ -60,7 +60,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) pWindow = pWindow->GetParent(); } pWindow = pTopMostSysWin; - assert( pWindow ); + OSL_ASSERT( pWindow ); return pWindow; } diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 066d508c4b4b..fb315dc7ea18 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -101,7 +101,7 @@ short SvColorDialog::Execute() } catch(Exception&) { - assert(false); + OSL_ASSERT(false); } return ret; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 5376dcf3aea0..4d802f1d7763 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -63,7 +63,7 @@ ToolboxController::ToolboxController( , m_aCommandURL( aCommandURL ) , m_aListenerContainer( m_aMutex ) { - assert( m_xContext.is() ); + OSL_ASSERT( m_xContext.is() ); registerProperty( TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 36b33ff23824..a0e0853a79fe 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -517,7 +517,7 @@ Any SAL_CALL TreeControlPeer::getSelection() --nSelectionCount; } - assert( (pEntry == nullptr) && (nSelectionCount == 0) ); + OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) ); aRet <<= aSelection; } @@ -618,7 +618,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() --nSelectionCount; } - assert( (pEntry == nullptr) && (nSelectionCount == 0) ); + OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) ); return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) ); } @@ -641,7 +641,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer --nSelectionCount; } - assert( (pEntry == nullptr) && (nSelectionCount == 0) ); + OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) ); return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) ); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index b2df3d9d338e..c4b72ffd70ff 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -279,7 +279,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes ( { SolarMutexGuard g; - assert (maShapeTreeInfo.GetViewForwarder() != nullptr); + OSL_ASSERT (maShapeTreeInfo.GetViewForwarder() != nullptr); tools::Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea(); diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 8789df25471d..4e1c4eda1cc8 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -52,7 +52,7 @@ SfxBindings& SpellDialogChildWindow::GetBindings() const void SpellDialogChildWindow::InvalidateSpellDialog() { - assert (m_xAbstractSpellDialog); + OSL_ASSERT (m_xAbstractSpellDialog); if (m_xAbstractSpellDialog) m_xAbstractSpellDialog->Invalidate(); } diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index eefc491c4f98..943775beed68 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -52,7 +52,7 @@ namespace } catch(const uno::Exception&) { - assert(false); + OSL_ASSERT(false); } } diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 299b07342814..d18959eb4ca1 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -243,7 +243,7 @@ namespace sdr void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) { - assert(pNewModel!=nullptr); + OSL_ASSERT(pNewModel!=nullptr); if(pSrcPool && pDestPool && (pSrcPool != pDestPool)) { @@ -282,7 +282,7 @@ namespace sdr // name or use the default. // Look up the style in the new document. - assert(pNewModel->GetStyleSheetPool() != nullptr); + OSL_ASSERT(pNewModel->GetStyleSheetPool() != nullptr); SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>( pNewModel->GetStyleSheetPool()->Find( pStySheet->GetName(), diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index fb20ed71b68b..90140dfdb894 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -1273,7 +1273,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) if (!mxTrGrPopup) mxTrGrPopup = VclPtr<AreaTransparencyGradientPopup>::Create(*this); mxTrGrPopup->Rearrange(mpFloatTransparenceItem.get()); - assert( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT); + OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT); mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::GrabFocus); } diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index afef03cde2d0..255c0c03832b 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -50,7 +50,7 @@ bool ChartHelper::isGL3DDiagram( const css::uno::Reference<css::chart2::XDiagram //iterate through all chart types in the current coordinate system uno::Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCooSys, uno::UNO_QUERY); - assert( xChartTypeContainer.is()); + OSL_ASSERT( xChartTypeContainer.is()); if( !xChartTypeContainer.is() ) continue; diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 100b1204792e..a8e56773ff8c 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -65,7 +65,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod { SdrObject* pObj = bUseZOrder ? rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx ); - assert( pObj != nullptr ); + OSL_ASSERT( pObj != nullptr ); if( pObj ) ImpProcessObj( pObj, eMode, bUseZOrder ); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 9b87685a8883..478b0cbb65b7 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1394,7 +1394,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev) if (nMarkCount!=0) { nChgMarkNum=bPrev ? 0 : nMarkCount-1; SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); - assert(pM!=nullptr); + OSL_ASSERT(pM!=nullptr); if (pM->GetMarkedSdrObj() != nullptr) nSearchObjNum = pM->GetMarkedSdrObj()->GetNavigationPosition(); } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 60d718e3b27f..b331d5d848d7 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1585,7 +1585,7 @@ void SdrOle2Obj::ImpSetVisAreaSize() GetObjRef(); if (mpImpl->mxObjRef.is()) { - assert( pModel ); + OSL_ASSERT( pModel ); sal_Int64 nMiscStatus = mpImpl->mxObjRef->getStatus( GetAspect() ); // the client is required to get access to scaling @@ -1650,7 +1650,7 @@ void SdrOle2Obj::ImpSetVisAreaSize() // make the new object area known to the client // compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied - // WHY this -> assert( pClient ); + // WHY this -> OSL_ASSERT( pClient ); if( pClient ) pClient->SetObjArea(maRect); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 0fdc54dffdba..83281d013a74 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -395,7 +395,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum) { if (nObjNum >= maList.size()) { - assert(nObjNum<maList.size()); + OSL_ASSERT(nObjNum<maList.size()); return nullptr; } @@ -426,7 +426,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) { if (nObjNum >= maList.size()) { - assert(nObjNum<maList.size()); + OSL_ASSERT(nObjNum<maList.size()); return nullptr; } @@ -473,8 +473,8 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum) { if (nObjNum >= maList.size() || pNewObj == nullptr) { - assert(nObjNum<maList.size()); - assert(pNewObj!=nullptr); + OSL_ASSERT(nObjNum<maList.size()); + OSL_ASSERT(pNewObj!=nullptr); return nullptr; } @@ -508,12 +508,12 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) { if (nObjNum >= maList.size()) { - assert(nObjNum<maList.size()); + OSL_ASSERT(nObjNum<maList.size()); return nullptr; } if (pNewObj == nullptr) { - assert(pNewObj!=nullptr); + OSL_ASSERT(pNewObj!=nullptr); return nullptr; } @@ -562,8 +562,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) { if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) { - assert(nOldObjNum<maList.size()); - assert(nNewObjNum<maList.size()); + OSL_ASSERT(nOldObjNum<maList.size()); + OSL_ASSERT(nNewObjNum<maList.size()); return nullptr; } @@ -675,7 +675,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const { if (nNum >= maList.size()) { - assert(nNum<maList.size()); + OSL_ASSERT(nNum<maList.size()); return nullptr; } else @@ -768,8 +768,8 @@ void SdrObjList::SetObjectNavigationPosition ( maList.end(), mxNavigationOrder->begin()); } - assert(mxNavigationOrder.get()!=nullptr); - assert( mxNavigationOrder->size() == maList.size()); + OSL_ASSERT(mxNavigationOrder.get()!=nullptr); + OSL_ASSERT( mxNavigationOrder->size() == maList.size()); SdrObjectWeakRef aReference (&rObject); @@ -815,7 +815,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat // index is correct and look up the object in mxNavigationOrder. if (nNavigationPosition >= mxNavigationOrder->size()) { - assert(nNavigationPosition < mxNavigationOrder->size()); + OSL_ASSERT(nNavigationPosition < mxNavigationOrder->size()); } else return (*mxNavigationOrder)[nNavigationPosition].get(); @@ -826,7 +826,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat // instead. if (nNavigationPosition >= maList.size()) { - assert(nNavigationPosition < maList.size()); + OSL_ASSERT(nNavigationPosition < maList.size()); } else return maList[nNavigationPosition]; @@ -893,7 +893,7 @@ void SdrObjList::InsertObjectIntoContainer ( SdrObject& rObject, const sal_uInt32 nInsertPosition) { - assert(nInsertPosition<=maList.size()); + OSL_ASSERT(nInsertPosition<=maList.size()); // Update the navigation positions. if (HasObjectNavigationOrder()) @@ -921,7 +921,7 @@ void SdrObjList::ReplaceObjectInContainer ( { if (nObjectPosition >= maList.size()) { - assert(nObjectPosition<maList.size()); + OSL_ASSERT(nObjectPosition<maList.size()); return; } @@ -931,7 +931,7 @@ void SdrObjList::ReplaceObjectInContainer ( // A user defined position of the object that is to be replaced is // not transferred to the new object so erase the former and append // the later object from/to the navigation order. - assert(nObjectPosition < maList.size()); + OSL_ASSERT(nObjectPosition < maList.size()); SdrObjectWeakRef aReference (maList[nObjectPosition]); WeakSdrObjectContainerType::iterator iObject (::std::find( mxNavigationOrder->begin(), @@ -955,7 +955,7 @@ void SdrObjList::RemoveObjectFromContainer ( { if (nObjectPosition >= maList.size()) { - assert(nObjectPosition<maList.size()); + OSL_ASSERT(nObjectPosition<maList.size()); return; } diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index af53d625e724..607f155ed8ee 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -109,7 +109,7 @@ void SvxShapeCollection::release() throw() } // only the alive ref holds the object - assert( m_refCount == 1 ); + OSL_ASSERT( m_refCount == 1 ); // destroy the object if xHoldAlive decrement the refcount to 0 return; } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 553e0849acea..3946bb94c3c0 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -980,7 +980,7 @@ SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper( SvXMLGraphicHelp void SAL_CALL SvXMLGraphicImportExportHelper::disposing() { Reference< XComponent > xComp( m_xGraphicObjectResolver, UNO_QUERY ); - assert( xComp.is()); + OSL_ASSERT( xComp.is()); if( xComp.is()) xComp->dispose(); // m_xBinaryStreamResolver is a reference to the same object => don't call diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index bd1f551f7fed..e80016640775 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -360,7 +360,7 @@ XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType aType, OSL_FAIL("unknown xproperty type"); break; } - assert( !pRet.is() || pRet->meType == aType ); + OSL_ASSERT( !pRet.is() || pRet->meType == aType ); return pRet; } diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 6934941f2186..3ea3732a6f18 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -126,7 +126,7 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const #if OSL_DEBUG_LEVEL > 0 const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich ) { - assert( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN ); + OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN ); SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ]; OSL_ENSURE( pHt, "GetDfltFormatAttr(): Dflt == 0" ); diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index d24949867c6d..35882054a097 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -1312,7 +1312,7 @@ namespace double& rVal, const LocaleDataWrapper* const pLclData ) { - assert(pLclData); + OSL_ASSERT(pLclData); const sal_Unicode nCurrCmdPos = rCommandPos; rtl_math_ConversionStatus eStatus; const sal_Unicode* pEnd; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 4b5c3c388b94..4b3daa8bcee2 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -2334,8 +2334,8 @@ int CommonSubseq::FindLCS( int *pLcs1, int *pLcs2, int nStt1, int nEnd1, int nLen1 = nEnd1 ? nEnd1 - nStt1 : rCmp.GetLen1(); int nLen2 = nEnd2 ? nEnd2 - nStt2 : rCmp.GetLen2(); - assert( nLen1 >= 0 ); - assert( nLen2 >= 0 ); + OSL_ASSERT( nLen1 >= 0 ); + OSL_ASSERT( nLen2 >= 0 ); std::unique_ptr<int*[]> pLcs( new int*[ nLen1 + 1 ] ); pLcs[ 0 ] = pData.get(); diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index dd0c68d00279..f414b3a6a226 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -78,7 +78,7 @@ OUString SwNumRule::GetOutlineRuleName() const SwNumFormat& SwNumRule::Get( sal_uInt16 i ) const { - assert( i < MAXLEVEL && meRuleType < RULE_END ); + OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END ); return maFormats[ i ] ? *maFormats[ i ] : ( meDefaultNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION @@ -90,7 +90,7 @@ const SwNumFormat* SwNumRule::GetNumFormat( sal_uInt16 i ) const { const SwNumFormat * pResult = nullptr; - assert( i < MAXLEVEL && meRuleType < RULE_END ); + OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END ); if ( i < MAXLEVEL && meRuleType < RULE_END) { pResult = maFormats[ i ]; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 38ba5ecb5a12..10c90fddd03a 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2297,7 +2297,7 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam ) if (pU && pU->GetRedlSaveCount()) { SwEditShell *const pEditShell(GetEditShell()); - assert(pEditShell); + OSL_ASSERT(pEditShell); ::sw::UndoRedoContext context(*this, *pEditShell); static_cast<SfxUndoAction *>(pU)->UndoWithContext(context); } diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index ef503f3187f4..70f9541ccb04 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -97,7 +97,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) SwPaM& SwPamRanges::SetPam( size_t nArrPos, SwPaM& rPam ) { - assert( nArrPos < Count() ); + OSL_ASSERT( nArrPos < Count() ); const SwPamRange& rTmp = maVector[ nArrPos ]; rPam.GetPoint()->nNode = rTmp.nStart; rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 ); diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index 57283f484f39..cbda86ddf3eb 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -122,7 +122,7 @@ sal_uInt16 SwEditShell::GetCntType() const default: break; } - assert( nRet ); + OSL_ASSERT( nRet ); return nRet; } diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 017796153597..93c25f85bc5c 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -549,7 +549,7 @@ SwHistoryTextFlyCnt::~SwHistoryTextFlyCnt() void SwHistoryTextFlyCnt::SetInDoc( SwDoc* pDoc, bool ) { ::sw::IShellCursorSupplier *const pISCS(pDoc->GetIShellCursorSupplier()); - assert(pISCS); + OSL_ASSERT(pISCS); ::sw::UndoRedoContext context(*pDoc, *pISCS); m_pUndo->UndoImpl(context); } diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 043a759f3b85..7d6c81349aa0 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -2460,7 +2460,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) dynamic_cast<SwUndoDelete*>(pEntry->pUndo); SwUndoRedlineDelete *const pUndoRedlineDelete = dynamic_cast<SwUndoRedlineDelete*>(pEntry->pUndo); - assert(pUndoDelete || pUndoRedlineDelete); + OSL_ASSERT(pUndoDelete || pUndoRedlineDelete); if (pUndoRedlineDelete) { // The old content was not empty or he has been merged with the new content diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index d837d841fbb9..3c4b828f58d1 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -72,7 +72,7 @@ private: void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { - assert(output != nullptr); + OSL_ASSERT(output != nullptr); if( rCell.empty()) return; diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index cf9f0f9a296c..a7a62f713ce6 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -604,7 +604,7 @@ SwXFieldmark::getCheckboxFieldmark() { // evil #TODO #FIXME casting away the const-ness pCheckboxFm = const_cast<sw::mark::ICheckboxFieldmark*>(dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark())); - assert( GetBookmark() == nullptr || pCheckboxFm != nullptr ); + OSL_ASSERT( GetBookmark() == nullptr || pCheckboxFm != nullptr ); // unclear to me whether GetBookmark() can be null here } return pCheckboxFm; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index ceaa633c5f2d..71faf3dbb0bd 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -293,7 +293,7 @@ GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex, { ::sw::Meta *const pMeta( static_cast<SwFormatMeta &>(pTextAttr->GetAttr()).GetMeta()); - assert(pMeta); + OSL_ASSERT(pMeta); xRet.set(pMeta->MakeUnoObject(), uno::UNO_QUERY); } return xRet; diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 704e3f45fa9e..39a0d616d5e9 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -472,7 +472,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co return xRet; const uno::Reference<lang::XUnoTunnel> xFPTunnel(xPara, uno::UNO_QUERY); - assert(xFPTunnel.is()); + OSL_ASSERT(xFPTunnel.is()); SwXFlatParagraph* const pFlatParagraph(sw::UnoTunnelGetImplementation<SwXFlatParagraph>(xFPTunnel)); if ( !pFlatParagraph ) @@ -517,7 +517,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(c return xRet; const uno::Reference<lang::XUnoTunnel> xFPTunnel(xPara, uno::UNO_QUERY); - assert(xFPTunnel.is()); + OSL_ASSERT(xFPTunnel.is()); SwXFlatParagraph* const pFlatParagraph(sw::UnoTunnelGetImplementation<SwXFlatParagraph>(xFPTunnel)); if ( !pFlatParagraph ) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 3450e52473cf..dbdd6e13d971 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1972,7 +1972,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( std::vector<SwTextAttr *>::const_iterator const iter( std::find_if(newMarks.begin(), newMarks.end(), NotContainedIn<SwTextAttr *>(oldMarks))); - assert(newMarks.end() != iter); + OSL_ASSERT(newMarks.end() != iter); if (newMarks.end() != iter) { pTextAttr = *iter; diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 48c878fa15b8..a66d7200b48c 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -254,7 +254,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, std::vector<SwTextAttr *>::const_iterator const iter( std::find_if(newMarks.begin(), newMarks.end(), NotContainedIn<SwTextAttr *>(oldMarks))); - assert(newMarks.end() != iter); + OSL_ASSERT(newMarks.end() != iter); if (newMarks.end() != iter) { pTextAttr = *iter; @@ -263,7 +263,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, else { SwTextNode *pTextNd = rPam.GetNode().GetTextNode(); - assert(pTextNd); + OSL_ASSERT(pTextNd); pTextAttr = pTextNd ? rPam.GetNode().GetTextNode()->GetTextAttrForCharAt( rPam.GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_REFMARK) : nullptr; } diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index e115f1d4b65c..a22f2e874822 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1661,7 +1661,7 @@ SwXText::convertToTextFrame( } SwTextNode *const pTextNode(aStartPam.GetNode().GetTextNode()); - assert(pTextNode); + OSL_ASSERT(pTextNode); if (!pTextNode || !pTextNode->Len()) // don't remove if it contains text! { { // has to be in a block to remove the SwIndexes before diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 380c14c2d574..e1bffe7ffca0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1740,13 +1740,13 @@ void DocxAttributeOutput::StartRunProperties() } InitCollectedRunProperties(); - assert( !m_pPostponedGraphic ); + OSL_ASSERT( !m_pPostponedGraphic ); m_pPostponedGraphic.reset(new std::list<PostponedGraphic>); - assert( !m_pPostponedDiagrams ); + OSL_ASSERT( !m_pPostponedDiagrams ); m_pPostponedDiagrams.reset(new std::list<PostponedDiagram>); - assert( !m_pPostponedVMLDrawings ); + OSL_ASSERT( !m_pPostponedVMLDrawings ); m_pPostponedVMLDrawings.reset(new std::list<PostponedDrawing>); assert(!m_pPostponedDMLDrawings); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index f2b05dc6c560..2e3e2fc9cf4a 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -7062,7 +7062,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) pVer8 += 24; //FONTSIGNATURE cbFfnM1-=24; - assert(cbFfnM1 >= 2); + OSL_ASSERT(cbFfnM1 >= 2); sal_uInt8 nMaxNullTerminatedPossible = cbFfnM1/2 - 1; sal_Unicode *pPrimary = reinterpret_cast<sal_Unicode*>(pVer8); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 73bbdd3966c7..02c3a58682e5 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -605,7 +605,7 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) else if (&rEdit == m_pBottomMarginED) pOpposite = m_pTopMarginED; - assert(pOpposite); + OSL_ASSERT(pOpposite); if (pOpposite) { diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index f119656d77ed..61e98ca892ca 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -823,7 +823,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) switch( pEvHint->GetEventId() ) { case SfxEventHintId::LoadFinished: - assert(!pWrtSh); + OSL_ASSERT(!pWrtSh); // if it is a new document created from a template, // update fixed fields if (pDocSh->GetMedium()) diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index af1e91322a80..0b226ec4dadd 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -172,7 +172,7 @@ SwDLL::~SwDLL() sw::Filters & SwDLL::getFilters() { - assert(filters_); + OSL_ASSERT(filters_); return *filters_.get(); } diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index 3ffb9a96f532..a16193227b1d 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -104,7 +104,7 @@ void SwFrameControlsManager::SetReadonlyControls( bool bReadonly ) void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrame* pPageFrame, FrameControlType eType, Point aOffset ) { - assert( eType == Header || eType == Footer ); + OSL_ASSERT( eType == Header || eType == Footer ); // Check if we already have the control SwFrameControlPtr pControl; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 4466ef7e3a74..513f6c57a478 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -3124,7 +3124,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, return false; break; default: - assert(false); + OSL_ASSERT(false); break; } @@ -3563,7 +3563,7 @@ INetURLObject::getAbbreviated( = pPrefixBegin + (bAuthority && pPrefixBegin == pCoreBegin ? 2 : 1); - assert(p <= pEnd); + OSL_ASSERT(p <= pEnd); while (p < pEnd && *p != '/') ++p; if (p == pCoreEnd - 1 && *p == '/') @@ -4426,7 +4426,7 @@ bool INetURLObject::setFSysPath(OUString const & rFSysPath, } default: - assert(false); + OSL_ASSERT(false); break; } diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 0941b074d91e..ed617c47f077 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -719,7 +719,7 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& uno::Reference< container::XHierarchicalNameAccess > xHierNameAccess; Event.Base >>= xHierNameAccess; - assert( xHierNameAccess.is() ); + OSL_ASSERT( xHierNameAccess.is() ); const util::ElementChange* pElementChanges = Event.Changes.getConstArray(); diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index a315fbde4631..94ca028af92a 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -45,9 +45,9 @@ inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, m_bEmptyDomain(bTheEmptyDomain), m_bTranslation(bTheTranslation) { - assert(m_eKind == KIND_DOMAIN + OSL_ASSERT(m_eKind == KIND_DOMAIN || (!m_bEmptyDomain && m_aInfix.isEmpty())); - assert(m_bTranslation || m_aReversePrefix.isEmpty()); + OSL_ASSERT(m_bTranslation || m_aReversePrefix.isEmpty()); } @@ -153,7 +153,7 @@ bool isScheme(OUString const & rString, bool bColon) void appendStringLiteral(OUStringBuffer * pBuffer, OUString const & rString) { - assert(pBuffer); + OSL_ASSERT(pBuffer); pBuffer->append('"'); sal_Unicode const * p = rString.getStr(); diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 20092bc7fb71..e78bb9ed46eb 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -1377,7 +1377,7 @@ bool getType( TaskManager & task, sal_Int32 id, OUString const & fileUrl, osl::DirectoryItem * item, osl::FileStatus::Type * type) { - assert(item != nullptr && type != nullptr); + OSL_ASSERT(item != nullptr && type != nullptr); osl::FileBase::RC err = osl::DirectoryItem::get(fileUrl, *item); if (err != osl::FileBase::E_None) { task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err); @@ -2935,7 +2935,7 @@ TaskManager::erasePersistentSet( const OUString& aUnqPath, { if( ! m_xFileRegistry.is() ) { - assert( m_xFileRegistry.is() ); + OSL_ASSERT( m_xFileRegistry.is() ); return; } @@ -2996,7 +2996,7 @@ TaskManager::copyPersistentSet( const OUString& srcUnqPath, { if( ! m_xFileRegistry.is() ) { - assert( m_xFileRegistry.is() ); + OSL_ASSERT( m_xFileRegistry.is() ); return; } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index ff8a0f67fe9d..39a0742d2ab8 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -323,7 +323,7 @@ StorageElementFactory::createStream( const OUString & rUri, void StorageElementFactory::releaseElement( Storage * pElement ) { - assert( pElement ); + OSL_ASSERT( pElement ); osl::MutexGuard aGuard( m_aMutex ); if ( pElement->m_aContainerIt != m_aMap.end() ) m_aMap.erase( pElement->m_aContainerIt ); diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index f1db26a59787..eb001870c1f7 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -99,7 +99,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( void DAVSessionFactory::releaseElement( DAVSession * pElement ) { - assert( pElement ); + OSL_ASSERT( pElement ); osl::MutexGuard aGuard( m_aMutex ); if ( pElement->m_aContainerIt != m_aMap.end() ) m_aMap.erase( pElement->m_aContainerIt ); diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 5d74ad40636c..6e808ebe07d2 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -351,7 +351,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, int, const ne_ssl_certificate *cert ) { - assert( cert ); + OSL_ASSERT( cert ); NeonSession * pSession = static_cast< NeonSession * >( userdata ); uno::Reference< security::XCertificateContainer > xCertificateContainer; diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx index 4082883a5a67..5fca79af6016 100644 --- a/unotest/source/cpp/getargument.cxx +++ b/unotest/source/cpp/getargument.cxx @@ -31,7 +31,7 @@ namespace test { namespace detail { bool getArgument(OUString const & name, OUString * value) { - assert(value != nullptr); + OSL_ASSERT(value != nullptr); return rtl::Bootstrap::get("arg-" + name, *value); } diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 177b506d6457..f74185572544 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -334,7 +334,7 @@ static PathStatus getDerivedPath( aStatus = checkStatusAndNormalizeURL(sDerivedURL); else // the relative appendix must be valid - assert(aStatus != Bootstrap::PATH_VALID || dbgCheckStatusOfURL(sDerivedURL) == Bootstrap::PATH_VALID); + OSL_ASSERT(aStatus != Bootstrap::PATH_VALID || dbgCheckStatusOfURL(sDerivedURL) == Bootstrap::PATH_VALID); _rData.getFrom(_sBootstrapParameter, _rURL, sDerivedURL); @@ -349,7 +349,7 @@ static PathStatus getDerivedPath( _rURL = _aBaseURL; // if we have no data it can't be a valid path - assert( aStatus > Bootstrap::PATH_VALID ); + OSL_ASSERT( aStatus > Bootstrap::PATH_VALID ); } return aStatus; @@ -467,7 +467,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im addUnexpectedError(_rBuf,""); break; - default: assert(false); + default: OSL_ASSERT(false); addUnexpectedError(_rBuf); break; } @@ -513,10 +513,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY; break; - case Bootstrap::DATA_INVALID: - assert(false); - SAL_FALLTHROUGH; - + case Bootstrap::DATA_INVALID: OSL_ASSERT(false); SAL_FALLTHROUGH; case Bootstrap::PATH_VALID: addFileError(_rBuf, _rData.aBootstrapINI_.path, IS_MISSING); eErrCode = Bootstrap::MISSING_BOOTSTRAP_FILE; @@ -530,8 +527,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im } break; - default: - assert(false); + default: OSL_ASSERT(false); addUnexpectedError(_rBuf); break; } diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 6638fee7929f..c0dc0043a6e0 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -395,7 +395,7 @@ namespace utl // check if the name refers to a indirect descendant else if (m_xHierarchyAccess.is() && m_xHierarchyAccess->hasByHierarchicalName(_rPath)) { - assert(!_rPath.isEmpty()); + OSL_ASSERT(!_rPath.isEmpty()); OUString sParentPath, sLocalName; diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 64ccfd51e276..39cb53230c9a 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -217,7 +217,7 @@ namespace DOM if (!m_aNodePtr) { return; } if (m_pNamespace.get()) { - assert(!m_aNodePtr->parent); + OSL_ASSERT(!m_aNodePtr->parent); m_pNamespace->second = OUStringToOString(prefix, RTL_TEXTENCODING_UTF8); } else { @@ -232,7 +232,7 @@ namespace DOM if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { - assert(!m_aNodePtr->parent); + OSL_ASSERT(!m_aNodePtr->parent); OUString const ret(OStringToOUString( m_pNamespace->second, RTL_TEXTENCODING_UTF8)); return ret; @@ -248,7 +248,7 @@ namespace DOM if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { - assert(!m_aNodePtr->parent); + OSL_ASSERT(!m_aNodePtr->parent); OUString const ret(OStringToOUString( m_pNamespace->first, RTL_TEXTENCODING_UTF8)); return ret; diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 77ccebffa426..b9c167ee2486 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -173,7 +173,7 @@ namespace DOM if (xNode.is()) { ::rtl::Reference<CNode> ret(i->second.second); - assert(ret.is()); + OSL_ASSERT(ret.is()); return ret; } } @@ -265,7 +265,7 @@ namespace DOM ::std::make_pair(WeakReference<XNode>(pCNode.get()), pCNode.get())) ).second; - assert(bInserted); + OSL_ASSERT(bInserted); if (!bInserted) { // if insertion failed, delete new instance and return null return nullptr; @@ -939,7 +939,7 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - assert(nullptr != m_aNodePtr); + OSL_ASSERT(nullptr != m_aNodePtr); if (nullptr == m_aNodePtr) { return nullptr; } diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 85e47daede05..2d191b5cd997 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -141,7 +141,7 @@ namespace DOM ? &const_cast<CDocument&>(rDocument) : nullptr ) , m_rMutex(const_cast< ::osl::Mutex & >(rMutex)) { - assert(m_aNodePtr); + OSL_ASSERT(m_aNodePtr); } void CNode::invalidate() @@ -181,7 +181,7 @@ namespace DOM CDocument & CNode::GetOwnerDocument() { - assert(m_xDocument.is()); + OSL_ASSERT(m_xDocument.is()); return *m_xDocument; // needs overriding in CDocument! } diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index c08cf067419e..3e90c6ebdb36 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -92,7 +92,7 @@ executeErrorDialog( break; default: - assert(false); + OSL_ASSERT(false); break; } } diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index dcb072ed83bf..e068a45b4142 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -80,7 +80,7 @@ const std::string TAG_END_BODY = std::string("</body"); Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml) { - assert(aTextHtml.getLength() > 0); + OSL_ASSERT(aTextHtml.getLength() > 0); if (!(aTextHtml.getLength() > 0)) return Sequence<sal_Int8>(); diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index bee877d9c8ba..15123c826854 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -302,7 +302,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { } catch (const Exception&) { } - assert( false ); + OSL_ASSERT( false ); return nil; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 162061b615f0..bf039f142d58 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1695,7 +1695,7 @@ void PDFWriterImpl::putG4Bits( sal_uInt32 i_nLength, sal_uInt32 i_nCode, BitStre writeBuffer( &io_rState.getByte(), 1 ); io_rState.flush(); } - assert( i_nLength < 9 ); + OSL_ASSERT( i_nLength < 9 ); static const unsigned int msbmask[9] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; io_rState.mnBuffer |= static_cast<sal_uInt8>( (i_nCode & msbmask[i_nLength]) << (io_rState.mnNextBitPos - i_nLength) ); io_rState.mnNextBitPos -= i_nLength; @@ -1943,7 +1943,7 @@ void PDFWriterImpl::putG4Span( long i_nSpan, bool i_bWhitePixel, BitStreamState& if( i_nSpan > 63 ) { sal_uInt32 nTabIndex = 63 + (i_nSpan >> 6); - assert( pTable[nTabIndex].mnEncodedPixels == static_cast<sal_uInt32>(64*(i_nSpan >> 6)) ); + OSL_ASSERT( pTable[nTabIndex].mnEncodedPixels == static_cast<sal_uInt32>(64*(i_nSpan >> 6)) ); putG4Bits( pTable[nTabIndex].mnCodeBits, pTable[nTabIndex].mnCode, io_rState ); i_nSpan -= pTable[nTabIndex].mnEncodedPixels; } diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 7372bb6e8858..40d4085f56ff 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -1015,7 +1015,7 @@ bool PNGReaderImpl::ImplPreparePass() void PNGReaderImpl::ImplApplyFilter() { - assert( mnScansize >= mnBPP + 1 ); + OSL_ASSERT( mnScansize >= mnBPP + 1 ); const sal_uInt8* const pScanEnd = mpInflateInBuf + mnScansize; sal_uInt8 nFilterType = *mpInflateInBuf; // the filter type may change each scanline diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 7d34804866b0..08341d6202dc 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -863,8 +863,8 @@ bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const ImplRegionBand* ImplRegionBand::SplitBand (const sal_Int32 nY) { - assert(nY > mnYTop); - assert(nY <= mnYBottom); + OSL_ASSERT(nY>mnYTop); + OSL_ASSERT(nY<=mnYBottom); // Create a copy of the given band (we tell the constructor to copy the points together // with the seps.) diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 372d88527501..cec2de3f6b37 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -88,7 +88,7 @@ namespace */ std::unique_ptr<RegionBand> ImplRectilinearPolygonToBands(const tools::PolyPolygon& rPolyPoly) { - assert(ImplIsPolygonRectilinear (rPolyPoly)); + OSL_ASSERT(ImplIsPolygonRectilinear (rPolyPoly)); // Create a new RegionBand object as container of the bands. std::unique_ptr<RegionBand> pRegionBand( o3tl::make_unique<RegionBand>() ); @@ -120,7 +120,7 @@ namespace } // At this point the line has to be vertical. - assert(aStart.X() == aEnd.X()); + OSL_ASSERT(aStart.X() == aEnd.X()); // Sort y-coordinates to simplify the algorithm and store the // direction separately. The direction is calculated as it is diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 133a0b9043de..2e54cd89194e 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -317,7 +317,7 @@ bool RegionBand::isSingleRectangle() const void RegionBand::InsertBand(ImplRegionBand* pPreviousBand, ImplRegionBand* pBandToInsert) { - assert(pBandToInsert != nullptr); + OSL_ASSERT(pBandToInsert!=nullptr); if(!pPreviousBand) { diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 5959849b9370..508be2cb53f6 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -135,7 +135,7 @@ std::shared_ptr<SvStream> wrapStream(css::uno::Reference< css::io::XInputStream // SeekPos implementation for an XInputStream that is not also XSeekable // (cf. "@@@" at tags/DEV300_m37/svtools/source/misc1/strmadpt.cxx@264807 // l. 593): - assert(stream.is()); + OSL_ASSERT(stream.is()); std::shared_ptr<SvStream> s(std::make_shared<SvMemoryStream>()); for (;;) { @@ -398,10 +398,10 @@ void ImplImageTree::createStyle() if (maCurrentStyle != "default") { INetURLObject aUrl(getIconThemeFolderUrl()); - assert(!aUrl.HasError()); + OSL_ASSERT(!aUrl.HasError()); bool ok = aUrl.Append("images_" + maCurrentStyle, INetURLObject::EncodeMechanism::All); - assert(ok); (void) ok; + OSL_ASSERT(ok); (void) ok; sThemeUrl = aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE) + ".zip"; } diff --git a/vcl/source/window/EnumContext.cxx b/vcl/source/window/EnumContext.cxx index 87551eab7d5f..f2e46f1cf1ba 100644 --- a/vcl/source/window/EnumContext.cxx +++ b/vcl/source/window/EnumContext.cxx @@ -105,7 +105,7 @@ bool EnumContext::operator!= (const EnumContext& rOther) void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication) { maApplicationMap[rsName] = eApplication; - assert(eApplication <= Application::LAST); + OSL_ASSERT(eApplication<=Application::LAST); maApplicationVector[eApplication]=rsName; } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index e34010d6d478..7458d1be8b87 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -527,7 +527,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); if( FilterNameExists( aTitle ) ) throw IllegalArgumentException(); @@ -543,7 +543,7 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); if( aTitle != m_aCurrentFilter ) { @@ -602,7 +602,7 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); UpdateFilterfromUI(); @@ -615,7 +615,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); // TODO m_pImpl->appendFilterGroup( sGroupTitle, aFilters ); // check the names @@ -644,7 +644,7 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER(m_pDialog), bMode ); } @@ -653,7 +653,7 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); OString aStr = OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ); GtkFileChooserAction eAction = gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ); @@ -714,7 +714,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); GSList* pPathList = gtk_file_chooser_get_uris( GTK_FILE_CHOOSER(m_pDialog) ); @@ -868,7 +868,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); sal_Int16 retVal = 0; @@ -1232,7 +1232,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); GType tType; GtkWidget *pWidget; @@ -1257,7 +1257,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); uno::Any aRetval; @@ -1280,7 +1280,7 @@ void SAL_CALL SalGtkFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bE { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); GtkWidget *pWidget; @@ -1303,7 +1303,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); GType tType; GtkWidget *pWidget; @@ -1339,7 +1339,7 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); GType tType; OString aTxt; @@ -1361,7 +1361,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); // TODO return m_pImpl->getSupportedImageFormats(); return uno::Sequence<sal_Int16>(); @@ -1371,7 +1371,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); // TODO return m_pImpl->getTargetColorDepth(); return 0; @@ -1381,7 +1381,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); return m_PreviewImageWidth; } @@ -1390,7 +1390,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); return m_PreviewImageHeight; } @@ -1399,7 +1399,7 @@ void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno: { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); // TODO m_pImpl->setImage( aImageFormat, aImage ); } @@ -1499,7 +1499,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); // TODO return m_pImpl->setShowState( bShowState ); if( bool(bShowState) != mbPreviewState ) @@ -1533,7 +1533,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); return mbPreviewState; } @@ -1712,7 +1712,7 @@ void SAL_CALL SalGtkFilePicker::cancel() { SolarMutexGuard g; - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); // TODO m_pImpl->cancel(); } diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index a52a85b3a7ef..060cf23abab1 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -199,7 +199,7 @@ SalGtkPicker::~SalGtkPicker() void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory ) { - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); OString aTxt = unicodetouri(aDirectory); if( aTxt.isEmpty() ){ @@ -217,7 +217,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() { - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); gchar* pCurrentFolder = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) ); @@ -229,7 +229,7 @@ OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) { - assert( m_pDialog != nullptr ); + OSL_ASSERT( m_pDialog != nullptr ); OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 79667c9d6288..8fbed035a0b3 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -235,7 +235,7 @@ UnxFilePicker::~UnxFilePicker() void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) { - assert( m_pNotifyThread ); + OSL_ASSERT( m_pNotifyThread ); osl::MutexGuard aGuard( m_aMutex ); m_pNotifyThread->addFilePickerListener( xListener ); @@ -243,7 +243,7 @@ void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePi void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) { - assert( m_pNotifyThread ); + OSL_ASSERT( m_pNotifyThread ); osl::MutexGuard aGuard( m_aMutex ); m_pNotifyThread->removeFilePickerListener( xListener ); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 81286e94cf92..bf72067b9afb 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -288,7 +288,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_bIsNewDoc(!rMediaDescriptor.getUnpackedValueOrDefault("InsertMode", false)), m_rMediaDescriptor(rMediaDescriptor) { - assert(xInputStream.is()); + OSL_ASSERT(xInputStream.is()); m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, true)); m_xModelFactory.set(m_xDstDoc, uno::UNO_QUERY); @@ -2343,7 +2343,7 @@ RTFError RTFDocumentImpl::popState() writerfilter::Reference<Properties>::Pointer_t pProperties = std::make_shared<RTFReferenceProperties>(aObjAttributes, aObjSprms); uno::Reference<drawing::XShape> xShape; RTFValue::Pointer_t pShape = m_aObjectAttributes.find(NS_ooxml::LN_shape); - assert(pShape.get()); + OSL_ASSERT(pShape.get()); if (pShape) pShape->getAny() >>= xShape; if (xShape.is()) @@ -3073,7 +3073,7 @@ RTFError RTFDocumentImpl::popState() if (aState.pCurrentBuffer == &m_aSuperBuffer) { - assert(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == nullptr); + OSL_ASSERT(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == nullptr); if (!m_aSuperBuffer.empty()) replayBuffer(m_aSuperBuffer, nullptr, nullptr); diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index 210321b4121e..092ae9cc9289 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -73,7 +73,7 @@ public: aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream; if (!xInputStream.is()) { - assert(false); + OSL_ASSERT(false); return false; } diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index ebda55e1cbb2..11881202ad28 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -277,7 +277,7 @@ sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::P if (!getXContext().is() || !xInputStream.is()) { - assert(false); + OSL_ASSERT(false); return false; } diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index f8cdf779f847..68c2a5cc8dd1 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -97,7 +97,7 @@ bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< css::beans::Pr } if (!xInputStream.is()) { - assert(false); + OSL_ASSERT(false); return false; } diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 771fc76abe6e..9343280b5299 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -79,7 +79,7 @@ namespace helpdatafileproxy { , m_nItRead( -1 ) , m_iItPos( -1 ) { - assert(comphelper::isFileUrl(rFileURL)); + OSL_ASSERT(comphelper::isFileUrl(rFileURL)); } ~Hdf() { releaseHashMap(); } diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 13797e9c92e9..8e264843e2dd 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -972,7 +972,7 @@ void SchXMLChartContext::EndElement() void SchXMLChartContext::MergeSeriesForStockChart() { - assert( mbIsStockChart ); + OSL_ASSERT( mbIsStockChart ); try { uno::Reference< chart::XChartDocument > xOldDoc( mrImportHelper.GetChartDocument()); @@ -1009,7 +1009,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() const sal_Int32 nSeriesCount( aSeriesSeq.getLength()); const sal_Int32 nSeriesPerCandleStick = bHasJapaneseCandlestick ? 4: 3; sal_Int32 nCandleStickCount = nSeriesCount / nSeriesPerCandleStick; - assert( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount ); + OSL_ASSERT( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount ); uno::Sequence< uno::Reference< chart2::XDataSeries > > aNewSeries( nCandleStickCount ); for( sal_Int32 i=0; i<nCandleStickCount; ++i ) { @@ -1120,7 +1120,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( !msColTrans.isEmpty() ) { - assert( msRowTrans.isEmpty() ); + OSL_ASSERT( msRowTrans.isEmpty() ); pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true )); msColTrans.clear(); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 2ef90c0afe79..35f4a3ffd0be 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2896,7 +2896,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( const awt::Size& rPageSize, bool bExportContent ) { - assert( mxExpPropMapper.is()); + OSL_ASSERT( mxExpPropMapper.is()); std::vector< XMLPropertyState > aPropertyStates; std::vector< XMLPropertyState > aEquationPropertyStates; diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index ac59cb9f1409..4cd94a6d768b 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -160,7 +160,7 @@ void SvXMLAttributeList::Clear() { m_pImpl->vecAttribute.clear(); - assert( ! getLength() ); + OSL_ASSERT( ! getLength() ); } void SvXMLAttributeList::RemoveAttribute( const OUString& sName ) @@ -177,7 +177,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString& sName ) void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList > &r ) { - assert( r.is() ); + OSL_ASSERT( r.is() ); sal_Int16 nMax = r->getLength(); SvXMLAttributeList_Impl::size_type nTotalSize = @@ -190,7 +190,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sa r->getValueByIndex( i ))); } - assert( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength()); + OSL_ASSERT( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength()); } void SvXMLAttributeList::SetValueByIndex( sal_Int16 i, diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx index bd9a3dc12d03..326ba5305124 100644 --- a/xmlscript/source/xml_helper/xml_element.cxx +++ b/xmlscript/source/xml_helper/xml_element.cxx @@ -69,13 +69,13 @@ sal_Int16 XMLElement::getLength() OUString XMLElement::getNameByIndex( sal_Int16 nPos ) { - assert( (size_t)nPos < _attrNames.size() ); + OSL_ASSERT( (size_t)nPos < _attrNames.size() ); return _attrNames[ nPos ]; } OUString XMLElement::getTypeByIndex( sal_Int16 nPos ) { - assert( (size_t)nPos < _attrNames.size() ); + OSL_ASSERT( (size_t)nPos < _attrNames.size() ); static_cast<void>(nPos); // xxx todo return OUString(); @@ -89,7 +89,7 @@ OUString XMLElement::getTypeByName( OUString const & /*rName*/ ) OUString XMLElement::getValueByIndex( sal_Int16 nPos ) { - assert( (size_t)nPos < _attrNames.size() ); + OSL_ASSERT( (size_t)nPos < _attrNames.size() ); return _attrValues[ nPos ]; } diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 12fbd746b265..99350b79e9b6 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -164,7 +164,7 @@ public: , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW ) , XMLNS_DIALOGS_UID( 0 ) , XMLNS_SCRIPT_UID( 0 ) - { assert( _xDialogModel.is() && _xDialogModelFactory.is() && + { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() && _xContext.is() ); } DialogImport( const DialogImport& rOther ) : ::cppu::WeakImplHelper< css::xml::input::XRoot >() @@ -380,7 +380,7 @@ public: : _pImport( pImport ), _xControlModel( xControlModel_ ), _aId( id ) - { assert( _xControlModel.is() ); } + { OSL_ASSERT( _xControlModel.is() ); } const css::uno::Reference< css::beans::XPropertySet >& getControlModel() const { return _xControlModel; } diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index c586a1b888d5..756424a96c5e 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -1365,9 +1365,9 @@ void SAL_CALL exportDialogModel( StyleBag all_styles; // window Reference< beans::XPropertySet > xProps( xDialogModel, UNO_QUERY ); - assert( xProps.is() ); + OSL_ASSERT( xProps.is() ); Reference< beans::XPropertyState > xPropState( xProps, UNO_QUERY ); - assert( xPropState.is() ); + OSL_ASSERT( xPropState.is() ); ElementDescriptor * pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", xDocument ); Reference< xml::sax::XAttributeList > xElem( pElem ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 5afc801ff108..f5606ffe2d90 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -256,13 +256,19 @@ void StyleElement::importVisualEffectStyle( if (getStringAttr( &aValue, "look", _xAttributes, m_xImport->XMLNS_DIALOGS_UID )) { if ( aValue == "none" ) + { _visualEffect = awt::VisualEffect::NONE; + } else if ( aValue == "3d" ) + { _visualEffect = awt::VisualEffect::LOOK3D; + } else if ( aValue == "simple" ) + { _visualEffect = awt::VisualEffect::FLAT; + } else - assert( false ); + OSL_ASSERT( false ); _hasValue |= 0x40; xProps->setPropertyValue( "VisualEffect", makeAny(_visualEffect) ); diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx index 580a22bd294a..6965d4126a51 100644 --- a/xmlscript/test/imexp.cxx +++ b/xmlscript/test/imexp.cxx @@ -63,7 +63,7 @@ Reference< XComponentContext > createInitialComponentContext( OUString file_url; oslFileError rc = osl_getFileURLFromSystemPath( inst_dir.pData, &file_url.pData ); - assert( osl_File_E_None == rc ); + OSL_ASSERT( osl_File_E_None == rc ); OUString unorc = file_url + ("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("louno") ); @@ -123,7 +123,7 @@ void exportToFile( nRead = xStream->readBytes( readBytes, 1024 ); if (! nRead) break; - assert( readBytes.getLength() >= nRead ); + OSL_ASSERT( readBytes.getLength() >= nRead ); sal_Int32 nPos = bytes.getLength(); bytes.realloc( nPos + nRead ); @@ -169,7 +169,7 @@ void MyApp::Main() RTL_TEXTENCODING_ASCII_US ) ); Reference< container::XNameContainer > xModel( importFile( aParam1.getStr(), xContext ) ); - assert( xModel.is() ); + OSL_ASSERT( xModel.is() ); Reference< awt::XUnoControlDialog > xDlg = UnoControlDialog::create( xContext ); xDlg->setModel( xModel ); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 60d596b6eab9..cedcb3ebc1d5 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -261,7 +261,7 @@ bool DigitalSignaturesDialog::canAddRemove() // It's always possible to append a PDF signature. return ret; - assert(maSignatureManager.mxStore.is()); + OSL_ASSERT(maSignatureManager.mxStore.is()); bool bDoc1_1 = DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion); SaveODFItem item; bool bSave1_1 = item.isLessODF1_2(); diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 676f50d803be..e989af368b60 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -157,7 +157,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) //then we have reached the end of the value if (!bInValue) { - assert(!sType.isEmpty()); + OSL_ASSERT(!sType.isEmpty()); retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear())); sType.clear(); //The next char is the start of the new type @@ -180,7 +180,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) } if (sbufValue.getLength()) { - assert(!sType.isEmpty()); + OSL_ASSERT(!sType.isEmpty()); retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear())); } return retVal; @@ -252,7 +252,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) //then we have reached the end of the value if (!bInValue) { - assert(!sType.isEmpty()); + OSL_ASSERT(!sType.isEmpty()); retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear())); sType.clear(); //The next char is the start of the new type @@ -278,7 +278,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) } if (!sbufValue.isEmpty()) { - assert(!sType.isEmpty()); + OSL_ASSERT(!sType.isEmpty()); retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear())); } return retVal; diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index 5b56b2653893..462a98c4ee62 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -187,7 +187,7 @@ void BufferNode::setBlocker(const ElementMark* pBlocker) * old blocker on this BufferNode, if there is one, will be overcasted. ******************************************************************************/ { - assert(!(m_pBlocker != nullptr && pBlocker != nullptr)); + OSL_ASSERT(!(m_pBlocker != nullptr && pBlocker != nullptr)); m_pBlocker = const_cast<ElementMark*>(pBlocker); if (m_pBlocker != nullptr) diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 1283b7acd887..934be03f7edc 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -848,7 +848,7 @@ sal_Int32 SAXEventKeeperImpl::createBlocker() sal_Int32 nId = m_nNextElementMarkId; m_nNextElementMarkId ++; - assert(m_pNewBlocker == nullptr); + OSL_ASSERT(m_pNewBlocker == nullptr); m_pNewBlocker = new ElementMark(cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, nId); m_vElementMarkBuffers.push_back( m_pNewBlocker ); @@ -1170,7 +1170,7 @@ void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< css /* XInitialization */ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) { - assert(aArguments.getLength() == 1); + OSL_ASSERT(aArguments.getLength() == 1); aArguments[0] >>= m_xXMLDocument; m_xDocumentHandler.set( m_xXMLDocument, cssu::UNO_QUERY ); diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 53ee5ebcb2b8..d938601afed7 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -166,7 +166,7 @@ void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener( /* XInitialization */ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) { - assert(aArguments.getLength() == 5); + OSL_ASSERT(aArguments.getLength() == 5); OUString ouTempString; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index f31781438e7f..0ae3b619ddcc 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -120,7 +120,7 @@ void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener( void SAL_CALL SignatureVerifierImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) { - assert(aArguments.getLength() == 5); + OSL_ASSERT(aArguments.getLength() == 5); OUString ouTempString; diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 028cb3b8c8e3..96f78aaa6c80 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -163,7 +163,7 @@ DocumentSignatureAlgorithm DocumentSignatureHelper::getDocumentAlgorithm( const OUString & sODFVersion, const SignatureInformation & sigInfo) { - assert(!sODFVersion.isEmpty()); + OSL_ASSERT(!sODFVersion.isEmpty()); DocumentSignatureAlgorithm mode = DocumentSignatureAlgorithm::OOo3_2; if (!isOOo3_2_Signature(sigInfo)) { diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 44158d33d6de..d63052996763 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -68,7 +68,7 @@ uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( con uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno::Reference < embed::XStorage >& rxStore, const OUString& rURI ) { - assert(!rURI.isEmpty()); + OSL_ASSERT(!rURI.isEmpty()); uno::Reference < io::XInputStream > xInStream; OUString aURI(rURI); diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index cf532cb0f734..959e62cc34e0 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -583,7 +583,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, //CERT_PKIXVerifyCert does not take a db as argument. It will therefore //internally use CERT_GetDefaultCertDB //Make sure m_pHandler is the default DB - assert(m_pHandler == CERT_GetDefaultCertDB()); + OSL_ASSERT(m_pHandler == CERT_GetDefaultCertDB()); CERTCertDBHandle * certDb = m_pHandler != nullptr ? m_pHandler : CERT_GetDefaultCertDB(); cert = xcert->getNssCert() ; if( cert != nullptr ) diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 321b76da6fa3..1a40f347d74f 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -103,7 +103,7 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent() * NODEPOSITION_NORMAL for other SAX events; ******************************************************************************/ { - assert( m_pCurrentElement != nullptr ); + OSL_ASSERT( m_pCurrentElement != nullptr ); /* * Get the next event through tree order. @@ -525,7 +525,7 @@ void XMLDocumentWrapper_XmlSecImpl::removeNode(const xmlNodePtr pNode) const ******************************************************************************/ { /* you can't remove the current node */ - assert( m_pCurrentElement != pNode ); + OSL_ASSERT( m_pCurrentElement != pNode ); xmlAttrPtr pAttr = pNode->properties; @@ -604,7 +604,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setCurrentElement( const cssu::Refe void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( ) { - assert( m_pCurrentElement != nullptr ); + OSL_ASSERT( m_pCurrentElement != nullptr ); xmlNodePtr pOldCurrentElement = m_pCurrentElement; |