From 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 22 Apr 2015 09:42:28 +0200
Subject: Various #include <sal/log.hxx> fixups

rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx>
(and don't make use of it themselves), but many other files happen to depend on
it.  Cleaned up some, but something like

  grep -FwL sal/log.hxx $(git grep -Elw \
    'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx)

shows lots more files that potentially need fixing before the include can be
removed from rtl/string.hxx and rtl/ustring.hxx.

Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
---
 comphelper/source/container/embeddedobjectcontainer.cxx | 2 ++
 comphelper/source/misc/configuration.cxx                | 1 +
 comphelper/source/misc/namedvaluecollection.cxx         | 1 +
 comphelper/source/misc/synchronousdispatch.cxx          | 3 +--
 comphelper/source/property/ChainablePropertySetInfo.cxx | 1 +
 comphelper/source/property/MasterPropertySetInfo.cxx    | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'comphelper')

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 1f3f61b3b9d6..10a75516e868 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -42,6 +42,8 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/weakref.hxx>
+#include <sal/log.hxx>
+
 #include <algorithm>
 #include <unordered_map>
 
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index ed28d0f5e04c..b01bdaef477b 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -30,6 +30,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 namespace {
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index e38223535241..a5670f050e2c 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <functional>
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index 2bd6d26575fb..9c73ebbca434 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -26,8 +26,7 @@
 
 #include <comphelper/synchronousdispatch.hxx>
 #include <comphelper/processfactory.hxx>
-
-
+#include <sal/log.hxx>
 
 namespace comphelper
 {
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index 23a8ae272c71..4f7868dfa3cb 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/ChainablePropertySetInfo.hxx>
+#include <sal/log.hxx>
 
 using ::comphelper::PropertyInfo;
 using ::comphelper::ChainablePropertySetInfo;
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index afbd849eb08d..43f0dccdb628 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/MasterPropertySetInfo.hxx>
+#include <sal/log.hxx>
 
 using ::comphelper::PropertyInfo;
 using ::comphelper::MasterPropertySetInfo;
-- 
cgit