tdf#43157: convert sc module away from OSL_ASSERT to assert

Change-Id: Iead653868ea7e0d1ed4ba83ef1a46e1ae5874d13

22 files changed, 57 insertions, 57 deletions

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index e846e381d250..3b7a030e8557 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);
-    OSL_ASSERT(pBC);
+    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 bff9aa1e9033..9bf86c850d69 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.
-    OSL_ASSERT(miBlockCur == miBlockEnd);
+    assert(miBlockCur == miBlockEnd);
 }
 
 bool ScColumnTextWidthIterator::hasCell() const
@@ -72,19 +72,19 @@ bool ScColumnTextWidthIterator::hasCell() const
 
 SCROW ScColumnTextWidthIterator::getPos() const
 {
-    OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+    assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
     return static_cast<SCROW>(mnCurPos);
 }
 
 sal_uInt16 ScColumnTextWidthIterator::getValue() const
 {
-    OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+    assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
     return miDataCur->mnTextWidth;
 }
 
 void ScColumnTextWidthIterator::setValue(sal_uInt16 nVal)
 {
-    OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+    assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
     miDataCur->mnTextWidth = nVal;
 }
 
@@ -141,7 +141,7 @@ void ScColumnTextWidthIterator::init(SCROW nStartRow, SCROW nEndRow)
     }
 
     // Not found.
-    OSL_ASSERT(miBlockCur == miBlockEnd);
+    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 31eaf827911f..5a994713244a 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()
 {
-    OSL_ASSERT(pChartListenerCollection);
+    assert(pChartListenerCollection);
 
     bChartListenerCollectionNeedsUpdate = false;
     if (!pDrawLayer)
@@ -735,7 +735,7 @@ void ScDocument::UpdateChartListenerCollection()
 
 void ScDocument::AddOLEObjectToCollection(const OUString& rName)
 {
-    OSL_ASSERT(pChartListenerCollection);
+    assert(pChartListenerCollection);
     ScChartListenerCollection::StringSetType& rNonOleObjects =
         pChartListenerCollection->getNonOleObjectNames();
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 92c9645cf03c..7bad32c1449f 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);
-        OSL_ASSERT( nTab2 < static_cast<SCTAB>(maTabs.size()) && nTab2 < static_cast<SCTAB>(rDestDoc.maTabs.size()));
+        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 e73bee5e80d5..1615150f277b 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
             {
-                OSL_ASSERT(rEntry.IsQueryByNonEmpty());
+                assert(rEntry.IsQueryByNonEmpty());
                 bOk = !pCellData->IsEmpty();
             }
         }
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 3a4cdc852a67..d71c3aca95fb 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];
-    OSL_ASSERT(nSubEntry < rColl.size());
+    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 2044a33b7708..5022c28fd999 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -315,7 +315,7 @@ public:
      */
     ScSortInfo** GetFirstArray() const
     {
-        OSL_ASSERT(pppInfo);
+        assert(pppInfo);
         return pppInfo[0];
     }
 
@@ -324,7 +324,7 @@ public:
      */
     ScSortInfo* Get( sal_uInt16 nSort, SCCOLROW nInd )
     {
-        OSL_ASSERT(pppInfo);
+        assert(pppInfo);
         return (pppInfo[nSort])[ nInd - nStart ];
     }
 
@@ -333,7 +333,7 @@ public:
      */
     void Swap( SCCOLROW nInd1, SCCOLROW nInd2 )
     {
-        OSL_ASSERT(pppInfo);
+        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
             {
-                OSL_ASSERT(rEntry.IsQueryByNonEmpty());
+                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 ba885a6be13d..04fa263ec723 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();
-        OSL_ASSERT(pCL);
+        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 4d0371285f0e..c8481a83fe0a 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++ )
     {
-        OSL_ASSERT(aOS.getLength() == 0);
+        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++ )
         {
-            OSL_ASSERT(aOS.getLength() == 0);
+            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..
-                OSL_ASSERT(aOS.getLength() == 0);
+                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 );
     }
 
-    OSL_ASSERT(aOS.getLength() == 0);
+    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 050f59ea4f93..577aa327cc7c 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -719,7 +719,7 @@ void XclImpAutoFilterData::ReadAutoFilter(
     }
     else
     {
-        OSL_ASSERT(eConn == SC_OR);
+        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 d5a4c899e70a..3055a608c18f 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)
 {
-    OSL_ASSERT(rCell.meType == CELLTYPE_VALUE);
+    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)
 {
-    OSL_ASSERT(rCell.meType == CELLTYPE_STRING);
+    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)
 {
-    OSL_ASSERT(rCell.meType == CELLTYPE_EDIT);
+    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)
 {
-    OSL_ASSERT(rCell.meType == CELLTYPE_FORMULA);
+    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 77d2711bbe2f..eed0961328d1 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -466,7 +466,7 @@ private:
         else
         {
             // Multi-item condition.
-            OSL_ASSERT(rItems.size() > 1);
+            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 cfcf74a6b74f..8a464250ac1e 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);
-                    OSL_ASSERT(m_mapSelectionSend.count(aNewCell) == 0 );
+                    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)
 {
-    OSL_ASSERT(!IsFormulaMode());
+    assert(!IsFormulaMode());
     if(IsFormulaMode())
     {
         return ;
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 69dfa163c1b6..75182ada423c 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();
 
-            OSL_ASSERT(pList);
+            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 e0f0e9ec3b06..5adbf08ed351 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) )
             {
-                OSL_ASSERT(eOp == SC_EQUAL);
+                assert(eOp == SC_EQUAL);
                 rEntry.SetQueryByEmpty();
             }
             else if ( aStrVal.equals(aStrNotEmpty) )
             {
-                OSL_ASSERT(eOp == SC_EQUAL);
+                assert(eOp == SC_EQUAL);
                 rEntry.SetQueryByNonEmpty();
             }
             else
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 7fb1f3a19858..d91c4e3bf053 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);
     }
 
-    OSL_ASSERT(pOldObj && pNewObj && pOldObj != pNewObj);
+    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 25bac55420c2..f9242c063dfd 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 );
-        OSL_ASSERT( xReceiver.is());
+        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
-                        OSL_ASSERT( pViewShell );
-                        OSL_ASSERT( pView );
+                        assert( pViewShell );
+                        assert( pView );
                         pViewShell->DeactivateOle();
                         pView->UnmarkAll();
 
@@ -711,15 +711,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV
                         pPV = pView->GetSdrPageView();
 
                         // remove the chart
-                        OSL_ASSERT( pPV );
+                        assert( pPV );
                         SdrPage * pPage( pPV->GetPage());
-                        OSL_ASSERT( pPage );
-                        OSL_ASSERT( pObj );
+                        assert( pPage );
+                        assert( pObj );
                         if( pPage )
                         {
                             // Remove the OLE2 object from the sdr page.
                             SdrObject* pRemoved = pPage->RemoveObject(pObj->GetOrdNum());
-                            OSL_ASSERT(pRemoved == pObj);
+                            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
                     {
-                        OSL_ASSERT( nDialogRet == ui::dialogs::ExecutableDialogResults::OK );
+                        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 e182575863f3..943a9756ec98 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 );
 
-        OSL_ASSERT(pEd);
+        assert(pEd);
 
         if (pEd)
             pEd->GrabFocus();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 034de933a539..6a133442d77b 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();
-        OSL_ASSERT(p);
+        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 d44110def97e..c60af8f440d7 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
-        OSL_ASSERT( bCreate );
+        assert( bCreate );
 
         if ( !xRet.is() && bCreate )
         {
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 88f70a8e7249..eb93937d645d 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)
 {
-    OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD);
-    OSL_ASSERT(!rParam.mbAsianVertical);
+    assert(rParam.meOrient == SVX_ORIENTATION_STANDARD);
+    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)
 {
-    OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+    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)
 {
-    OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+    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)
 {
-    OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+    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.
-    OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD);
-    OSL_ASSERT(rParam.mbAsianVertical);
-    OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+    assert(rParam.meOrient == SVX_ORIENTATION_STANDARD);
+    assert(rParam.mbAsianVertical);
+    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 09bd3dbabc09..ea86cd3356fe 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);
-        OSL_ASSERT(pUserData);
+        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);
-    OSL_ASSERT(pUserData);
+    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);
-            OSL_ASSERT(pUserData);
+            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);
-    OSL_ASSERT(pParent); // attribute should have a parent element.
+    assert(pParent); // attribute should have a parent element.
 
     ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pParent);
-    OSL_ASSERT(pUserData);
+    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);
-        OSL_ASSERT(pUserData);
+        assert(pUserData);
         if (pUserData->maLinkedPos.IsValid())
             // Already linked.
             return true;