summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 09:37:20 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 09:37:20 +1000
commitb8fc5aee3c1c2e7966ae12c32db8c481d95715a6 (patch)
tree9488f5aa54e7fcb2fc80c18fc9b10715e966d445 /canvas
parent4aca4ce101398443b2cfee8fdf18bae8e6c3892a (diff)
tdf#43157: convert most of canvas codebase away from OSL_ASSERT to assert
Change-Id: Ie6a5942dcac62a0bc3b589ff0b82922b313f88a8
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx2
-rw-r--r--canvas/source/opengl/ogl_canvashelper.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index a27f69ba1085..337089031dce 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -663,7 +663,7 @@ namespace cairocanvas
{
int i;
- OSL_ASSERT( rColors.getLength() == rStops.getLength() );
+ 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 d2edda651e4f..349e989bfd2b 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];
- OSL_ASSERT(nNumCols == rValues.maStops.getLength());
+ assert(nNumCols == rValues.maStops.getLength());
switch( rValues.meType )
{