diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-22 09:10:09 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-22 09:10:54 +0200 |
| commit | 2e32eff6f1a6ac8bc0ef65e07300531d6f45275b (patch) | |
| tree | a4bf8b44fa7e23a3d98098a4ac61a246bec2e4b0 /writerfilter | |
| parent | f43dd61f092e3df6c58a48f587f3cd2fe4238675 (diff) | |
Use SAL_WARN{,_IF}
Change-Id: Idd4693bd48b4bbe3ebfb5c86922ab0edfeba0def
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/CellMarginHandler.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index 6e28f6281856..6d223c263f11 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -21,7 +21,6 @@ #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> #include <comphelper/sequence.hxx> -#include <osl/diagnose.h> namespace writerfilter { namespace dmapper { @@ -61,11 +60,11 @@ void CellMarginHandler::lcl_attribute(Id rName, Value & rVal) m_nValue = ConversionHelper::convertTwipToMM100Unsigned( nIntValue ); break; case NS_ooxml::LN_CT_TblWidth_type: - OSL_ENSURE( NS_ooxml::LN_Value_ST_TblWidth_dxa == sal::static_int_cast<Id>(nIntValue), "cell margins work for absolute values, only"); + SAL_WARN_IF(NS_ooxml::LN_Value_ST_TblWidth_dxa != sal::static_int_cast<Id>(nIntValue), "writerfilter", "CellMarginHandler: cell margins work for absolute values only"); m_nType = nIntValue; break; default: - OSL_FAIL( "unknown attribute"); + SAL_WARN("writerfilter", "CellMarginHandler::lcl_attribute: unknown attribute"); } } @@ -153,7 +152,7 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) createGrabBag("right"); break; default: - OSL_FAIL( "unknown sprm"); + SAL_WARN("writerfilter", "CellMarginHandler::lcl_sprm: unknown sprm"); } } m_nValue = 0; |