diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 09:34:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 09:41:47 +0100 |
| commit | 70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1 (patch) | |
| tree | ffb31ef817b5f2037cf7c332da422b9179d613d5 /sfx2/source/appl | |
| parent | f2972242673cc9608960e9ca70e82766be5275e3 (diff) | |
New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
addressed.
* Some replacements tools String -> rtl::OUString.
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/module.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 6883e90f5ff5..a4fc06dea36e 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -50,6 +50,7 @@ #include "sfx2/taskpane.hxx" #include <tools/diagnose_ex.h> #include <rtl/strbuf.hxx> +#include <sal/log.h> #define SfxModule #include "sfxslots.hxx" @@ -208,7 +209,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId) { pImpl->pFactArr->Remove( nFactory ); - OSL_FAIL("ChildWindow registered multiple times!"); + SAL_WARN("sfx2", "ChildWindow registered multiple times!"); return; } } @@ -391,11 +392,10 @@ 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())); + SAL_WARN_S( + "sfx2", + "SfxModule::GetFieldUnit: no metric item in the module implemented" + " by '" << typeid(*pModule).name() << "'!"); return FUNIT_100TH_MM; } return (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue(); |