summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-30 04:57:16 +0100
committerDavid Tardon <dtardon@redhat.com>2013-03-30 17:37:54 +0000
commit083092e808ed94325f103a721cc11882c6878b06 (patch)
treea2c0f1df692585d0fbe78f996e2e0ff89489f097 /sc
parent3e0ff98f5371db2270a607306ae498f8d0d02d1d (diff)
OSL_FAIL -> SAL_WARN
Change-Id: I1871e5e3a319b2d5177ae4bd470046c022c14eb7 Reviewed-on: https://gerrit.libreoffice.org/3121 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xlroot.cxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index dbc470346115..3e4b44b62928 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -110,7 +110,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
case SCRIPTTYPE_LATIN: mnDefApiScript = ApiScriptType::LATIN; break;
case SCRIPTTYPE_ASIAN: mnDefApiScript = ApiScriptType::ASIAN; break;
case SCRIPTTYPE_COMPLEX: mnDefApiScript = ApiScriptType::COMPLEX; break;
- default: OSL_FAIL( "XclRootData::XclRootData - unknown script type" );
+ default: SAL_WARN( "sc", "XclRootData::XclRootData - unknown script type" );
}
// maximum cell position
@@ -151,11 +151,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
}
catch( const Exception& e)
{
-#if OSL_DEBUG_LEVEL > 0
- OSL_FAIL( rtl::OStringBuffer("XclRootData::XclRootData - cannot get output device info: ").append(rtl::OUStringToOString(e.Message,osl_getThreadTextEncoding())).getStr() );
-#else
- (void)e;
-#endif
+ SAL_WARN( "sc", "XclRootData::XclRootData - cannot get output device info: " << e.Message );
}
}
@@ -220,7 +216,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
if( mrData.mnCharWidth <= 0 )
{
// #i48717# Win98 with HP LaserJet returns 0
- OSL_FAIL( "XclRoot::SetCharWidth - invalid character width (no printer?)" );
+ SAL_WARN( "sc", "XclRoot::SetCharWidth - invalid character width (no printer?)" );
mrData.mnCharWidth = 11 * rFontData.mnHeight / 20;
}
}