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
---
 cppu/source/LogBridge/LogBridge.cxx       | 1 +
 cppu/source/UnsafeBridge/UnsafeBridge.cxx | 1 +
 cppu/source/uno/data.cxx                  | 1 +
 cppu/source/uno/lbmap.cxx                 | 1 +
 4 files changed, 4 insertions(+)

(limited to 'cppu/source')

diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 2948d9bf32d8..f79bedcd2f1c 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -30,6 +30,7 @@
 #include "cppu/EnvDcp.hxx"
 #include "uno/environment.hxx"
 #include <com/sun/star/uno/Type.hxx>
+#include <sal/log.hxx>
 
 namespace
 {
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 533ff93b372c..a2e9887ddec6 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -21,6 +21,7 @@
 #include "osl/mutex.hxx"
 #include "osl/thread.h"
 #include "osl/thread.hxx"
+#include "sal/log.hxx"
 
 #include <cppu/Enterable.hxx>
 #include "cppu/helper/purpenv/Environment.hxx"
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 2f027f0ab49b..9ae11151a006 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -23,6 +23,7 @@
 
 #include "cppu/macros.hxx"
 #include "osl/mutex.hxx"
+#include "sal/log.hxx"
 #include "uno/data.h"
 
 #include "constr.hxx"
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index f4cc581811c9..7da528cb372e 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -32,6 +32,7 @@
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
 #include "osl/interlck.h"
+#include "sal/log.hxx"
 
 #include "uno/dispatcher.h"
 #include "uno/mapping.h"
-- 
cgit