Kaydet (Commit) c40109cc authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

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 6ff2d84a 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: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst a472d335
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <algorithm> #include <algorithm>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <config_features.h> #include <config_features.h>
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include "FPServiceInfo.hxx" #include "FPServiceInfo.hxx"
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include "SalAquaFolderPicker.hxx" #include "SalAquaFolderPicker.hxx"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
#include <sal/log.hxx>
#include <osl/getglobalmutex.hxx> #include <osl/getglobalmutex.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
#include <setjmp.h> #include <setjmp.h>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <rtl/byteseq.hxx> #include <rtl/byteseq.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
#include <sal/log.hxx>
#include <salhelper/linkhelper.hxx> #include <salhelper/linkhelper.hxx>
#include <salhelper/thread.hxx> #include <salhelper/thread.hxx>
#include <memory> #include <memory>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <cassert> #include <cassert>
#include <memory> #include <memory>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <cassert> #include <cassert>
#include <memory> #include <memory>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/uri.hxx> #include <rtl/uri.hxx>
#include <sal/log.hxx>
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <osl/process.h> #include <osl/process.h>
#include <libxml/xpathInternals.h> #include <libxml/xpathInternals.h>
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <osl/process.h> #include <osl/process.h>
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
#include <rtl/uri.hxx> #include <rtl/uri.hxx>
#include <sal/log.hxx>
#include <osl/getglobalmutex.hxx> #include <osl/getglobalmutex.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <cppuhelper/bootstrap.hxx> #include <cppuhelper/bootstrap.hxx>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <sal/log.hxx>
#include <sal/types.h> #include <sal/types.h>
#include <cppunittester/protectorfactory.hxx> #include <cppunittester/protectorfactory.hxx>
#include <osl/module.h> #include <osl/module.h>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <osl/signal.h> #include <osl/signal.h>
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <sal/log.hxx>
#include "system.hxx" #include "system.hxx"
#include "file_impl.hxx" #include "file_impl.hxx"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <osl/process.h> #include <osl/process.h>
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include "nlsupport.hxx" #include "nlsupport.hxx"
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include <osl/signal.h> #include <osl/signal.h>
#include <osl/process.h> #include <osl/process.h>
#include <osl/thread.h> #include <osl/thread.h>
#include <sal/log.hxx>
#include <sal/macros.h> #include <sal/macros.h>
#include <rtl/bootstrap.h> #include <rtl/bootstrap.h>
#include <rtl/digest.h> #include <rtl/digest.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <osl/file.hxx> #include <osl/file.hxx>
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <rtl/byteseq.h> #include <rtl/byteseq.h>
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
#include "file_url.hxx" #include "file_url.hxx"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <rtl/character.hxx> #include <rtl/character.hxx>
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
static const wchar_t UNC_PREFIX[] = L"\\\\"; static const wchar_t UNC_PREFIX[] = L"\\\\";
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <algorithm> #include <algorithm>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/thread.h> #include <osl/thread.h>
#include <osl/file.h> #include <osl/file.h>
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
#include <vector> #include <vector>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "path_helper.hxx" #include "path_helper.hxx"
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <algorithm> #include <algorithm>
#include <wchar.h> #include <wchar.h>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "file_url.hxx" #include "file_url.hxx"
#include "path_helper.hxx" #include "path_helper.hxx"
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <sal/log.hxx>
oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process) oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
{ {
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <osl/file.h> #include <osl/file.h>
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <sal/macros.h> #include <sal/macros.h>
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <osl/thread.h> #include <osl/thread.h>
#include <rtl/process.h> #include <rtl/process.h>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
using namespace osl; using namespace osl;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
#include <rtl/malformeduriexception.hxx> #include <rtl/malformeduriexception.hxx>
#include <rtl/uri.hxx> #include <rtl/uri.hxx>
#include <sal/log.hxx>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <rtl/byteseq.hxx> #include <rtl/byteseq.hxx>
#include <osl/process.h> #include <osl/process.h>
#include <sal/log.hxx>
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <compiler.hxx> #include <compiler.hxx>
#include <tokenarray.hxx> #include <tokenarray.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <sal/log.hxx>
#include <memory> #include <memory>
#include <vector> #include <vector>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <sal/log.hxx>
#include <premac.h> #include <premac.h>
#import <IOBluetooth/objc/IOBluetoothRFCOMMChannel.h> #import <IOBluetooth/objc/IOBluetoothRFCOMMChannel.h>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/beans/Optional.hpp>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/file.h> #include <osl/file.h>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XEnumeration.hpp>
#include <comphelper/random.hxx> #include <comphelper/random.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <sal/log.hxx>
#include <vector> #include <vector>
#include <cppcanvas/color.hxx> #include <cppcanvas/color.hxx>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <sal/log.hxx>
#endif #endif
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <sal/config.h> #include <sal/config.h>
#include <memory> #include <memory>
#include <sstream>
#include <tools/contnr.hxx> #include <tools/contnr.hxx>
#include <tools/fract.hxx> #include <tools/fract.hxx>
......
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <sal/log.hxx>
using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::awt; using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <sal/log.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>
#include <vcl/image.hxx> #include <vcl/image.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment