diff options
53 files changed, 91 insertions, 102 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 2eafe912de05..83493ec5de54 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -336,12 +336,7 @@ void DialogWindow::GetState( SfxItemSet& rSet ) case OBJ_DLG_TREECONTROL: nObj = SVX_SNAP_TREECONTROL; break; default: nObj = 0; } -#ifdef DBG_UTIL - if( !nObj ) - { - DBG_WARNING( "SID_CHOOSE_CONTROLS: Unbekannt!" ); - } -#endif + SAL_INFO_IF( !nObj, "basctl.basicide", "SID_CHOOSE_CONTROLS: Unbekannt!" ); aItem.SetValue( nObj ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c8a1a8d9624e..1a8092bec5f5 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1567,7 +1567,7 @@ namespace svx } else { - DBG_WARNING( "+HangulHanjaEditDictDialog::NewPBPushHdl(): dictionary faded away..." ); + SAL_INFO( "cui.dialogs", "dictionary faded away..." ); } } @@ -1650,7 +1650,7 @@ namespace svx } else { - DBG_WARNING( "+HangulHanjaEditDictDialog::UpdateOriginalLB(): dictionary faded away..." ); + SAL_INFO( "cui.dialogs", "dictionary faded away..." ); } } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 41c142222b15..814d5d8f8967 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2122,7 +2122,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2166,7 +2166,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2210,7 +2210,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2254,7 +2254,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 34e370b06d35..e8cdeb4ab50e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1493,7 +1493,7 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) } catch ( css::frame::UnknownModuleException& ) { - DBG_WARNING( "getActiveModule_Impl(): unknown module" ); + SAL_INFO( "cui.options", "unknown module" ); } catch ( Exception& ) { @@ -1847,7 +1847,7 @@ OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& r } catch ( css::frame::UnknownModuleException& ) { - DBG_WARNING( "OfaTreeOptionsDialog::GetModuleIdentifier(): unknown module" ); + SAL_INFO( "cui.options", "unknown module" ); } catch ( Exception& ) { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 1544ab014cde..6332468ad718 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -197,7 +197,7 @@ namespace accessibility void AccessibleEditableTextPara::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, sal_Int32 /*nIndex*/ ) { - DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" ); + SAL_INFO( "editeng", "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" ); rBoundary.startPos = 0; //rBoundary.endPos = GetTextLen(); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 3e35828cdd53..b00d7abe0692 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -353,7 +353,7 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const if ( ePitch != rItem.ePitch || eTextEncoding != rItem.eTextEncoding ) { bRet = false; - DBG_WARNING( "FontItem::operator==(): only pitch or rtl_TextEncoding different "); + SAL_INFO( "editeng", "FontItem::operator==(): only pitch or rtl_TextEncoding different "); } } return bRet; diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 34cee4ac8444..b3d639094827 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -638,7 +638,7 @@ namespace editeng // hangul or hanja character in the first text if ( !implRetrieveNextPortion() ) { - DBG_WARNING( "HangulHanjaConversion_Impl::DoDocumentConversion: why did you call me if you do have nothing to convert?" ); + SAL_INFO( "editeng", "HangulHanjaConversion_Impl::DoDocumentConversion: why did you call me if you do have nothing to convert?" ); // nothing to do return; } diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 818713ae6f9c..728359d65af2 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -138,7 +138,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe xConn = Reference< XConnection > (*static_cast<Reference< XInterface > const *>(xFormProps->getPropertyValue("ActiveConnection").getValue()), UNO_QUERY); if (!xConn.is()) { - DBG_WARNING("no active connection"); + SAL_INFO("extensions", "no active connection"); } } catch (const Exception&) diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index feeeaa23fc14..7d0b9391ef96 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -179,7 +179,7 @@ namespace pcr xContainer->getByIndex(i) >>= xAsSet; if (!xAsSet.is()) { - DBG_WARNING("OSelectLabelDialog::InsertEntries : strange : a form component which isn't a property set !"); + SAL_INFO("extensions", "OSelectLabelDialog::InsertEntries : strange : a form component which isn't a property set !"); continue; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 5eb5f8efedd1..d76d89b8aa0c 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -224,7 +224,7 @@ namespace } catch( const css::uno::Exception& ) { - DBG_WARNING( "Exception in lcl_autoUpdateFileExtension" ); + SAL_INFO( "fpicker", "Exception in lcl_autoUpdateFileExtension" ); } } } diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index 3dfafab4b860..e8a128adcf33 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -32,8 +32,7 @@ Because the assertion macro (DBG_ASSERT) has been used for true assertions as well as to log warnings, it maps to SAL_WARN instead of - standard assert. The warning and error macros (DBG_ASSERTWARNING, - DBG_WARNING) all map to + standard assert. The warning and error macros (DBG_ASSERTWARNING) all map to SAL_INFO. */ @@ -71,9 +70,6 @@ do \ #define DBG_ASSERT( sCon, aError ) \ SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", "%s", aError) -#define DBG_WARNING( aWarning ) \ - SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", "%s", aWarning) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index f965021d0dc2..c5b52d3ff070 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -413,10 +413,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case EXC_BIFF3: case EXC_BIFF4: aIn.Ignore( 10 ); break; case EXC_BIFF5: - DBG_WARNING( "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); //fall-through default: - DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1B: // End External Reference [330 ] @@ -426,10 +426,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case EXC_BIFF3: case EXC_BIFF4: aIn.Ignore( 4 ); break; case EXC_BIFF5: - DBG_WARNING( "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); //fall-through default: - DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1C: // Error Value [314 266] @@ -1027,9 +1027,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case EXC_BIFF2: nIgnore = 7; break; case EXC_BIFF3: case EXC_BIFF4: nIgnore = 10; break; - case EXC_BIFF5: DBG_WARNING( "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); + case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); //fall-through - default: DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1B: // End External Reference [330 ] @@ -1038,9 +1038,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case EXC_BIFF2: nIgnore = 3; break; case EXC_BIFF3: case EXC_BIFF4: nIgnore = 4; break; - case EXC_BIFF5: DBG_WARNING( "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); + case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); //fall-through - default: DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1C: // Error Value [314 266] diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 70a1443c2e7e..5d03cea81f69 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -367,7 +367,7 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix xAttrList ); break; case XML_TOK_DOC_META: - DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); + SAL_INFO("sc", "XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); break; case XML_TOK_DOC_SCRIPTS: if (GetScImport().getImportFlags() & SvXMLImportFlags::SCRIPTS) diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 5e4197247705..e42370313e02 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1785,7 +1785,7 @@ bool HtmlExport::CreateHtmlForPresPages() default: { - DBG_WARNING("unknown IMAP_OBJ_type"); + SAL_INFO("sd", "unknown IMAP_OBJ_type"); } break; } diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 1278444df3ec..e216cbf5e310 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -198,7 +198,7 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) { //this case is not 100% correct -> feel free to complete //i consider this case as seldom and not that problematic and a simple correct fix is not in sight - DBG_WARNING("you tried to deselect the animation of the form for random animation-> this has been refused"); + SAL_INFO("sd", "you tried to deselect the animation of the form for random animation-> this has been refused"); return; } diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 5d79a3e0dbc0..7ed8a970f5d8 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -379,7 +379,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( break; default: - DBG_WARNING("wrong slot id given to CreateOrDuplicatePage"); + SAL_INFO("sd", "wrong slot id given to CreateOrDuplicatePage"); // Try to handle another slot id gracefully. } SdPage* pNewPage = 0; 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; } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 595c80e5790b..695132eef1f0 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -71,7 +71,7 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const { - DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); + SAL_INFO("svl", "SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); return OUString(); } diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 02dcdaf84de1..e08bc41f7fc5 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -69,7 +69,7 @@ bool SfxFlagItem::GetPresentation sal_uInt8 SfxFlagItem::GetFlagCount() const { - DBG_WARNING("calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); + SAL_INFO("svl", "calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); return 0; } @@ -77,7 +77,7 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const { - DBG_WARNING("calling Create() on SfxFlagItem -- override!"); + SAL_INFO("svl", "calling Create() on SfxFlagItem -- override!"); return 0; } diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 85e7b13c31d4..b1e9647cc933 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -480,7 +480,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) for( size_t n = (*itrItemArr)->size(); n; --n, ++ppHtArr ) if (*ppHtArr) { - DBG_WARNING( "loading non-empty ItemPool" ); + SAL_INFO( "svl", "loading non-empty ItemPool" ); AddRef( **ppHtArr ); } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index f55d7a2712b1..3212f0de5a8c 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -50,27 +50,27 @@ SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich) ++nItemCount; if ( pw1 && nItemCount>=10000 ) { - DBG_WARNING( pw1 ); + SAL_INFO( "svl", pw1 ); pw1 = NULL; } if ( pw2 && nItemCount>=100000 ) { - DBG_WARNING( pw2 ); + SAL_INFO( "svl", pw2 ); pw2 = NULL; } if ( pw3 && nItemCount>=1000000 ) { - DBG_WARNING( pw3 ); + SAL_INFO( "svl", pw3 ); pw3 = NULL; } if ( pw4 && nItemCount>=5000000 ) { - DBG_WARNING( pw4 ); + SAL_INFO( "svl", pw4 ); pw4 = NULL; } if ( pw5 && nItemCount>=10000000 ) { - DBG_WARNING( pw5 ); + SAL_INFO( "svl", pw5 ); pw5 = NULL; } #endif @@ -86,27 +86,27 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy ) ++nItemCount; if ( pw1 && nItemCount>=10000 ) { - DBG_WARNING( pw1 ); + SAL_INFO( "svl", pw1 ); pw1 = NULL; } if ( pw2 && nItemCount>=100000 ) { - DBG_WARNING( pw2 ); + SAL_INFO( "svl", pw2 ); pw2 = NULL; } if ( pw3 && nItemCount>=1000000 ) { - DBG_WARNING( pw3 ); + SAL_INFO( "svl", pw3 ); pw3 = NULL; } if ( pw4 && nItemCount>=5000000 ) { - DBG_WARNING( pw4 ); + SAL_INFO( "svl", pw4 ); pw4 = NULL; } if ( pw5 && nItemCount>=10000000 ) { - DBG_WARNING( pw5 ); + SAL_INFO( "svl", pw5 ); pw5 = NULL; } #endif diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index b8d6ec17b1d1..7c84374a7eb5 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -956,12 +956,12 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) } catch( ::com::sun::star::ucb::CommandAbortedException const & ) { - DBG_WARNING( "CommandAbortedException" ); + SAL_INFO( "svtools", "CommandAbortedException" ); bRet = false; } catch( Exception const & ) { - DBG_WARNING( "Any other exception" ); + SAL_INFO( "svtools", "Any other exception" ); bRet = false; } @@ -2034,7 +2034,7 @@ bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl* co bEqual = true; break; default: - DBG_WARNING( "CompareSortingData_Impl: Compare unknown type!" ); + SAL_INFO( "svtools", "CompareSortingData_Impl: Compare unknown type!" ); bRet = false; } } diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 9ca22786a81a..da90bfe49eb0 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -473,12 +473,12 @@ void IcnCursor_Impl::SetDeltas() if( !nDeltaHeight ) { nDeltaHeight = 1; - DBG_WARNING("SetDeltas:Bad height"); + SAL_INFO("svtools", "SetDeltas:Bad height"); } if( !nDeltaWidth ) { nDeltaWidth = 1; - DBG_WARNING("SetDeltas:Bad width"); + SAL_INFO("svctools", "SetDeltas:Bad width"); } } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index fe4035f9e0d7..4aaf9f46569b 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3817,7 +3817,7 @@ std::unique_ptr<PopupMenu> SvTreeListBox::CreateContextMenu() void SvTreeListBox::ExcecuteContextMenuAction( sal_uInt16 ) { - DBG_WARNING( "SvTreeListBox::ExcecuteContextMenuAction(): now there's happening nothing!" ); + SAL_INFO( "svtools", "SvTreeListBox::ExcecuteContextMenuAction(): now there's happening nothing!" ); } void SvTreeListBox::EnableContextMenuHandling() diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 5b4d6a9936ac..1ce6f4418855 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -37,7 +37,7 @@ void AsynchronLink::Call( void* pObj, bool bAllowDoubles, bool bUseTimer ) { #ifdef DBG_UTIL if ( bUseTimer || !_bInCall ) - DBG_WARNING( "Recursives Call. Eher ueber Timer. TLX Fragen" ); + SAL_INFO( "svtools", "Recursives Call. Eher ueber Timer. TLX Fragen" ); #endif if( _aLink.IsSet() ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index df0c0cd1514c..84bc9d7dfd0a 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -348,7 +348,7 @@ void FormattedField::SetTextFormatted(const OUString& rStr) #if defined DBG_UTIL if (ImplGetFormatter()->IsTextFormat(m_nFormatKey)) - DBG_WARNING("FormattedField::SetTextFormatted : valid only with text formats !"); + SAL_INFO("svtools", "FormattedField::SetTextFormatted : valid only with text formats !"); #endif m_sCurrentTextValue = rStr; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 9d23b09376cf..3a166ed9e781 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1917,11 +1917,11 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf if( !nLen && aString[ 0 ] != '0' ) { - DBG_WARNING( "SOLK: 1. len=0" ); + SAL_INFO( "svtools", "SOLK: 1. len=0" ); } if( nStart == -1 || nLen > aString.getLength() - nStart - 3 ) { - DBG_WARNING( "SOLK: 1. illegal start or wrong len" ); + SAL_INFO( "svtools", "SOLK: 1. illegal start or wrong len" ); } aURL = aString.copy( nStart + 1, nLen ); @@ -1931,11 +1931,11 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf if( !nLen && aString[ 0 ] != '0' ) { - DBG_WARNING( "SOLK: 2. len=0" ); + SAL_INFO( "svtools", "SOLK: 2. len=0" ); } if( nStart == -1 || nLen > aString.getLength() - nStart - 1 ) { - DBG_WARNING( "SOLK: 2. illegal start or wrong len" ); + SAL_INFO( "svtools", "SOLK: 2. illegal start or wrong len" ); } aDesc = aString.copy( nStart+1, nLen ); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 5fcf31df9a95..5c85ac7f1a87 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1310,7 +1310,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x } else { - DBG_WARNING("DbFormattedField::Init : my uno-model has no format-key, but a formats supplier !"); + SAL_INFO("svx", "DbFormattedField::Init : my uno-model has no format-key, but a formats supplier !"); // the OFormattedModel which we usually are working with ensures that the model has a format key // as soon as the form is loaded. Unfortunally this method here is called from within loaded, too. // So if our LoadListener is called before the LoadListener of the model, this "else case" is diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index fdc80be80c59..d7c43f20297e 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2258,14 +2258,14 @@ sal_Int32 DbGridControl::AlignSeekCursor() if ( m_pDataCursor->isBeforeFirst() ) { // this is somewhat strange, but can nevertheless happen - DBG_WARNING( "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (before first)!" ); + SAL_INFO( "svx", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (before first)!" ); m_pSeekCursor->first(); m_pSeekCursor->previous(); m_nSeekPos = -1; } else if ( m_pDataCursor->isAfterLast() ) { - DBG_WARNING( "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (after last)!" ); + SAL_INFO( "svx", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (after last)!" ); m_pSeekCursor->last(); m_pSeekCursor->next(); m_nSeekPos = -1; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 19dc0480f242..f1d8adbc9a95 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -128,7 +128,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, } else { - DBG_WARNING( "use SfxZoomItem for SID_ATTR_ZOOM" ); + SAL_INFO( "svx", "use SfxZoomItem for SID_ATTR_ZOOM" ); nValueSet = SvxZoomEnableFlags::ALL; } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d100e1125ba5..c60f81a95e75 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2373,7 +2373,7 @@ void SvxStyleToolBoxControl::Update() if ( !pItem ) { - DBG_WARNING( "Unknown Family" ); // can happen + SAL_INFO( "svx", "Unknown Family" ); // can happen } } else if ( pPool != pStyleSheetPool ) diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index ab0f95129d0f..06ad8e55571d 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -501,7 +501,7 @@ sal_uInt32 SvPersistStream::ReadObj OStringBuffer aStr("no class with id: " ); aStr.append(static_cast<sal_Int32>(nClassId)); aStr.append(" registered"); - DBG_WARNING(aStr.getStr()); + SAL_INFO("tools", aStr.getStr()); #else (void)nObjLen; #endif diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index e0b486f91571..140a902db303 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1318,7 +1318,7 @@ ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize) nSize = 0; } else { - DBG_WARNING("Not truncatable!"); + SAL_INFO("unotools", "Not truncatable!"); } } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index a3ebd0eec1bb..1ff761ccba50 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -524,7 +524,7 @@ void GenPspGraphics::drawMask( const SalTwoRect&, SalBitmap* GenPspGraphics::getBitmap( long, long, long, long ) { - DBG_WARNING ("Warning: PrinterGfx::GetBitmap() not implemented"); + SAL_INFO("vcl", "Warning: PrinterGfx::GetBitmap() not implemented"); return NULL; } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 4cc145f9060c..45a6c024206d 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -134,7 +134,7 @@ vcl::Window* ImplGetDefaultWindow() if ( !pSVData->mpDefaultWin && !pSVData->mbDeInit ) { - DBG_WARNING( "ImplGetDefaultWindow(): No AppWindow" ); + SAL_INFO( "vcl", "ImplGetDefaultWindow(): No AppWindow" ); pSVData->mpDefaultWin = VclPtr<WorkWindow>::Create( nullptr, WB_DEFAULTWIN ); pSVData->mpDefaultWin->SetText( OUString( "VCL ImplGetDefaultWindow" ) ); diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 16bb316496eb..d0556a98ed75 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -306,7 +306,6 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags ) { // here we already switch focus as ToTop() // should not give focus to another window - //DBG_WARNING( "Window::GrabFocus() - Frame doesn't have the focus" ); mpWindowImpl->mpFrame->ToTop( SAL_FRAME_TOTOP_GRABFOCUS | SAL_FRAME_TOTOP_GRABFOCUS_ONLY ); return; } diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 8c37b3a70b07..e2ec978443a1 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -112,9 +112,8 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext( pContext = new SvXMLStylesContext( GetImport(), nPrefix, rLocalName, xAttrList ); break; case XML_TOK_DOC_META: - // we come here in the flat ODF file format, - // if XDocumentPropertiesSupplier is not supported at the model -// DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); + // we come here in the flat ODF file format, + // if XDocumentPropertiesSupplier is not supported at the model pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); break; case XML_TOK_DOC_BODY: |