[Libreoffice-commits] core.git: fpicker/source jvmfwk/plugins jvmfwk/source sal/cppunittester sal/osl sal/qa sal/rtl sal/test sc/source sd/source shell/source slideshow/source stoc/source svx/source vcl/osx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 6 14:05:05 UTC 2018
fpicker/source/aqua/FilterHelper.mm | 1 +
fpicker/source/aqua/SalAquaFilePicker.mm | 1 +
fpicker/source/aqua/SalAquaFolderPicker.mm | 1 +
fpicker/source/aqua/SalAquaPicker.mm | 1 +
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 1 +
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 1 +
jvmfwk/source/elements.cxx | 1 +
jvmfwk/source/framework.cxx | 1 +
jvmfwk/source/fwkbase.cxx | 1 +
jvmfwk/source/fwkutil.cxx | 1 +
sal/cppunittester/cppunittester.cxx | 1 +
sal/osl/unx/file_misc.cxx | 1 +
sal/osl/unx/nlsupport.cxx | 1 +
sal/osl/unx/signal.cxx | 1 +
sal/osl/w32/file.cxx | 1 +
sal/osl/w32/file_dirvol.cxx | 1 +
sal/osl/w32/file_url.cxx | 1 +
sal/osl/w32/module.cxx | 1 +
sal/osl/w32/path_helper.cxx | 1 +
sal/osl/w32/process.cxx | 1 +
sal/osl/w32/profile.cxx | 1 +
sal/qa/osl/security/osl_Security.cxx | 1 +
sal/rtl/bootstrap.cxx | 1 +
sal/test/testbootstrap.cxx | 1 +
sc/source/filter/inc/tokstack.hxx | 1 +
sd/source/ui/remotecontrol/OSXBluetooth.mm | 1 +
shell/source/backends/macbe/macbackend.mm | 1 +
slideshow/source/inc/tools.hxx | 1 +
stoc/source/security/lru_cache.h | 1 +
svx/source/svdraw/svdpdf.hxx | 1 +
vcl/osx/a11ywrapper.mm | 2 ++
vcl/osx/printaccessoryview.mm | 1 +
32 files changed, 33 insertions(+)
New commits:
commit c40109cc4e2412b06a2cc2e92ac1267c6c338aed
Author: Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Sun Aug 5 00:50:24 2018 +0200
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Aug 6 16:04:35 2018 +0200
Add missing sal/log.hxx headers
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.
This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes.
This commit adds missing headers to every file found by:
grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG')
in files formerly omitted for oversight or non-cxx extension
Change-Id: I327c573f44076c6ccfecf737eafccba2da72e1bd
Reviewed-on: https://gerrit.libreoffice.org/58600
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 4bfff715e748..3e748021079f 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <algorithm>
#include <osl/mutex.hxx>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 32c56c6ca635..57d30cfa8a30 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -20,6 +20,7 @@
#include <config_features.h>
#include <sal/config.h>
+#include <sal/log.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index a419701a9129..68cb69c11c4d 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -28,6 +28,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include "FPServiceInfo.hxx"
#include <osl/mutex.hxx>
+#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include "SalAquaFolderPicker.hxx"
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index a54cc49cb3ab..1753ad7d80e3 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index d02a43edacbc..e5e9cb517ca3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -48,6 +48,7 @@
#include <osl/thread.hxx>
#include <osl/file.hxx>
#include <rtl/instance.hxx>
+#include <sal/log.hxx>
#include <osl/getglobalmutex.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <setjmp.h>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 99feb5f157bc..08cb1fff7e5b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -31,6 +31,7 @@
#include <rtl/byteseq.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
+#include <sal/log.hxx>
#include <salhelper/linkhelper.hxx>
#include <salhelper/thread.hxx>
#include <memory>
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 24c60e8379c8..94b0ed7c2f39 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <cassert>
#include <memory>
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 3eceabe99d42..b2532c48914d 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <cassert>
#include <memory>
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index b7044217edc1..2e83e322aa30 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -20,6 +20,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/uri.hxx>
+#include <sal/log.hxx>
#include <osl/thread.hxx>
#include <osl/process.h>
#include <libxml/xpathInternals.h>
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index e8c13021ce48..14cb3024e01b 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -36,6 +36,7 @@
#include <osl/process.h>
#include <rtl/instance.hxx>
#include <rtl/uri.hxx>
+#include <sal/log.hxx>
#include <osl/getglobalmutex.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <cppuhelper/bootstrap.hxx>
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 2cca296f0c53..f6be50375057 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -32,6 +32,7 @@
#include <cstdlib>
#include <iostream>
#include <string>
+#include <sal/log.hxx>
#include <sal/types.h>
#include <cppunittester/protectorfactory.hxx>
#include <osl/module.h>
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 7e3386cfa4e5..74712563311b 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -25,6 +25,7 @@
#include <osl/signal.h>
#include <rtl/alloc.h>
#include <rtl/string.hxx>
+#include <sal/log.hxx>
#include "system.hxx"
#include "file_impl.hxx"
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 5300752335af..e1d7e393822c 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -26,6 +26,7 @@
#include <osl/process.h>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#include "nlsupport.hxx"
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index a96808574c2a..c742634fc190 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -56,6 +56,7 @@
#include <osl/signal.h>
#include <osl/process.h>
#include <osl/thread.h>
+#include <sal/log.hxx>
#include <sal/macros.h>
#include <rtl/bootstrap.h>
#include <rtl/digest.h>
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 35373bb56cc2..e92c5a584c31 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -22,6 +22,7 @@
#include <osl/file.hxx>
#include <rtl/alloc.h>
#include <rtl/byteseq.h>
+#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include "file_url.hxx"
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index c9a6c4dd16b6..ef0f78491331 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -28,6 +28,7 @@
#include <rtl/alloc.h>
#include <rtl/ustring.hxx>
#include <rtl/character.hxx>
+#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
static const wchar_t UNC_PREFIX[] = L"\\\\";
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 9b5cb51b110a..6cdb140aa22d 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <algorithm>
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 5f1daf6ae59e..de9ce4db421b 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -27,6 +27,7 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <osl/file.h>
+#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <vector>
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index 53e0ae0b19a2..900888bd1544 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -20,6 +20,7 @@
#include "path_helper.hxx"
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#include <algorithm>
#include <wchar.h>
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 153df540c5ae..92d61b93ada9 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -34,6 +34,7 @@
#include "file_url.hxx"
#include "path_helper.hxx"
#include <rtl/alloc.h>
+#include <sal/log.hxx>
oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
{
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 26a11e4d8672..63e172ed7553 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -30,6 +30,7 @@
#include <osl/file.h>
#include <rtl/alloc.h>
#include <sal/macros.h>
+#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <algorithm>
#include <vector>
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 5d7ebe2905dc..5c24b8260c4c 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -29,6 +29,7 @@
#include <osl/thread.h>
#include <rtl/process.h>
#include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
using namespace osl;
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 9184c3cce634..a802da6a562c 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -36,6 +36,7 @@
#include <rtl/instance.hxx>
#include <rtl/malformeduriexception.hxx>
#include <rtl/uri.hxx>
+#include <sal/log.hxx>
#include <vector>
#include <algorithm>
diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx
index cef9e87ffaf1..9ae34f78c588 100644
--- a/sal/test/testbootstrap.cxx
+++ b/sal/test/testbootstrap.cxx
@@ -25,6 +25,7 @@
#include <rtl/byteseq.hxx>
#include <osl/process.h>
+#include <sal/log.hxx>
int main( int argc, char *argv[] )
{
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 397de91536ea..268df421a8ee 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -24,6 +24,7 @@
#include <compiler.hxx>
#include <tokenarray.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <memory>
#include <vector>
diff --git a/sd/source/ui/remotecontrol/OSXBluetooth.mm b/sd/source/ui/remotecontrol/OSXBluetooth.mm
index 4ccf696809f3..8b705c50ba62 100644
--- a/sd/source/ui/remotecontrol/OSXBluetooth.mm
+++ b/sd/source/ui/remotecontrol/OSXBluetooth.mm
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <osl/conditn.hxx>
+#include <sal/log.hxx>
#include <premac.h>
#import <IOBluetooth/objc/IOBluetoothRFCOMMChannel.h>
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index 56a7ca2cc2de..1ed71f1c4e36 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -31,6 +31,7 @@
#include <com/sun/star/beans/Optional.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <osl/file.h>
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 1f4128d65199..8ed353d5d503 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/container/XEnumeration.hpp>
#include <comphelper/random.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <vector>
#include <cppcanvas/color.hxx>
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 8d9f69fe1c5e..bbde657de4dc 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -28,6 +28,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
+#include <sal/log.hxx>
#endif
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index 42b2b6a5e53d..a17a739c4332 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -26,6 +26,7 @@
#include <sal/config.h>
#include <memory>
+#include <sstream>
#include <tools/contnr.hxx>
#include <tools/fract.hxx>
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 67e155e81e53..f2f6148acc4b 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -45,6 +45,8 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
+#include <sal/log.hxx>
+
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 42c4929e3557..958686c70c4f 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <vcl/print.hxx>
#include <vcl/image.hxx>
More information about the Libreoffice-commits
mailing list