diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-19 11:55:44 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-19 13:08:29 +0200 |
commit | 39e63bfac528d8c5c002ee8fef4a1e5d7181b826 (patch) | |
tree | 8e8dc14e1719c361ccf0cdaccde66b3b7862b1e7 /sfx2/source | |
parent | 367105e0248c7b80b60b2554d04f5f248b4259b3 (diff) |
convert remaing DBG_WARNING to SAL_INFO
and drop the macro
Change-Id: I452ca373d0c277166e94928c1bce78bf37e39d7c
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/appcfg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appdde.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/appl/appreg.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/appl/appuno.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/module.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/bastyp/frmhtmlw.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/config/evntconf.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/ctrlitem.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/docinf.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 2 |
17 files changed, 26 insertions, 26 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 2f848311f8ae..bd2b6d81dfdd 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -480,7 +480,7 @@ bool SfxApplication::GetOptions( SfxItemSet& rSet ) break; default: - DBG_WARNING( "W1:Wrong ID while getting Options!" ); + SAL_INFO( "sfx", "W1:Wrong ID while getting Options!" ); break; } #ifdef DBG_UTIL diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 91abb167999c..c4571035f240 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -92,15 +92,15 @@ namespace } catch( const ucb::CommandAbortedException& ) { - DBG_WARNING( "CommandAbortedException" ); + SAL_INFO( "sfx2.appl", "CommandAbortedException" ); } catch( const ucb::IllegalIdentifierException& ) { - DBG_WARNING( "IllegalIdentifierException" ); + SAL_INFO( "sfx2.appl", "IllegalIdentifierException" ); } catch( const ucb::ContentCreationException& ) { - DBG_WARNING( "IllegalIdentifierException" ); + SAL_INFO( "sfx2.appl", "IllegalIdentifierException" ); } catch( const uno::Exception& ) { diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index 0b618ce5dbe8..ee82f244a503 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -81,7 +81,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("TbxController registration is not clearly defined!"); + SAL_INFO("sfx", "TbxController registration is not clearly defined!"); } } #endif @@ -106,7 +106,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("StbController registration is not clearly defined!"); + SAL_INFO("sfx", "StbController registration is not clearly defined!"); } } #endif @@ -131,7 +131,7 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("MenuController register is not clearly defined!"); + SAL_INFO("sfx", "MenuController register is not clearly defined!"); } } #endif diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 5f1a86aad79d..0055cead77c9 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -247,7 +247,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert { OStringBuffer aStr("MacroPlayer: wrong number of parameters for slot: "); aStr.append(static_cast<sal_Int32>(nSlotId)); - DBG_WARNING(aStr.getStr()); + SAL_INFO("sfx2.appl", aStr.getStr()); } #endif // complex property; collect sub items from the parameter set and reconstruct complex item @@ -908,7 +908,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert // except for the "special" slots: assure that every argument was convertible OStringBuffer aStr("MacroPlayer: Some properties didn't match to any formal argument for slot: "); aStr.append(pSlot->pUnoName); - DBG_WARNING( aStr.getStr() ); + SAL_INFO( "sfx2.appl", aStr.getStr() ); } #endif } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 4834fd89fe1e..e678f4e8bebb 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -290,7 +290,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, if ( pChild && !pChild->pWindow ) { DELETEZ(pChild); - DBG_WARNING("ChildWindow has no Window!"); + SAL_INFO("sfx2.appl", "ChildWindow has no Window!"); } return pChild; diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 63b72900b7ca..b551fb4cbb90 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -246,7 +246,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("TbxController-Registering is not clearly defined!"); + SAL_INFO("sfx2.appl", "TbxController-Registering is not clearly defined!"); } } #endif @@ -268,7 +268,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact ) if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("TbxController-Registering is not clearly defined!"); + SAL_INFO("sfx2.appl", "TbxController-Registering is not clearly defined!"); } } #endif @@ -290,7 +290,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact ) if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("MenuController-Registering is not clearly defined!"); + SAL_INFO("sfx2.appl", "MenuController-Registering is not clearly defined!"); } } #endif diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 35a6cc641c2d..b80f5a5c467f 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -279,7 +279,7 @@ OUString getCurrentModuleIdentifier_Impl() } catch (const ::com::sun::star::frame::UnknownModuleException&) { - DBG_WARNING( "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" ); + SAL_INFO( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" ); } catch (const Exception&) { diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 5d4f1ad7bc82..568c380fcf71 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -226,7 +226,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, catch (const uno::Exception&) { // may happen with concurrent modification... - DBG_WARNING("SfxFrameHTMLWriter::Out_DocInfo: exception"); + SAL_INFO("sfx", "SfxFrameHTMLWriter::Out_DocInfo: exception"); } } } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index ced9245fb4cd..04388e7c406f 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -255,7 +255,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, const OUString& aEventName, cons } } else { - DBG_WARNING( "PropagateEvents_Impl: Got unknown event" ); + SAL_INFO( "sfx.config", "PropagateEvents_Impl: Got unknown event" ); } } } diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index aa4dbde381d1..ec9e8cbf9f91 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -369,7 +369,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const } } - DBG_WARNING( "W1: Can not find ItemPool!" ); + SAL_INFO( "sfx.control", "W1: Can not find ItemPool!" ); return SFX_MAPUNIT_100TH_MM; } diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 2faa75ca6a45..8b63eaa20bc4 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -291,7 +291,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ) while ( pIF ); - DBG_WARNING( "W3: invalidating slot-id unknown in shell" ); + SAL_INFO( "sfx.control", "W3: invalidating slot-id unknown in shell" ); } } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index f38e7f1050d0..4a243ca24d10 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -850,7 +850,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util } #ifdef DBG_UTIL else - DBG_WARNING("MacroPlayer: Unknown slot dispatched!"); + SAL_INFO("sfx.control", "MacroPlayer: Unknown slot dispatched!"); #endif } } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 38d53bcc2439..285dabc82caf 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -361,7 +361,7 @@ SfxTabDialog::SfxTabDialog , pExampleSet(0) { Init_Impl(bEditFmt); - DBG_WARNING( "Please use the Construtor with the ViewFrame" ); + SAL_INFO( "sfx.config", "Please use the Construtor with the ViewFrame" ); } @@ -1234,7 +1234,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) DBG_ASSERT( pDataObject, "no Data structure for current page" ); if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand ) { - DBG_WARNING( "Data exchange in ItemsOnDemand is not desired!" ); + SAL_INFO( "sfx.config", "Data exchange in ItemsOnDemand is not desired!" ); } #endif diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index ec18c6dec433..3a5d8b96c231 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -293,7 +293,7 @@ bool SaveOlePropertySet( catch (const uno::Exception &) { // may happen with concurrent modification... - DBG_WARNING("SavePropertySet: exception"); + SAL_INFO("sfx", "SavePropertySet: exception"); } } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 5a1b04c15fcc..1b12c33ac9bc 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -278,7 +278,7 @@ void SfxObjectShell::EnableSetModified( bool bEnable ) { #ifdef DBG_UTIL if ( bEnable == pImp->m_bEnableSetModified ) - DBG_WARNING( "SFX_PERSIST: EnableSetModified 2x called with the same value" ); + SAL_INFO( "sfx", "SFX_PERSIST: EnableSetModified 2x called with the same value" ); #endif pImp->m_bEnableSetModified = bEnable; } @@ -339,7 +339,7 @@ void SfxObjectShell::SetModified( bool bModifiedP ) { #ifdef DBG_UTIL if ( !bModifiedP && !IsEnableSetModified() ) - DBG_WARNING( "SFX_PERSIST: SetModified( sal_False ), although IsEnableSetModified() == sal_False" ); + SAL_INFO( "sfx", "SFX_PERSIST: SetModified( sal_False ), although IsEnableSetModified() == sal_False" ); #endif if( !IsEnableSetModified() ) diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 5a94cd38e65d..eabf1aa36a0d 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -188,7 +188,7 @@ void SfxMenuControl::StateChanged if ( pOwnMenu->GetSVMenu()->GetItemText( GetId() ) != GetTitle() ) { - DBG_WARNING("Title of menu item changed - please check if this needs correction!"); + SAL_INFO("sfx", "Title of menu item changed - please check if this needs correction!"); } return; } diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 9670094ca6ec..68bbca3e9f2c 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -900,7 +900,7 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) bool bRet = pMenu && Bind_Impl(pMenu); #ifdef DBG_UTIL if ( !bRet) - DBG_WARNING( "W1: Virtual menu could not be created!" ); + SAL_INFO( "sfx", "W1: Virtual menu could not be created!" ); #endif return bRet; } |