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

28 files changed, 28 insertions, 0 deletions

diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index 8fb27d251074..af4583865570 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index a5757ae4fa91..9bd110a4b1da 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -35,6 +35,7 @@
 // future unification easier.
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index ee9fb30a07a9..98ac5173eb8a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -28,6 +28,7 @@
 // full of copy/paste. So I continue in that tradition...
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
index e10a444ce5ac..5eb41411db75 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
@@ -31,6 +31,7 @@
 // copy/paste. So I continue in that tradition...
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index 29db017e350b..718bc980ef81 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -29,6 +29,7 @@
 // as possible, to make future unification easier.
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/types.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
index 0231c468ec5a..54af31e6c9d8 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -24,6 +24,7 @@
 // changes.
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/types.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index e95a7b08f970..f132d7e8c728 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 0c7769748531..c7b5fd94cbc0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -20,6 +20,7 @@
 #include <malloc.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index c664f28c5558..d20cc0b7476f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 6efcd0687adf..ec333fd659c5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index 88fc904e6b24..70784124d0be 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -20,6 +20,7 @@
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 18efddbc23d6..d961a386e5a8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -20,6 +20,7 @@
 #include <malloc.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index bba1ce6a771f..167b4ade539f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 #include <osl/endian.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index b49cab4cf2a8..69a590cb6b6f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index f2e5174a1929..0748d244f2f9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 #include <osl/endian.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index b0f4f7ea06c4..a14021ea5ae0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index b21d4f9a25b7..82fd47258734 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index fb475cf46d32..93b10de5f4a6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 #include "bridges/cpp_uno/shared/bridge.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 5151cc52a5b5..735bb976cf9b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 08cd765639c9..575e43251bbb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -31,6 +31,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.h>
 
 #include <rtti.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 22e38bccea44..f08e9a7f78c0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 5ef0fdc80349..aee85cc7eae2 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -23,6 +23,7 @@
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index f5fe6e78a100..8742b72fd65c 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 #include "bridges/cpp_uno/shared/bridge.hxx"
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index 0d376e65be4f..abe666fc8ddb 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -23,6 +23,7 @@
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 #include <sal/alloca.h>
+#include <sal/log.hxx>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
index dcbf8fe5212f..08c7b7b3df87 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 78d4bcc7b72b..58e4d642efe4 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -21,6 +21,7 @@
 #include <malloc.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 1cd29f70a6b7..d7f534d2e015 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -21,6 +21,7 @@
 #include <malloc.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 1663eeaecbc4..2b856aaad6f6 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -31,6 +31,7 @@
 
 #include "rtl/alloc.h"
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 
 #include "uno/environment.h"
 #include "typelib/typedescription.h"