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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Noel Grandin
2016-12-15 16:20:54 +00:00
committed by Michael Stahl
parent f0804905ec
commit 690cf2a5ac
6 changed files with 0 additions and 10 deletions
-2
View File
@@ -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" );
}
}
}
@@ -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();
}
-1
View File
@@ -138,7 +138,6 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
-1
View File
@@ -671,7 +671,6 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
-1
View File
@@ -367,7 +367,6 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
-1
View File
@@ -1195,7 +1195,6 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}