diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-08 15:07:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-08 15:07:06 +0300 |
| commit | 256f1925826436ed8902848369a5744b4d2f22b8 (patch) | |
| tree | 4f93fcb4969c6a4a350bc8fa5fe611fb8c255d57 /sfx2 | |
| parent | 6b900b8bede24c8710d62e9e7cbff613a0b12f9f (diff) | |
Revert "Introduced OSL_FORMAT, adpated some places to it."
Breaks the MSVC build for me: 'osl_detail_formatString' : C linkage
function cannot return C++ class 'rtl::OString'.
This reverts commit 6b900b8bede24c8710d62e9e7cbff613a0b12f9f.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/module.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 6883e90f5ff5..8fa50b38077a 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -391,11 +391,13 @@ FieldUnit SfxModule::GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com SfxPoolItem const * pItem = pModule->GetItem( SID_ATTR_METRIC ); if ( pItem == NULL ) { - OSL_FAIL( - OSL_FORMAT( - ("SfxModule::GetFieldUnit: no metric item in the module" - " implemented by '%s'!"), - typeid(*pModule).name())); +#if OSL_DEBUG_LEVEL > 0 + ::rtl::OStringBuffer message; + message.append( "SfxModule::GetFieldUnit: no metric item in the module implemented by '" ); + message.append( typeid( *pModule ).name() ); + message.append( "'!" ); + OSL_ENSURE( false, message.makeStringAndClear().getStr() ); +#endif return FUNIT_100TH_MM; } return (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue(); |