summaryrefslogtreecommitdiff
path: root/basegfx
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 11:47:36 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:19:17 +0100
commitd86e9a3906b5c2c51a7a04dac0a63c9f74196991 (patch)
tree6edeb296b93516795e8159f8c2ee04c544cc1874 /basegfx
parente6216e1ce6b399a10019b5d11b6fef6961fc0f74 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'basegfx')
-rw-r--r--basegfx/inc/basegfx/raster/bpixelraster.hxx4
-rw-r--r--basegfx/inc/basegfx/raster/bzpixelraster.hxx4
-rw-r--r--basegfx/source/matrix/b2dhommatrixtools.cxx2
-rw-r--r--basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx3
-rw-r--r--basegfx/source/polygon/b2dsvgpolypolygon.cxx2
-rw-r--r--basegfx/source/polygon/b2dtrapezoid.cxx4
-rw-r--r--basegfx/source/tools/keystoplerp.cxx3
7 files changed, 10 insertions, 12 deletions
diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx
index b479384bb806..e5615325cf0d 100644
--- a/basegfx/inc/basegfx/raster/bpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx
@@ -92,7 +92,7 @@ namespace basegfx
#ifdef DBG_UTIL
if(nIndex >= mnCount)
{
- OSL_ENSURE(false, "getBPixel: Access out of range (!)");
+ OSL_FAIL("getBPixel: Access out of range (!)");
return BPixel::getEmptyBPixel();
}
#endif
@@ -105,7 +105,7 @@ namespace basegfx
#ifdef DBG_UTIL
if(nIndex >= mnCount)
{
- OSL_ENSURE(false, "getBPixel: Access out of range (!)");
+ OSL_FAIL("getBPixel: Access out of range (!)");
return mpContent[0L];
}
#endif
diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
index 9e3cd6db36f1..b849f2491289 100644
--- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
@@ -72,7 +72,7 @@ namespace basegfx
#ifdef DBG_UTIL
if(nIndex >= mnCount)
{
- OSL_ENSURE(false, "getZ: Access out of range (!)");
+ OSL_FAIL("getZ: Access out of range (!)");
return mpZBuffer[0L];
}
#endif
@@ -85,7 +85,7 @@ namespace basegfx
#ifdef DBG_UTIL
if(nIndex >= mnCount)
{
- OSL_ENSURE(false, "getZ: Access out of range (!)");
+ OSL_FAIL("getZ: Access out of range (!)");
return mpZBuffer[0L];
}
#endif
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 8c4b2d68a79b..5c24aaec973d 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -95,7 +95,7 @@ namespace basegfx
break;
default:
- OSL_ENSURE( false, "createSinCos: Impossible case reached" );
+ OSL_FAIL( "createSinCos: Impossible case reached" );
}
}
else
diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
index d6e1dee3fe6c..95c310b7dcc9 100644
--- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
@@ -591,8 +591,7 @@ namespace basegfx
switch( eFillRule )
{
default:
- OSL_ENSURE(false,
- "B2DPolyPolygonRasterConverter::rasterConvert(): Unexpected fill rule");
+ OSL_FAIL("B2DPolyPolygonRasterConverter::rasterConvert(): Unexpected fill rule");
return;
case FillRule_EVEN_ODD:
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index c42ea4d8b65b..50a04dbaa075 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -826,7 +826,7 @@ namespace basegfx
default:
{
- OSL_ENSURE(false, "importFromSvgD(): skipping tags in svg:d element (unknown)!");
+ OSL_FAIL("importFromSvgD(): skipping tags in svg:d element (unknown)!");
OSL_TRACE("importFromSvgD(): skipping tags in svg:d element (unknown: \"%c\")!", aCurrChar);
++nPos;
break;
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 60f45f98d020..ad9c2dbecce4 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -622,7 +622,7 @@ namespace basegfx
// to not have an endless loop and start next. During development
// i constantly had breakpoints here, so i am sure enough to add an
// assertion here
- OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
+ OSL_FAIL("Trapeziod decomposer in illegal state (!)");
maTrDeEdgeEntries.pop_front();
continue;
}
@@ -636,7 +636,7 @@ namespace basegfx
// line; consume the single edge to not have an endless loop and start
// next. During development i constantly had breakpoints here, so i am
// sure enough to add an assertion here
- OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
+ OSL_FAIL("Trapeziod decomposer in illegal state (!)");
maTrDeEdgeEntries.pop_front();
continue;
}
diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx
index 8dc22c4e79e9..ef2ae11b4b0a 100644
--- a/basegfx/source/tools/keystoplerp.cxx
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -45,8 +45,7 @@ static void validateInput(const std::vector<double>& rKeyStops)
for( ::std::size_t i=1, len=rKeyStops.size(); i<len; ++i )
{
if( rKeyStops[i-1] > rKeyStops[i] )
- OSL_ENSURE( false,
- "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" );
+ OSL_FAIL( "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" );
}
#endif
}