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
---
 ucbhelper/source/client/content.cxx            | 1 +
 ucbhelper/source/provider/fd_inputstream.cxx   | 1 +
 ucbhelper/source/provider/std_inputstream.cxx  | 4 ++++
 ucbhelper/source/provider/std_outputstream.cxx | 4 ++++
 4 files changed, 10 insertions(+)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index c9887dd771ae..f0f0572dc6ea 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -23,6 +23,7 @@
 
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <cppuhelper/weak.hxx>
 
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx
index d469fb75d584..26efac00832f 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -21,6 +21,7 @@
 
 #include <rtl/alloc.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <algorithm>
 
 using namespace com::sun::star::uno;
diff --git a/ucbhelper/source/provider/std_inputstream.cxx b/ucbhelper/source/provider/std_inputstream.cxx
index 172e284a99fd..513b9db9f53b 100644
--- a/ucbhelper/source/provider/std_inputstream.cxx
+++ b/ucbhelper/source/provider/std_inputstream.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "ucbhelper/std_inputstream.hxx"
 
 using namespace std;
diff --git a/ucbhelper/source/provider/std_outputstream.cxx b/ucbhelper/source/provider/std_outputstream.cxx
index 2f6ca9968eba..390ddbe4b408 100644
--- a/ucbhelper/source/provider/std_outputstream.cxx
+++ b/ucbhelper/source/provider/std_outputstream.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "ucbhelper/std_outputstream.hxx"
 
 using namespace std;
-- 
cgit