[Libreoffice-commits] core.git: basegfx/source

drazil abcdefghi236 at gmail.com
Mon Aug 29 09:16:07 UTC 2016


 basegfx/source/tools/b2dclipstate.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 41ce5e234c5b884b2efd426f46caec2831545b45
Author: drazil <abcdefghi236 at gmail.com>
Date:   Sat Aug 27 08:22:47 2016 +0800

    tdf#43157 Clean up OSL_ASSERT
    
    Clean up OSL_ASSERT in basegfx/source/tools/b2dclipstate.cxx
    
    Change-Id: I4107980aa079b0e0e8605de34ecfd01587647af6
    Reviewed-on: https://gerrit.libreoffice.org/28417
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx
index 84e8e2c..db09324 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -196,7 +196,7 @@ namespace tools
             switch(mePendingOps)
             {
                 case UNION:
-                    OSL_ASSERT( !bIsCleared );
+                    assert( !bIsCleared );
 
                     if( bIsEmpty )
                         maClipPoly = maPendingPolygons;
@@ -206,7 +206,7 @@ namespace tools
                             maPendingPolygons);
                     break;
                 case INTERSECT:
-                    OSL_ASSERT( !bIsEmpty );
+                    assert( !bIsEmpty );
 
                     if( bIsCleared )
                         maClipPoly = maPendingPolygons;
@@ -240,7 +240,7 @@ namespace tools
                             maPendingPolygons);
                     break;
                 case SUBTRACT:
-                    OSL_ASSERT( !bIsEmpty );
+                    assert( !bIsEmpty );
 
                     // first union all pending ones, subtract en bloc then
                     maPendingPolygons = solveCrossovers(maPendingPolygons);
@@ -286,7 +286,7 @@ namespace tools
             switch(mePendingOps)
             {
                 case UNION:
-                    OSL_ASSERT( !bIsCleared );
+                    assert( !bIsCleared );
 
                     aCollectedRanges = maPendingRanges.solveCrossovers();
                     aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
@@ -299,7 +299,7 @@ namespace tools
                             aCollectedRanges);
                     break;
                 case INTERSECT:
-                    OSL_ASSERT( !bIsEmpty );
+                    assert( !bIsEmpty );
 
                     aCollectedRanges = maPendingRanges.solveCrossovers();
                     aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
@@ -342,7 +342,7 @@ namespace tools
                             aCollectedRanges);
                     break;
                 case SUBTRACT:
-                    OSL_ASSERT( !bIsEmpty );
+                    assert( !bIsEmpty );
 
                     // first union all pending ranges, subtract en bloc then
                     aCollectedRanges = maPendingRanges.solveCrossovers();


More information about the Libreoffice-commits mailing list