fdo#43157 convert OSL_ASSERT to assert in sc/source/core

Change-Id: I2cda454250116039b904bbb3abcd2871537c43f2
Reviewed-on: https://gerrit.libreoffice.org/39301
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

8 files changed, 16 insertions, 16 deletions

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 582fe6734a00..d08b9a559f8b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3110,7 +3110,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 6c26da24775d..074f5bf7032a 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 73e750c4f62c..340a9de2639f 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -658,7 +658,7 @@ uno::Reference< embed::XEmbeddedObject >
 
 void ScDocument::UpdateChartListenerCollection()
 {
-    OSL_ASSERT(pChartListenerCollection);
+    assert(pChartListenerCollection);
 
     bChartListenerCollectionNeedsUpdate = false;
     if (!pDrawLayer)
@@ -734,7 +734,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 2627a0c33f0b..27e7eb9cf5d8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2092,7 +2092,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 d01419e0e2af..67d586a94484 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -726,7 +726,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 eb4426bbe8cb..c8932758e531 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 9f63f8f2ff10..9e33ccb4aee4 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)
         {