From 91fe68f4c2d66dc34b99386f824abdd6c09f6bb1 Mon Sep 17 00:00:00 2001 From: Marcel Metz Date: Mon, 16 Jan 2012 21:38:13 +0100 Subject: Replaced SAL_INFO with SAL_WARN were applicable. --- sfx2/source/appl/appcfg.cxx | 2 +- sfx2/source/appl/appdde.cxx | 2 +- sfx2/source/appl/appserv.cxx | 2 +- sfx2/source/appl/fileobj.cxx | 2 +- sfx2/source/appl/module.cxx | 6 +++--- sfx2/source/appl/newhelp.cxx | 12 ++++++------ sfx2/source/appl/sfxhelp.cxx | 14 +++++++------- sfx2/source/bastyp/helper.cxx | 16 ++++++++-------- sfx2/source/config/evntconf.cxx | 10 +++++++--- sfx2/source/dialog/dinfdlg.cxx | 8 ++++---- sfx2/source/dialog/filedlghelper.cxx | 22 +++++++++++----------- sfx2/source/dialog/filtergrouping.cxx | 8 ++++---- sfx2/source/dialog/mailmodel.cxx | 2 +- sfx2/source/dialog/tabdlg.cxx | 8 ++++---- sfx2/source/doc/doctempl.cxx | 8 ++++---- sfx2/source/doc/doctemplates.cxx | 18 +++++++++++------- sfx2/source/doc/objstor.cxx | 2 +- sfx2/source/doc/oleprops.cxx | 10 +++++----- sfx2/source/notify/eventsupplier.cxx | 6 +++--- sfx2/source/view/viewfrm.cxx | 2 +- 20 files changed, 84 insertions(+), 76 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 500d60ffd022..f68f72d1f7fc 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -877,7 +877,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_TEMPLATE: aPathOptions.SetTemplatePath( sValue );break; case SvtPathOptions::PATH_USERCONFIG: aPathOptions.SetUserConfigPath( sValue );break; case SvtPathOptions::PATH_WORK: aPathOptions.SetWorkPath( sValue );break; - default: SAL_INFO( "sfx2", "SfxApplication::SetOptions_Impl() Invalid path number found for set directories!" ); + default: SAL_WARN( "sfx2.appl", "SfxApplication::SetOptions_Impl() Invalid path number found for set directories!" ); } } } diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 067747c3a2d4..85149bf12972 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -113,7 +113,7 @@ namespace } catch( const uno::Exception& ) { - SAL_INFO( "sfx2", "Any other exception" ); + SAL_WARN( "sfx2.appl", "Any other exception" ); } return bRet; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index ab6b930a3660..9199dafbbd86 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -961,7 +961,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) } catch( const ::com::sun::star::uno::Exception& ) { - SAL_INFO( "sfx2", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an exception!" ); + SAL_WARN( "sfx2.appl", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an exception!" ); } break; } diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index bbf9cb6e94e1..9111c353627e 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -614,7 +614,7 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) } else { - SAL_INFO( "sfx2", "SvFileObject::DialogClosedHdl(): wrong file type" ); + SAL_WARN( "sfx2.appl", "SvFileObject::DialogClosedHdl(): wrong file type" ); } if ( aEndEditLink.IsSet() ) diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index e486eb4c64af..47ec441ef1a0 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -207,7 +207,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId) { pImpl->pFactArr->Remove( nFactory ); - SAL_WARN("sfx2", "ChildWindow registered multiple times!"); + SAL_WARN("sfx2.appl", "ChildWindow registered multiple times!"); return; } } @@ -391,7 +391,7 @@ FieldUnit SfxModule::GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com if ( pItem == NULL ) { SAL_WARN( - "sfx2", + "sfx2.appl", "SfxModule::GetFieldUnit: no metric item in the module implemented" " by '" << typeid(*pModule).name() << "'!"); return FUNIT_100TH_MM; @@ -411,7 +411,7 @@ FieldUnit SfxModule::GetCurrentFieldUnit() eUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue(); } else - SAL_INFO( "sfx2", "GetModuleFieldUnit(): no module found" ); + SAL_WARN( "sfx2.appl", "GetModuleFieldUnit(): no module found" ); return eUnit; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 37d3918362cf..0f0c2f1b57b9 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2230,7 +2230,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) } catch( Exception& ) { - SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected exception" ); + SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected exception" ); } sModuleName = String( sTemp ); } @@ -2515,7 +2515,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) } catch( Exception& ) { - SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" ); + SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" ); } } @@ -2678,7 +2678,7 @@ void SfxHelpTextWindow_Impl::GetFocus() } catch( Exception& ) { - SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" ); + SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" ); } } } @@ -2775,13 +2775,13 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const } catch( Exception& ) { - SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception" ); + SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception" ); } #ifdef DBG_UTIL if ( !bSetOff ) { - SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" ); + SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" ); } #endif } @@ -3402,7 +3402,7 @@ void SfxHelpWindow_Impl::CloseWindow() } catch( Exception& ) { - SAL_INFO( "sfx2", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" ); + SAL_WARN( "sfx2.appl", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" ); } } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index ca6e48236a8d..9bf2be90cccb 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -202,7 +202,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) } else { - SAL_INFO( "sfx2", "Property 'AnchorName' is missing" ); + SAL_WARN( "sfx2.appl", "Property 'AnchorName' is missing" ); } } catch (const ::com::sun::star::uno::Exception&) @@ -279,14 +279,14 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl() while ( nIndex >= 0 ); } else { - SAL_INFO( "sfx2", "Wrong property type!" ); + SAL_WARN( "sfx2.appl", "Wrong property type!" ); } break; } default: - SAL_INFO( "sfx2", "Wrong property!" ); + SAL_WARN( "sfx2.appl", "Wrong property!" ); break; } } @@ -420,7 +420,7 @@ SfxHelp::~SfxHelp() sDefaultModule = DEFINE_CONST_UNICODE("sdatabase"); else { - SAL_INFO( "sfx2", "getDefaultModule_Impl(): no module installed" ); + SAL_WARN( "sfx2.appl", "getDefaultModule_Impl(): no module installed" ); } return sDefaultModule; } @@ -448,7 +448,7 @@ SfxHelp::~SfxHelp() } catch (const Exception&) { - SAL_INFO( "sfx2", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" ); + SAL_WARN( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" ); } } @@ -483,7 +483,7 @@ String SfxHelp::GetHelpModuleName_Impl() } catch (const Exception&) { - SAL_INFO( "sfx2", "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" ); + SAL_WARN( "sfx2.appl", "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" ); } } @@ -865,7 +865,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) } catch (const Exception&) { - SAL_INFO( "sfx2", "OpenHelpAgent: caught an exception while executing the dispatch!" ); + SAL_WARN( "sfx2.appl", "OpenHelpAgent: caught an exception while executing the dispatch!" ); } } } diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index c60d9a0ba7b2..7885f0d98a8e 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -108,11 +108,11 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL ) } catch( const ucb::CommandAbortedException& ) { - SAL_INFO( "sfx2", "createCursor: CommandAbortedException" ); + SAL_WARN( "sfx2.bastyp", "createCursor: CommandAbortedException" ); } catch( const uno::Exception& ) { - SAL_INFO( "sfx2", "createCursor: Any other exception" ); + SAL_WARN( "sfx2.bastyp", "createCursor: Any other exception" ); } if ( xResultSet.is() ) @@ -138,17 +138,17 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL ) } catch( const ucb::CommandAbortedException& ) { - SAL_INFO( "sfx2", "XContentAccess::next(): CommandAbortedException" ); + SAL_WARN( "sfx2.bastyp", "XContentAccess::next(): CommandAbortedException" ); } catch( const uno::Exception& ) { - SAL_INFO( "sfx2", "XContentAccess::next(): Any other exception" ); + SAL_WARN( "sfx2.bastyp", "XContentAccess::next(): Any other exception" ); } } } catch( const uno::Exception& e ) { - SAL_INFO( "sfx2", "GetResultSet: Any other exception: " << e.Message ); + SAL_WARN( "sfx2.bastyp", "GetResultSet: Any other exception: " << e.Message ); } if ( pList ) @@ -299,7 +299,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL ) uno::Reference< ucb::XCommandEnvironment > () ); if ( !( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsErrorDocument")) ) >>= bRet ) ) { - SAL_INFO( "sfx2", "Property 'IsErrorDocument' is missing" ); + SAL_WARN( "sfx2.bastyp", "Property 'IsErrorDocument' is missing" ); } } catch( const uno::Exception& ) @@ -324,11 +324,11 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent ) } catch( const ucb::CommandAbortedException& ) { - SAL_INFO( "sfx2", "CommandAbortedException" ); + SAL_WARN( "sfx2.bastyp", "CommandAbortedException" ); } catch( const uno::Exception& ) { - SAL_INFO( "sfx2", "Any other exception" ); + SAL_WARN( "sfx2.bastyp", "Any other exception" ); } nSize = (sal_uInt32)nTemp; return nSize; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 1c18d3f8fcf6..5ae485b46b20 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -217,7 +217,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) } else { - SAL_INFO( "sfx2", "CreateEventData_Impl(): ScriptType not supported!"); + SAL_WARN( "sfx2.config", "CreateEventData_Impl(): ScriptType not supported!"); } } else @@ -256,9 +256,13 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const xEvents->replaceByName( aEventName, aEventData ); } catch( const ::com::sun::star::lang::IllegalArgumentException& ) - { SAL_INFO( "sfx2", "PropagateEvents_Impl: caught IllegalArgumentException" ); } + { + SAL_WARN( "sfx2.config", "PropagateEvents_Impl: caught IllegalArgumentException" ); + } catch( const ::com::sun::star::container::NoSuchElementException& ) - { SAL_INFO( "sfx2", "PropagateEvents_Impl: caught NoSuchElementException" ); } + { + SAL_WARN( "sfx2.config", "PropagateEvents_Impl: caught NoSuchElementException" ); + } } else { DBG_WARNING( "PropagateEvents_Impl: Got unkown event" ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 66b2474c17a4..215212140aa9 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -451,13 +451,13 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( } catch ( Exception& ) { - SAL_INFO( "sfx2", "SfxDocumentInfoItem::updateDocumentInfo(): exception while adding custom properties" ); + SAL_WARN( "sfx2.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while adding custom properties" ); } } } catch ( Exception& ) { - SAL_INFO( "sfx2", "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing custom properties" ); + SAL_WARN( "sfx2.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing custom properties" ); } } @@ -696,7 +696,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) if ( !pInfo ) { - SAL_INFO( "sfx2", "SfxDocumentDescPage::FillItemSet(): no item found" ); + SAL_WARN( "sfx2.dialog", "SfxDocumentDescPage::FillItemSet(): no item found" ); return sal_False; } @@ -1413,7 +1413,7 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet ) if ( !pInfo ) { - SAL_INFO( "sfx2", "SfxInternetPage::FillItemSet(): no item found" ); + SAL_WARN( "sfx2.dialog", "SfxInternetPage::FillItemSet(): no item found" ); return sal_False; } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 7500a7a51748..6b00c4442383 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -274,7 +274,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve break; default: - SAL_INFO( "sfx2", "invalid element id" ); + SAL_WARN( "sfx2.dialog", "invalid element id" ); } OUString aHelpText; @@ -511,7 +511,7 @@ void FileDialogHelper_Impl::updateExportButton() } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "FileDialogHelper_Impl::updateExportButton: caught an exception!" ); + SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::updateExportButton: caught an exception!" ); } } } @@ -621,7 +621,7 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow ) } catch( const Exception& ) { - SAL_INFO( "sfx2", "FileDialogHelper_Impl::updatePreviewState: caught an exception!" ); + SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::updatePreviewState: caught an exception!" ); } } } @@ -1048,7 +1048,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( break; default: - SAL_INFO( "sfx2", "FileDialogHelper::ctor with unknown type" ); + SAL_WARN( "sfx2.dialog", "FileDialogHelper::ctor with unknown type" ); break; } @@ -1188,7 +1188,7 @@ void SAL_CALL PickerThread_Impl::run() catch( const RuntimeException& ) { SetReturnValue( ExecutableDialogResults::CANCEL ); - SAL_INFO( "sfx2", "RuntimeException caught" ); + SAL_WARN( "sfx2.dialog", "RuntimeException caught" ); } } @@ -1332,7 +1332,7 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute() } catch( const Exception& ) { - SAL_INFO( "sfx2", "FileDialogHelper_Impl::implDoExecute: caught an exception!" ); + SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!" ); } } @@ -1361,7 +1361,7 @@ void FileDialogHelper_Impl::implStartExecute() } catch( const Exception& ) { - SAL_INFO( "sfx2", "FileDialogHelper_Impl::implDoExecute: caught an exception!" ); + SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!" ); } } } @@ -1757,7 +1757,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, } catch( const uno::Exception& ) { - SAL_INFO( "sfx2", "Could not get filters from the configuration!" ); + SAL_WARN( "sfx2.dialog", "Could not get filters from the configuration!" ); } TSortedFilterList aIter (xResult); @@ -1797,7 +1797,7 @@ void FileDialogHelper_Impl::addFilter( const OUString& rFilterName, } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append Filter" << rFilterName ); + SAL_WARN( "sfx2.dialog", "Could not append Filter" << rFilterName ); } } @@ -1850,7 +1850,7 @@ void FileDialogHelper_Impl::addGraphicFilter() } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append Filter" ); + SAL_WARN( "sfx2.dialog", "Could not append Filter" ); } // Now add the filter @@ -1879,7 +1879,7 @@ void FileDialogHelper_Impl::addGraphicFilter() } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append Filter" ); + SAL_WARN( "sfx2.dialog", "Could not append Filter" ); } } } diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 4eaf796cd113..bf0473255742 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -977,7 +977,7 @@ namespace sfx2 } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append DefaultFilter" << sUIName ); + SAL_WARN( "sfx2.dialog", "Could not append DefaultFilter" << sUIName ); } for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() ) @@ -997,7 +997,7 @@ namespace sfx2 } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append Filter" << sUIName ); + SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName ); } } } @@ -1147,7 +1147,7 @@ namespace sfx2 } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append Filter" << sUIName ); + SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName ); } } @@ -1165,7 +1165,7 @@ namespace sfx2 } catch( const IllegalArgumentException& ) { - SAL_INFO( "sfx2", "Could not append Filter" << sUIName ); + SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName ); } } } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 5e0c2bf611e9..0284df0bb5f4 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -774,7 +774,7 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole ) } else { - SAL_INFO( "sfx2", "invalid address role" ); + SAL_WARN( "sfx2.dialog", "invalid address role" ); } if ( pList ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index decc6372f56c..fece88584918 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -834,7 +834,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId ) } else { - SAL_INFO( "sfx2", "TabPage-Id not known" ); + SAL_INFO( "sfx2.dialog", "TabPage-Id not known" ); } } @@ -973,7 +973,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) */ { - SAL_INFO( "sfx2", "CreateInputItemSet not implemented" ); + SAL_WARN( "sfx2.dialog", "CreateInputItemSet not implemented" ); return new SfxAllItemSet( SFX_APP()->GetPool() ); } @@ -989,7 +989,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet() */ { - SAL_INFO ( "sfx2", "GetRefreshedSet not implemented" ); + SAL_INFO ( "sfx2.dialog", "GetRefreshedSet not implemented" ); return 0; } @@ -1395,7 +1395,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) { if ( pSet ) { - SAL_INFO( "sfx2", "Set already exists!" ); + SAL_WARN( "sfx2.dialog", "Set already exists!" ); return pSet->GetRanges(); } diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 61ca3f6bacac..f140aa6a4eec 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -664,7 +664,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove if ( nSourceRegion == nTargetRegion ) { - SAL_INFO( "sfx2", "Don't know, what to do!" ); + SAL_WARN( "sfx2.doc", "Don't know, what to do!" ); return sal_False; } @@ -1694,7 +1694,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL() } else { - SAL_INFO( "sfx2", "GetTargetURL(): Could not create hierarchy content!" ); + SAL_WARN( "sfx2.doc", "GetTargetURL(): Could not create hierarchy content!" ); } } @@ -1857,7 +1857,7 @@ const OUString& RegionData_Impl::GetTargetURL() } else { - SAL_INFO( "sfx2", "GetTargetURL(): Could not create hierarchy content!" ); + SAL_WARN( "sfx2.doc", "GetTargetURL(): Could not create hierarchy content!" ); } } @@ -2171,7 +2171,7 @@ void SfxDocTemplate_Impl::Rescan() } catch( const Exception& ) { - SAL_INFO( "sfx2", "SfxDocTemplate_Impl::Rescan: caught an exception while doing the update!" ); + SAL_WARN( "sfx2.doc", "SfxDocTemplate_Impl::Rescan: caught an exception while doing the update!" ); } } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 923c18c5e15f..f620bc3b72d8 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -489,7 +489,7 @@ void SfxDocTplService_Impl::init_Impl() } else { - SAL_INFO( "sfx2", "init_Impl(): Could not create root" ); + SAL_WARN( "sfx2.doc", "init_Impl(): Could not create root" ); } mbIsInitialized = bIsInitialized; @@ -839,11 +839,11 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, } catch( RuntimeException& ) { - SAL_INFO( "sfx2", "createFolder(): got runtime exception" ); + SAL_WARN( "sfx2.doc", "createFolder(): got runtime exception" ); } catch( Exception& ) { - SAL_INFO( "sfx2", "createFolder(): Could not create new folder" ); + SAL_WARN( "sfx2.doc", "createFolder(): Could not create new folder" ); } } else if ( bCreateParent ) @@ -1042,8 +1042,12 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent, xProperties->addProperty( rPropName, PropertyAttribute::MAYBEVOID, rPropValue ); } catch( PropertyExistException& ) {} - catch( IllegalTypeException& ) { SAL_INFO( "sfx2", "IllegalTypeException" ); } - catch( IllegalArgumentException& ) { SAL_INFO( "sfx2", "IllegalArgumentException" ); } + catch( IllegalTypeException& ) { + SAL_WARN( "sfx2.doc", "IllegalTypeException" ); + } + catch( IllegalArgumentException& ) { + SAL_WARN( "sfx2.doc", "IllegalArgumentException" ); + } } } @@ -2466,7 +2470,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, } catch ( ContentCreationException& ) { - SAL_INFO( "sfx2", "addHierGroup: ContentCreationException" ); + SAL_WARN( "sfx2.doc", "addHierGroup: ContentCreationException" ); } catch ( Exception& ) {} @@ -2499,7 +2503,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, sal_Bool bDocHasTitle = sal_False; if( !getTitleFromURL( aTargetDir, aTmpTitle, aType, bDocHasTitle ) ) { - SAL_INFO( "sfx2", "addHierGroup(): template of alien format" ); + SAL_WARN( "sfx2.doc", "addHierGroup(): template of alien format" ); continue; } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 7003c0dfe92a..a4f165de5c1f 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2897,7 +2897,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, Windo } default: { - SAL_INFO( "sfx2", "SfxObjectShell::DetectHiddenInformation(): what fact?" ); + SAL_WARN( "sfx2.doc", "SfxObjectShell::DetectHiddenInformation(): what fact?" ); } } diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 42250f87ccc9..91d9c5bce5ac 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -687,7 +687,7 @@ SfxOleThumbnailProperty::SfxOleThumbnailProperty( void SfxOleThumbnailProperty::ImplLoad( SvStream& ) { - SAL_INFO( "sfx2", "SfxOleThumbnailProperty::ImplLoad - not implemented" ); + SAL_WARN( "sfx2.doc", "SfxOleThumbnailProperty::ImplLoad - not implemented" ); SetError( SVSTREAM_INVALID_ACCESS ); } @@ -721,7 +721,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm ) } else { - SAL_INFO( "sfx2", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" ); + SAL_WARN( "sfx2.doc", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" ); SetError( SVSTREAM_INVALID_ACCESS ); } } @@ -737,7 +737,7 @@ SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId, void SfxOleBlobProperty::ImplLoad( SvStream& ) { - SAL_INFO( "sfx2", "SfxOleBlobProperty::ImplLoad - not implemented" ); + SAL_WARN( "sfx2.doc", "SfxOleBlobProperty::ImplLoad - not implemented" ); SetError( SVSTREAM_INVALID_ACCESS ); } @@ -746,7 +746,7 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm ) if (IsValid()) { rStrm.Write( mData.getConstArray(), mData.getLength() ); } else { - SAL_INFO( "sfx2", "SfxOleBlobProperty::ImplSave - invalid BLOB property" ); + SAL_WARN( "sfx2.doc", "SfxOleBlobProperty::ImplSave - invalid BLOB property" ); SetError( SVSTREAM_INVALID_ACCESS ); } } @@ -1320,7 +1320,7 @@ const SvGlobalName& SfxOlePropertySet::GetSectionGuid( SfxOleSectionType eSectio case SECTION_GLOBAL: return saGlobalGuid; case SECTION_BUILTIN: return saBuiltInGuid; case SECTION_CUSTOM: return saCustomGuid; - default: SAL_INFO( "sfx2", "SfxOlePropertySet::GetSectionGuid - unknown section type" ); + default: SAL_WARN( "sfx2.doc", "SfxOlePropertySet::GetSectionGuid - unknown section type" ); } return saEmptyGuid; } diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 18276e76094f..fd6506597f3b 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -290,7 +290,7 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg } else { - SAL_INFO( "sfx2", "notifyEvent(): Unsupported event type" ); + SAL_WARN( "sfx2.notify", "notifyEvent(): Unsupported event type" ); } } } @@ -413,7 +413,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT))) eType = JAVASCRIPT; else { - SAL_INFO( "sfx2", "ConvertToMacro: Unknown macro type" ); + SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro type" ); } if ( !aMacroName.isEmpty() ) @@ -479,7 +479,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i } else { - SAL_INFO( "sfx2", "ConvertToMacro: Unknown macro url format" ); + SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro url format" ); } } } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b226f484b517..b6584e091f74 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2734,7 +2734,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) if(!xLibCont.is()) { - SAL_INFO( "sfx2", "couldn't get access to the basic lib container. Adding of macro isn't possible." ); + SAL_WARN( "sfx2.view", "couldn't get access to the basic lib container. Adding of macro isn't possible." ); return; } -- cgit