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
---
 extensions/source/plugin/base/xplugin.cxx | 1 +
 extensions/source/plugin/unx/npnapi.cxx   | 1 +
 extensions/source/plugin/unx/nppapi.cxx   | 1 +
 extensions/source/plugin/unx/npwrap.cxx   | 1 +
 extensions/source/plugin/unx/plugcon.cxx  | 2 ++
 extensions/source/plugin/unx/sysplug.cxx  | 1 +
 extensions/source/plugin/win/sysplug.cxx  | 2 ++
 7 files changed, 9 insertions(+)

(limited to 'extensions/source/plugin')

diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 834b52ec766b..9933739cddca 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -45,6 +45,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 #include <plugin/impl.hxx>
+#include <sal/log.hxx>
 #include <ucbhelper/content.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 16329c9059c7..c56f37b5c3f5 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -39,6 +39,7 @@
 #include <dlfcn.h>
 
 #include <osl/module.h>
+#include <sal/log.hxx>
 
 #include <config_vclplug.h>
 
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 6197fcf2f62e..d755df17ab1b 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -35,6 +35,7 @@
 
 #include <cstdarg>
 
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 
 #include <plugin/unx/plugcon.hxx>
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 6f4b58b63ae4..cec4fe7d1a05 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -42,6 +42,7 @@
 
 #include <osl/file.h>
 #include <osl/module.h>
+#include <sal/log.hxx>
 
 #include <config_vclplug.h>
 
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index c54f7f2368d2..fe0bd5d12511 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -33,6 +33,8 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#include <sal/log.hxx>
+
 #include <plugin/unx/plugcon.hxx>
 
 #include <cstdarg>
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index b19c01778719..e8a1af9b5539 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -40,6 +40,7 @@
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 
 #include <plugin/impl.hxx>
 
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 7d94acf3b218..d34c80012295 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -30,6 +30,8 @@
 #include <prewin.h>
 #include <postwin.h>
 
+#include <sal/log.hxx>
+
 #include <plugin/impl.hxx>
 
 #if defined _MSC_VER
-- 
cgit