sal: update log areas

Change-Id: Id7b2c7e871abf19b70f427095371c6a6c0208607

20 files changed, 108 insertions, 83 deletions

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 6fac39761829..7e62558930c8 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -199,7 +199,7 @@ bool RenameModule (
 
             // update tabwriter
             sal_uInt16 nId = pShell->GetWindowId( pWin );
-            SAL_WARN_IF( nId == 0 , "basctl.basicide ", "No entry in Tabbar!");
+            SAL_WARN_IF( nId == 0 , "basctl.basicide", "No entry in Tabbar!");
             if ( nId )
             {
                 TabBar& rTabBar = pShell->GetTabBar();
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index fa504aacdea5..4e153ca5d36d 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -339,7 +339,7 @@ void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) throw()
     {
         size_t nItems = Buffer.getLength();
         bool bSuccess = (fwrite(Buffer.getConstArray(), 1, nItems, fp) == nItems);
-        SAL_WARN_IF( !bSuccess, "extensions", "short write");
+        SAL_WARN_IF( !bSuccess, "extensions.plugin", "short write");
     }
 }
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9cc9f06eb918..18247bfa6131 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5435,7 +5435,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
                 {
                     sal_Size nMaxEntriesPossible = rStCtrl.remainingSize() / nFIDCLsize;
                     SAL_WARN_IF(nMaxEntriesPossible < mnIdClusters,
-                        "escher", "FIDCL list longer than remaining bytes, ppt or parser is wrong");
+                        "filter.ms", "FIDCL list longer than remaining bytes, ppt or parser is wrong");
                     mnIdClusters = std::min(nMaxEntriesPossible, static_cast<sal_Size>(mnIdClusters));
 
                     maFidcls.resize(mnIdClusters);
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 323f4b4cddd8..a9b2aaa6d6ab 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -63,7 +63,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
         ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
     else
     {
-        SAL_WARN( "framework", "FwkTabControl::BroadcastEvent(): illegal event" );
+        SAL_WARN( "fwk", "FwkTabControl::BroadcastEvent(): illegal event" );
     }
 }
 
@@ -122,11 +122,11 @@ void FwkTabPage::CreateDialog()
     }
     catch ( const lang::IllegalArgumentException& )
     {
-        SAL_WARN( "framework", "FwkTabPage::CreateDialog(): illegal argument" );
+        SAL_WARN( "fwk", "FwkTabPage::CreateDialog(): illegal argument" );
     }
     catch ( const uno::Exception& )
     {
-        SAL_WARN( "framework", "FwkTabPage::CreateDialog(): exception of XDialogProvider2::createContainerWindow()" );
+        SAL_WARN( "fwk", "FwkTabPage::CreateDialog(): exception of XDialogProvider2::createContainerWindow()" );
     }
 }
 
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index ef110e87f246..a0477676faae 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -29,6 +29,11 @@ certain functionality.
 
 @li @c basctl.basicide
 
+@section basic
+
+@li @c basic
+@li @c basic.sbx
+
 @section canvas
 
 @li @c canvas
@@ -85,6 +90,7 @@ certain functionality.
 @section extensions
 
 @li @c extensions.plugin
+@li @c extensions.update
 @li @c extensions.scanner
 
 @section Filter
@@ -104,6 +110,12 @@ certain functionality.
 @li @c fpicker.aqua
 @li @c fpicker.office
 
+@section framework
+
+@li @c fwk - framework
+@li @c fwk.desktop
+@li @c fwk.session
+
 @section i18npool
 
 @li @c i18npool - general i18npool
@@ -143,6 +155,7 @@ certain functionality.
 @section slideshow
 
 @li @c slideshow.opengl
+@li @c slideshow.eventqueue
 
 @section svl
 
@@ -157,17 +170,25 @@ certain functionality.
 @li @c svtools.dialogs
 @li @c svtools.filter
 @li @c svtools.misc
+@li @c svtools.table
 @li @c svtools.uno
 
 @section svx
 
 @li @c svx.dialog
 @li @c svx.form
+@li @c svx.stbcrtls
+@li @c svx.table
 @li @c svx.tbxcrtls
 
+@section toolkit
+
+@li @c toolkit.controls
+
 @section tools
 
 @li @c tools.debug
+@li @c tools.datetime
 @li @c tools.memtools
 @li @c tools.rc - resource manager
 @li @c tools.stream - SvStream class
@@ -181,19 +202,31 @@ certain functionality.
 
 @li @c unotools.config
 @li @c unotools.i18n
+@li @c unotools.misc
+@li @c unotools.ucbhelper
 
 @section URE
 
 @li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality
 @li @c salhelper.thread - ::salhelper::Thread class
 
+@section sax
+
+@li @c sax.cppunit
+
 @section stoc
 
 @li @c stoc.corerefl
 @li @c stoc.tdmanager
 
+@section svl
+
+@li @c svl.items
+
 @section VCL
 
+@li @c vcl
+@li @c vcl.a11y
 @li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X
 @li @c vcl.control
 @li @c vcl.coretext - CoreText-using code for Mac OS X and iOS
@@ -202,7 +235,6 @@ certain functionality.
 @li @c vcl.layout - Widget layout
 @li @c vcl.sm
 
-
 @section Writer
 
 @li @c sw
@@ -236,7 +268,6 @@ certain functionality.
 @li @c accessibility
 @li @c avmedia
 @li @c basebmp
-@li @c basic
 @li @c binaryurp
 @li @c bridges
 @li @c comphelper
@@ -244,8 +275,9 @@ certain functionality.
 @li @c cppcanvas
 @li @c cppuhelper
 @li @c cppu
+@li @c dbaccess
 @li @c editeng
-@li @c framework
+@li @c forms
 @li @c helpcompiler
 @li @c jvmfwk
 @li @c linguistic
@@ -254,6 +286,7 @@ certain functionality.
 @li @c sax
 @li @c shell
 @li @c stoc
+@li @c svg
 @li @c svx
 @li @c ucbhelper
 @li @c xmlhelp
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index bcb85ce490d3..868b3967d471 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -664,7 +664,7 @@ void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject
 void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& )
 throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException)
 {
-    SAL_INFO("sfx2.shutdown", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
+    SAL_INFO("sfx2.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
     ::osl::ClearableMutexGuard  aGuard( m_aMutex );
 
     if ( m_bVeto )
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index ca00d5a4d641..9567170054cc 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -436,7 +436,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
         }
 
         default:
-            SAL_WARN( "svl.ui", "SvxSearchItem::QueryValue(): Unknown MemberId" );
+            SAL_WARN( "svl.items", "SvxSearchItem::QueryValue(): Unknown MemberId" );
             return false;
     }
 
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 92ed2bd0f72b..4bc165317aaf 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -122,7 +122,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
     catch(const css::uno::Exception& ex)
     {
         m_xCfg.clear();
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -143,7 +143,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -161,7 +161,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
     return bRet;
 }
@@ -178,7 +178,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -196,7 +196,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -214,7 +214,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -232,7 +232,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -250,7 +250,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -268,7 +268,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -286,7 +286,7 @@ sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -308,7 +308,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -328,7 +328,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -348,7 +348,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -368,7 +368,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -388,7 +388,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -408,7 +408,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -428,7 +428,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -448,7 +448,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -468,7 +468,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 84ba19d6b0ff..e67ddfd529d6 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -25,11 +25,8 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-
 #include <com/sun/star/container/XNameAccess.hpp>
-
 #include <com/sun/star/container/XNameContainer.hpp>
-
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <comphelper/configurationhelper.hxx>
@@ -174,7 +171,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
     {
         m_xNode.clear();
         m_xCfg.clear();
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -192,7 +189,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -212,7 +209,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return  nRet;
@@ -234,7 +231,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -256,7 +253,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -278,7 +275,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -300,7 +297,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -322,7 +319,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -344,7 +341,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return  nRet;
@@ -366,7 +363,7 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return  bRet;
@@ -388,7 +385,7 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return  bRet;
@@ -411,7 +408,7 @@ sal_Bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 
     return  bRet;
@@ -502,7 +499,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -530,7 +527,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 0f2177aad7b3..4d12ce902de3 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -112,7 +112,7 @@ void ODocumentInfoPreview::fill(
             value = conv->convertToSimpleType(aAny, css::uno::TypeClass_STRING).
                 get< rtl::OUString >();
         } catch (css::script::CannotConvertException & e) {
-            SAL_INFO("svtools", "ignored CannotConvertException " << e.Message);
+            SAL_INFO("svtools.contr", "ignored CannotConvertException " << e.Message);
         }
         if (!value.isEmpty()) {
             insertEntry(name, value);
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 07b90d4f9b01..ad57f9ff28e4 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -584,7 +584,7 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( bool bUpdate ) const
             }
             catch (const uno::Exception& ex)
             {
-                SAL_WARN("svtools", "discarding broken embedded object preview: " << ex.Message);
+                SAL_WARN("svtools.misc", "discarding broken embedded object preview: " << ex.Message);
                 delete pStream;
                 xStream.clear();
             }
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 0efffcfbb0b5..910cbe926c60 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -144,7 +144,7 @@ const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool
 
     //Rather than return a fairly useless "Unknown" name, return a geeky but usable-in-a-pinch lang-tag
     OUString sLangTag(LanguageTag(eType).getBcp47());
-    SAL_WARN("svtools", "Language: 0x"
+    SAL_WARN("svtools.misc", "Language: 0x"
         << std::hex << eType
         << " with unknown name, so returning lang-tag of: "
         << sLangTag);
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index f85e751f1fb8..038a702da753 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -197,7 +197,7 @@ sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay,
 
     if (nMinimumNumberOfDaysInWeek < 1 || 7 < nMinimumNumberOfDaysInWeek)
     {
-        SAL_WARN( "tools", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
+        SAL_WARN( "tools.datetime", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
         nMinimumNumberOfDaysInWeek = 4;
     }
 
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index d161c6517f14..b962bab0ca01 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -861,7 +861,7 @@ void ResMgr::Init( const OUString& rFileName )
             InternalResMgr::FreeGlobalRes( aResHandle, pVoid );
         else
         {
-            SAL_WARN("tools", "Wrong version: " << pImpRes->aFileName);
+            SAL_WARN("tools.rc", "Wrong version: " << pImpRes->aFileName);
         }
     }
 #endif
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index aed1f4ba13c8..1b19d3e5eb48 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -32,15 +32,10 @@
 #include "itemholder1.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-
 #include <com/sun/star/container/XNameAccess.hpp>
-
 #include <com/sun/star/container/XNameContainer.hpp>
-
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
 #include <comphelper/configurationhelper.hxx>
-
 #include <comphelper/processfactory.hxx>
 
 using namespace ::std     ;
@@ -153,7 +148,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
         m_xCfg.clear();
         m_xCommonXCU.clear();
 
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -199,7 +194,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 
     return nSize;
@@ -259,7 +254,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -319,7 +314,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -404,7 +399,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
                     // ignore such corrupted individual items here, so that at
                     // least newly added items are successfully reported back
                     // from this function:
-                    SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+                    SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
                 }
             }
             assert(nCount <= nLength);
@@ -414,7 +409,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 
     return seqReturn;
@@ -571,7 +566,7 @@ void SvtHistoryOptions_Impl::AppendItem(       EHistoryType eHistory ,
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 5da601831adb..fac2eca11fb5 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -164,7 +164,7 @@ SvtUserOptions::Impl::Impl() :
     catch (uno::Exception const& ex)
     {
         m_xCfg.clear();
-        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+        SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -182,7 +182,7 @@ OUString SvtUserOptions::Impl::GetToken (sal_uInt16 nToken) const
         }
         catch (uno::Exception const& ex)
         {
-            SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+            SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
         }
     }
     else
@@ -204,7 +204,7 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, OUString const& sToken)
         }
         catch (uno::Exception const& ex)
         {
-            SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+            SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
         }
     }
     else
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 6aaef61d6481..a11148884854 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1357,7 +1357,7 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
                 if (!strcmp(mpSubsFontName, "OpenSymbol") || (!strcmp(mpSubsFontName, "StarSymbol")))
                 {
                     cRetVal = 0xE12C;
-                    SAL_WARN( "unotools", "Forcing a bullet substition from 0x" <<
+                    SAL_WARN( "unotools.misc", "Forcing a bullet substition from 0x" <<
                         OString::valueOf((sal_Int32)cChar, 16) << " to 0x" <<
                         OString::valueOf((sal_Int32)cRetVal, 16));
                 }
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 2961fff80a24..6d00271eff1b 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -62,7 +62,7 @@ namespace {
 
 rtl::OUString canonic(rtl::OUString const & url) {
     INetURLObject o(url);
-    SAL_WARN_IF(o.HasError(), "unotools", "Invalid URL \"" << url << '"');
+    SAL_WARN_IF(o.HasError(), "unotools.ucbhelper", "Invalid URL \"" << url << '"');
     return o.GetMainURL(INetURLObject::NO_DECODE);
 }
 
@@ -103,7 +103,7 @@ std::vector<rtl::OUString> getContents(rtl::OUString const & url) {
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "getContents(" << url << ") " << e.getValueType().getTypeName()
                 << " \"" << e.get<css::uno::Exception>().Message << '"');
         return std::vector<rtl::OUString>();
@@ -137,7 +137,7 @@ bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) {
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::IsDocument(" << url << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -158,7 +158,7 @@ css::uno::Any utl::UCBContentHelper::GetProperty(
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::GetProperty(" << url << ", " << property << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -177,7 +177,7 @@ bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) {
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::IsFolder(" << url << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -199,7 +199,7 @@ bool utl::UCBContentHelper::GetTitle(
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::GetTitle(" << url << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -221,7 +221,7 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) {
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::Kill(" << url << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -263,7 +263,7 @@ bool utl::UCBContentHelper::MakeFolder(
             exists = true;
         } else {
             SAL_INFO(
-                "unotools",
+                "unotools.ucbhelper",
                 "UCBContentHelper::MakeFolder(" << title
                     << ") InteractiveIOException \"" << e.Message
                     << "\", code " << +e.Code);
@@ -278,7 +278,7 @@ bool utl::UCBContentHelper::MakeFolder(
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::MakeFolder(" << title << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -298,7 +298,7 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
         sal_Int64 n = 0;
         bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n);
         SAL_INFO_IF(
-            !ok, "unotools",
+            !ok, "unotools.ucbhelper",
             "UCBContentHelper::GetSize(" << url
                 << "): Size cannot be determined");
         return n;
@@ -310,7 +310,7 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::GetSize(" << url << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -339,7 +339,7 @@ bool utl::UCBContentHelper::IsYounger(
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::IsYounger(" << younger << ", " << older << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
@@ -429,7 +429,7 @@ bool utl::UCBContentHelper::IsSubPath(
     } catch (css::uno::Exception const &) {
         css::uno::Any e(cppu::getCaughtException());
         SAL_INFO(
-            "unotools",
+            "unotools.ucbhelper",
             "UCBContentHelper::IsSubPath(" << parent << ", " << child << ") "
                 << e.getValueType().getTypeName() << " \""
                 << e.get<css::uno::Exception>().Message << '"');
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a925deda6b53..5fbe862df357 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2357,7 +2357,7 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis)
     }
 
     //old-school
-    SAL_WARN("vcl", "No new-style group set on radiobutton, using old-style digging around");
+    SAL_WARN("vcl.control", "No new-style group set on radiobutton, using old-style digging around");
 
     // go back to first in group;
     Window* pFirst = const_cast<RadioButton*>(this);
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1b5753126928..17cc412bfb12 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -642,7 +642,7 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
     //stupidly big, forget about it
     if (maTargetSize.Width() >= SAL_MAX_INT32 / nBytesPerPixel / maTargetSize.Height())
     {
-        SAL_WARN( "vcl", "overlarge png dimensions: " <<
+        SAL_WARN( "vcl.gdi", "overlarge png dimensions: " <<
             maTargetSize.Width() << " x " << maTargetSize.Height() << " depth: " << mnTargetDepth);
         return sal_False;
     }