[Libreoffice-commits] core.git: include/canvas slideshow/source stoc/test

[Noel Grandin]

 include/canvas/canvastools.hxx               |    2 --
 slideshow/source/engine/animationfactory.cxx |    4 ----
 stoc/test/javavm/testjavavm.cxx              |    1 -
 stoc/test/testconv.cxx                       |    1 -
 stoc/test/testcorefl.cxx                     |    1 -
 stoc/test/testintrosp.cxx                    |    1 -
 6 files changed, 10 deletions(-)

New commits:
commit 690cf2a5ac87d3d05c45a86944e7f6b0adf12cf2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Dec 15 12:26:28 2016 +0200

    no point in having both SAL_WARN and OSL_FAIL for the same thing
    
    Change-Id: I1beafff257e968a62184f8b1d8cf2a3a24e7c945
    Reviewed-on: https://gerrit.libreoffice.org/32039
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 261a490..df97d3f 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -461,7 +461,6 @@ namespace canvas
                     aStr != aStr.toAsciiLowerCase() )
                 {
                     SAL_WARN("canvas", "ValueMap::ValueMap(): Key is not lowercase " << pMap->maKey);
-                    OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" );
                 }
 
                 if( mnEntries > 1 )
@@ -481,7 +480,6 @@ namespace canvas
                             aStr2 != aStr2.toAsciiLowerCase() )
                         {
                             SAL_WARN("canvas", "ValueMap::ValueMap(): Key is not lowercase" << pMap[1].maKey);
-                            OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" );
                         }
                     }
                 }
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 0d04f04..c27f7d5 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -678,7 +678,6 @@ namespace slideshow
 
                 if( !rAny.hasValue() )
                 {
-                    OSL_FAIL( "getDefault(): cannot get requested shape property" );
                     SAL_WARN("slideshow", "getDefault(): cannot get shape property " <<  rPropertyName );
                     return ValueType();
                 }
@@ -688,7 +687,6 @@ namespace slideshow
 
                     if( !(rAny >>= aValue) )
                     {
-                        OSL_FAIL( "getDefault(): cannot extract requested shape property" );
                         SAL_WARN("slideshow", "getDefault(): cannot extract shape property " << rPropertyName);
                         return ValueType();
                     }
@@ -705,7 +703,6 @@ namespace slideshow
 
                 if( !rAny.hasValue() )
                 {
-                    OSL_FAIL( "getDefault(): cannot get requested shape color property" );
                     SAL_WARN("slideshow", "getDefault(): cannot get shape color property " << rPropertyName);
                     return RGBColor();
                 }
@@ -715,7 +712,6 @@ namespace slideshow
 
                     if( !(rAny >>= nValue) )
                     {
-                        OSL_FAIL( "getDefault(): cannot extract requested shape color property" );
                         SAL_INFO("slideshow", "getDefault(): cannot extract shape color property " << rPropertyName);
                         return RGBColor();
                     }
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index f856f76..e7d0c4d 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -138,7 +138,6 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (const Exception & rExc)
     {
-        OSL_FAIL( "### exception occurred!" );
         SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 2eebdef..1e9aae1 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -671,7 +671,6 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (const Exception & rExc)
     {
-        OSL_FAIL( "### exception occurred!" );
         SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 7aa06a9..3b2a02c 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -367,7 +367,6 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (const Exception & rExc)
     {
-        OSL_FAIL( "### exception occurred!" );
         SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index caff133..2d5a682 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1195,7 +1195,6 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (const Exception & rExc)
     {
-        OSL_FAIL( "### exception occurred!" );
         SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }