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
---
 desktop/inc/app.hxx                                           | 1 +
 desktop/source/app/app.cxx                                    | 1 +
 desktop/source/app/appinit.cxx                                | 1 +
 desktop/source/app/check_ext_deps.cxx                         | 1 +
 desktop/source/app/dispatchwatcher.cxx                        | 2 ++
 desktop/source/app/officeipcthread.cxx                        | 1 +
 desktop/source/app/sofficemain.cxx                            | 1 +
 desktop/source/deployment/manager/dp_informationprovider.cxx  | 1 +
 desktop/source/deployment/manager/dp_manager.cxx              | 1 +
 desktop/source/deployment/misc/dp_misc.cxx                    | 1 +
 desktop/source/deployment/registry/component/dp_component.cxx | 1 +
 desktop/source/deployment/registry/dp_backend.cxx             | 1 +
 desktop/source/deployment/registry/package/dp_package.cxx     | 1 +
 desktop/source/lib/init.cxx                                   | 1 +
 desktop/source/migration/migration.cxx                        | 1 +
 desktop/source/migration/services/oo3extensionmigration.cxx   | 1 +
 desktop/source/offacc/acceptor.cxx                            | 1 +
 desktop/source/splash/splash.cxx                              | 1 +
 18 files changed, 19 insertions(+)

(limited to 'desktop')

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 4a98c6e8afac..d5d184d2e02d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -23,6 +23,7 @@
 #include <boost/optional.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <tools/resmgr.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d0e5324e0165..f0c5d8090458 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -75,6 +75,7 @@
 #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 
+#include <sal/log.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index c0f5a2b92bc5..d51057868269 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -43,6 +43,7 @@
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 
 #include <tools/rcid.h>
 
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 8145db1de0c1..ab40ec8f2259 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/compbase3.hxx>
 
 #include <vcl/wrkwin.hxx>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index b971335a5337..fddfb428e9a9 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
+#include <sal/log.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 1a3cc9f77220..b3e5330af84c 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -27,6 +27,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <stdio.h>
 #include <osl/process.h>
+#include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index dea30fd6a80a..25da9d8caafd 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -28,6 +28,7 @@
 
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 #include <vcl/svmain.hxx>
 
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 7ff3e911f2ed..be263726fb03 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -35,6 +35,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <ucbhelper/content.hxx>
 
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 8164dd0ed329..3ddc5f83f757 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -29,6 +29,7 @@
 #include <rtl/string.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index c5b4eec6812c..bae18596fbbd 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -27,6 +27,7 @@
 #include <rtl/digest.h>
 #include <rtl/random.h>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <osl/file.hxx>
 #include <osl/pipe.hxx>
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index d859d043d790..670994bae1e8 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -26,6 +26,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <ucbhelper/content.hxx>
 #include <comphelper/anytostring.hxx>
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 516aca98a175..3627a9dd8ddf 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -26,6 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/servicedecl.hxx>
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index a3903d2f0094..b37b1fd96551 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -28,6 +28,7 @@
 #include "dp_descriptioninfoset.hxx"
 #include "dp_identifier.hxx"
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0651480dfa79..a1162dfe21bc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -20,6 +20,7 @@
 #include <LibreOfficeKit/LibreOfficeKit.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
+#include <sal/log.hxx>
 #include <tools/errinf.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 93ebeb1a697f..74f61742e230 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -28,6 +28,7 @@
 #include "migration.hxx"
 #include "migration_impl.hxx"
 
+#include <sal/log.hxx>
 #include <unotools/textsearch.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 3ace9469bc50..ef82a5bac06c 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -20,6 +20,7 @@
 
 #include "oo3extensionmigration.hxx"
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <tools/urlobj.hxx>
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index f60eacc35f02..a7491b8ea185 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 using namespace css::bridge;
 using namespace css::connection;
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f2303725b71c..2cfba719e758 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -20,6 +20,7 @@
 
 #include "splash.hxx"
 #include <stdio.h>
+#include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
-- 
cgit