sal: update log areas

Change-Id: Id7b2c7e871abf19b70f427095371c6a6c0208607

4 files changed, 24 insertions, 29 deletions

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 << '"');