7 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index bf039f142d58..162061b615f0 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();
     }
-    OSL_ASSERT( i_nLength < 9 );
+    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);
-        OSL_ASSERT( pTable[nTabIndex].mnEncodedPixels == static_cast<sal_uInt32>(64*(i_nSpan >> 6)) );
+        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 40d4085f56ff..7372bb6e8858 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -1015,7 +1015,7 @@ bool PNGReaderImpl::ImplPreparePass()
 
 void PNGReaderImpl::ImplApplyFilter()
 {
-    OSL_ASSERT( mnScansize >= mnBPP + 1 );
+    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 08341d6202dc..7d34804866b0 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)
 {
-    OSL_ASSERT(nY>mnYTop);
-    OSL_ASSERT(nY<=mnYBottom);
+    assert(nY > mnYTop);
+    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 cec2de3f6b37..372d88527501 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)
     {
-        OSL_ASSERT(ImplIsPolygonRectilinear (rPolyPoly));
+        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.
-                OSL_ASSERT(aStart.X() == aEnd.X());
+                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 2e54cd89194e..133a0b9043de 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)
 {
-    OSL_ASSERT(pBandToInsert!=nullptr);
+    assert(pBandToInsert != nullptr);
 
     if(!pPreviousBand)
     {
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 508be2cb53f6..5959849b9370 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):
-    OSL_ASSERT(stream.is());
+    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());
-        OSL_ASSERT(!aUrl.HasError());
+        assert(!aUrl.HasError());
 
         bool ok = aUrl.Append("images_" + maCurrentStyle, INetURLObject::EncodeMechanism::All);
-        OSL_ASSERT(ok); (void) ok;
+        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 f2e46f1cf1ba..87551eab7d5f 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;
-    OSL_ASSERT(eApplication<=Application::LAST);
+    assert(eApplication <= Application::LAST);
     maApplicationVector[eApplication]=rsName;
 }