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')
to directories from stoc to svx

Change-Id: If562b1aa1d676d2c1cf513e953238abbb846c65c
Reviewed-on: https://gerrit.libreoffice.org/58224
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

125 files changed, 126 insertions, 0 deletions

diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 6d02a8b9bf37..a306a0d441c2 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -20,6 +20,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/reflection/XConstantTypeDescription.hpp>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 053449dc8e6e..a954372b6728 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -69,6 +69,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/uri.hxx>
 #include <sal/types.h>
+#include <sal/log.hxx>
 #include <uno/current_context.hxx>
 #include <uno/environment.h>
 #include <jvmfwk/framework.hxx>
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 0ae4c8302c9a..1f046695e953 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -26,6 +26,7 @@
 
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <uno/current_context.h>
 #include <uno/lbnames.h>
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index f996df36bd15..7c10fc26a4b0 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -27,6 +27,7 @@
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/security/RuntimePermission.hpp>
 #include <com/sun/star/security/AllPermission.hpp>
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 7774bf02f5b5..b295aa6f112b 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -24,6 +24,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <uno/mapping.hxx>
 #include <uno/dispatcher.h>
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index c2c26efebb36..f89cd8cd315b 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <rtl/process.h>
 
 #include <cppuhelper/servicefactory.hxx>
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index a7c209fc39f3..89856bad42ef 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -21,6 +21,7 @@
 #include <stdio.h>
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <cppuhelper/servicefactory.hxx>
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index ebc878696316..2388ac078b53 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -19,6 +19,7 @@
 
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <rtl/alloc.h>
 #include <uno/environment.hxx>
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index 87dc67e00273..d8a36c99c073 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -45,6 +45,7 @@
 #include <svgmarkernode.hxx>
 #include <svgpatternnode.hxx>
 #include <svgtitledescnode.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 647048e07850..08976cc2e4be 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -31,6 +31,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <comphelper/base64.hxx>
 
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 79db5ebedc38..76f61f489d95 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svgtools.hxx>
+#include <sal/log.hxx>
 #include <osl/thread.h>
 #include <tools/color.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 5a9bd9b7551e..46ada4858a42 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/graphic/XSvgParser.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index 3226f79e610f..08240e83ae03 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -21,6 +21,7 @@
 #include "itemholder2.hxx"
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index f2566137a10a..a9258a5c607c 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -12,6 +12,7 @@
 #include <rtl/character.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
+#include <sal/log.hxx>
 #include <tools/datetime.hxx>
 #include <tools/stream.hxx>
 #include <comphelper/base64.hxx>
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index ae56eee86c81..5eee4494a988 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -24,6 +24,7 @@
 
 #include <comphelper/extract.hxx>
 #include <libxml/xmlwriter.h>
+#include <sal/log.hxx>
 
 
 // virtual
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 7254d0be75d6..4fc6c754c8ef 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
 #include <svl/cintitem.hxx>
+#include <sal/log.hxx>
 
 
 // virtual
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 6c4f41abb586..9bd233c0e91f 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -21,6 +21,7 @@
 #include <svl/flagitem.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
+#include <sal/log.hxx>
 
 
 SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) :
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 8c059fc15a80..f757b2524947 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -47,6 +47,7 @@
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
+#include <sal/log.hxx>
 #include <tools/inetmime.hxx>
 #include <unotools/charclass.hxx>
 
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 5be1e2bdffdf..6960b12bc1d8 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -22,6 +22,7 @@
 #include <svl/hint.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <sal/backtrace.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <cassert>
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index 4da9b4a98a1e..263e04845310 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -17,6 +17,7 @@
 #include <tools/extendapplicationenvironment.hxx>
 #include <vcl/svapp.hxx>
 #include <iostream>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 634469df1ae7..c5fe02e2f167 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -24,6 +24,7 @@
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>
+#include <sal/log.hxx>
 
 #include <functional>
 #include <algorithm>
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 0963e067a1da..6126f341ec6a 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <svtools/brwbox.hxx>
 #include "datwin.hxx"
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index e43f634e36bd..f4db7a2b29f6 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -19,6 +19,7 @@
 
 #include <svtools/brwbox.hxx>
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/multisel.hxx>
 #include "datwin.hxx"
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 8e09110ca02f..867525cf8f77 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -33,6 +33,7 @@
 #include <svl/poolitem.hxx>
 #include <svl/hint.hxx>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 6200fb002e85..900b67c31505 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/help.hxx>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 
 #include "itemholder2.hxx"
 
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index e9a18b21054a..c6b1034618ba 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -21,6 +21,7 @@
 #include "itemholder2.hxx"
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index d4a7335770c7..de4a910050c1 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -39,6 +39,7 @@
 #include <rtl/ustring>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index cc99f026081e..42e0f6698da3 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 55415653b920..e65ffa291635 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 
 namespace svt
 {
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7d3c41bc7045..f129b25c12ca 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -21,6 +21,7 @@
 #include <svtools/iconview.hxx>
 #include "fileview.hxx"
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <svtools/treelistentry.hxx>
 #include <svtools/fileview.hxx>
 #include <svtools/svtresid.hxx>
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index e8ea911c1506..ccbbe3e33c59 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "imivctl.hxx"
+#include <sal/log.hxx>
 
 IcnCursor_Impl::IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner )
 {
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 28495cf5e47b..c9e6acc2df65 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <svtaccessiblefactory.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 7a930883f51d..bbc4e4c71024 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -34,6 +34,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <rtl/instance.hxx>
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 
 #include <svtools/svmedit.hxx>
 #include <svtools/svlbitm.hxx>
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 5778b291ef86..d5cde4fe66dc 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -20,6 +20,7 @@
 
 #include <svtools/asynclink.hxx>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 57af295f0a6d..60beb1ef9135 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/i18n/Weekdays.hpp>
 #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
+#include <sal/log.hxx>
 
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 2ae2506cf33f..386597541494 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -26,6 +26,7 @@
 #include <vcl/field.hxx>
 #include <vcl/settings.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 4d81dff3ea36..b18efb264b27 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -36,6 +36,7 @@
 #include <map>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 9a1da4bed7bd..cf7f7c7e0473 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 #include <salhelper/thread.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index a4d81f1e9adc..acfea2528f31 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -23,6 +23,7 @@
 #include <tools/poly.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #include <svtools/ruler.hxx>
 #include <svtools/svtresid.hxx>
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 656289c268ec..219243548702 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -20,6 +20,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 #include <svtools/valueset.hxx>
 #include "valueimp.hxx"
 #include <comphelper/servicehelper.hxx>
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index bd2cb8e0b427..34f980bec084 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include "valueimp.hxx"
 
 #include <svtools/valueset.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 2ea05073f492..23479c9f9eb5 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -29,6 +29,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
+#include <sal/log.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index aadae0d5bf04..c6f4e5a4a3cd 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -22,6 +22,7 @@
 #include <svtools/svtresid.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
+#include <sal/log.hxx>
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
                             weld::ComboBoxText* pBox, weld::Button* pPropBtn )
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 45f538371b42..c9914a693ac1 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #include <svtools/ehdl.hxx>
 #include <svtools/soerr.hxx>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 4d98a55c19df..bebf898596c7 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -22,6 +22,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <bitmaps.hlst>
 
+#include <sal/log.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index daca97fb1d30..a90b8b81b8f3 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <svtools/filechangedchecker.hxx>
 
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 817a06f52430..477de6016cac 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -20,6 +20,7 @@
 #include <svtools/imagemgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/image.hxx>
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 19965aa8b50f..5118f52db82d 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <math.h>
 #include <memory>
+#include <sal/log.hxx>
 
 
 #define SCALEPOINT(aPT,aFracX,aFracY) (aPT).setX(long((aPT).X()*aFracX));  \
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 75ce24b589a3..c51e9e7f9e4f 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -14,6 +14,7 @@
 #include <officecfg/System.hxx>
 #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <svtools/langhelp.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 91647533d104..da486b63b90c 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -26,6 +26,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
+#include <sal/log.hxx>
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/langtab.hxx>
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index ba66d8310b8a..530e2d27979b 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -13,6 +13,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <i18nutil/unicode.hxx>
+#include <sal/log.hxx>
 
 // This should only be used when a commonly used font incorrectly declares its
 // coverage. If you add a font here, please leave a note explaining the issue
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 6fd4f6944ee7..23a9b299839a 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <osl/file.hxx>
 #include <svtools/templatefoldercache.hxx>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 49d08ef3d979..f3863e6dc6c4 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -24,6 +24,7 @@
 #endif
 #include <osl/mutex.hxx>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index a25f6f547517..71aa5acd7620 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -25,6 +25,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/character.hxx>
 #include <rtl/tencinfo.h>
+#include <sal/log.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/datetime.hxx>
 #include <unotools/datetime.hxx>
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 4ba540ce96d9..0208635b1860 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -23,6 +23,7 @@
 #include <rtl/textcvt.h>
 #include <rtl/tencinfo.h>
 #include <rtl/character.hxx>
+#include <sal/log.hxx>
 
 #include <vector>
 #include <climits>
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index 4a07ae840725..ac663a61fc0a 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <rtl/strbuf.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index bfe82edbe926..b0e66414f5e9 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/settings.hxx>
 
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 84f13ebcfe15..1d92c659623a 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -24,6 +24,7 @@
 #include <table/tablecontrol.hxx>
 #include "unocontroltablemodel.hxx"
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/property.hxx>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index b0402df09602..f74ab35a515a 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/view/SelectionType.hpp>
 #include <com/sun/star/awt/grid/XSortableGridData.hpp>
 
+#include <sal/log.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 7c12cf570014..c5787263245a 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -45,6 +45,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/strings.hrc>
 #include <vcl/svapp.hxx>
+#include <sal/log.hxx>
 #include <algorithm>
 
 using namespace ::accessibility;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 728871ed827a..6ae402c069f1 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <editeng/outlobj.hxx>
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 #include <editeng/unoedsrc.hxx>
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/ChildrenManager.hxx>
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index f19e3a518c47..cf33d7dc7a7e 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -26,6 +26,7 @@
 #include <algorithm>
 #include <deque>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index 31857d2ac29a..7bc2e8f7725b 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -20,6 +20,7 @@
 #include <svx/ChildrenManager.hxx>
 #include "ChildrenManagerImpl.hxx"
 #include <svx/AccessibleShape.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 06cd902e7c54..d18fff3ad720 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -31,6 +31,7 @@
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
+#include <sal/log.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/dlgctrl.hxx>
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 10b901c1d727..492ce525509a 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <salhelper/thread.hxx>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
 #include <osl/process.h>
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 296d0045b11d..6c997eb4c929 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -25,6 +25,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/graphichelper.hxx>
 #include <svx/strings.hrc>
+#include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 56fba266c325..ea6e526e6054 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -52,6 +52,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <math.h>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 9bfed5d53ab4..9c02499a7a9b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 224c1e551666..a1b0da90f426 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -22,6 +22,7 @@
 #include <config_clang.h>
 #include <svx/EnhancedCustomShape2d.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/fract.hxx>
 
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 30f670884c10..09649e10ab60 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -25,6 +25,7 @@
 #include <svl/eitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
+#include <sal/log.hxx>
 
 
 FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 05f7729ab805..fd1e7ddab1ed 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -19,6 +19,7 @@
 
 #include <svx/frmsel.hxx>
 #include <vcl/builderfactory.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <math.h>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 94b2aeccd0fa..7c9511cff437 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <linguistic/misc.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/langtab.hxx>
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 9753beffdd1f..1664b93abb20 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svl/rectitem.hxx>
+#include <sal/log.hxx>
 
 #include <svx/svxids.hrc>
 
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index cbe2dcc731be..e7f0765cb737 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -21,6 +21,7 @@
 #include <svx/rulritem.hxx>
 #include <tools/mapunit.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/frame/status/LeftRightMargin.hpp>
 #include <com/sun/star/frame/status/UpperLowerMargin.hpp>
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index b4e446aeee3f..9760215ff966 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -32,6 +32,7 @@
 #include <rtl/tencinfo.h>
 #include <rtl/locale.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/nlsupport.h>
 #include <txenctab.hrc>
 
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 9c6668fa0ea1..1731bb2a3503 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -69,6 +69,7 @@
 #include <vcl/longcurr.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #include <math.h>
 #include <memory>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index a0ad99b23ae8..edd41b7c6568 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -20,6 +20,7 @@
 
 #include <memory>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <fmprop.hxx>
 #include <svx/strings.hrc>
 #include <svx/fmtools.hxx>
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index f5d921b910b7..fdc7f6d704d7 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <helpids.h>
 #include <svx/gridctrl.hxx>
 #include <gridcell.hxx>
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index aced6bff8f4a..fda74a92c416 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -21,6 +21,8 @@
 #include <datalistener.hxx>
 #include <datanavi.hxx>
 
+#include <sal/log.hxx>
+
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index b23bcbba4391..915ce52dd0f2 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -22,6 +22,7 @@
 #include <memory>
 
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <datanavi.hxx>
 #include <fmservs.hxx>
 
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index 7484705ef797..8a9cb218d322 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -19,6 +19,7 @@
 
 #include <delayedevent.hxx>
 #include <vcl/svapp.hxx>
+#include <sal/log.hxx>
 
 namespace svxform
 {
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index a6e23f277e3a..bf43eec8379f 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/form/Forms.hpp>
 
+#include <sal/log.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/fmpage.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 4f3f6cd4eba7..cfc0d7ba420d 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -19,6 +19,7 @@
 
 
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <fmitems.hxx>
 #include <fmobj.hxx>
 #include <fmpgeimp.hxx>
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 6cd469c72dda..f48f2e537d62 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -20,6 +20,7 @@
 #include <svx/fmsrccfg.hxx>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <i18nutil/transliteration.hxx>
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 30979723538b..4aaf9dc6d2dd 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -19,6 +19,7 @@
 
 
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <svx/fmtools.hxx>
 #include <svx/fmsrccfg.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 7c0c24b3c1af..becb05cb0976 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -57,6 +57,7 @@
 #include <svl/whiter.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <vcl/outdev.hxx>
 
 #include <memory>
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index f396e15e847b..5132c9b3133d 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -78,6 +78,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <vcl/stdtext.hxx>
 #include <connectivity/dbtools.hxx>
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 1b0069b9f725..179fc9d85ea5 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -84,6 +84,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <iterator>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 12a2425ce6a9..805aca14580e 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -34,6 +34,7 @@
 #include <fmitems.hxx>
 #include <fmobj.hxx>
 #include <fmprop.hxx>
+#include <sal/log.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx
index 9708e917a630..59c52719dd2d 100644
--- a/svx/source/gallery2/galini.cxx
+++ b/svx/source/gallery2/galini.cxx
@@ -14,6 +14,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 059880773e2c..b3d83ca70150 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <algorithm>
 
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 1a218d1d0524..744c80ae58a8 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <stdio.h>
 #ifndef _WIN32
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index c70aad6fd6fa..f10c82bf3030 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/propertysequence.hxx>
 #include <svx/SmartTagItem.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/container/XStringKeyMap.hpp>
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index f7c245dd2a3a..0f934039ce07 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -29,6 +29,7 @@
 #include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/unitconv.hxx>
+#include <sal/log.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 9ba3b15d510b..98c85612e9ae 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -35,6 +35,7 @@
 #include <svl/aeitem.hxx>
 #include <svx/svdview.hxx>
 #include <svx/transfrmhelper.hxx>
+#include <sal/log.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 975aa0d4b691..3205dccd32f0 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/intitem.hxx>
+#include <sal/log.hxx>
 
 #include <svx/pszctrl.hxx>
 
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index a784b2f8ca0c..be0763e6d9a8 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -38,6 +38,7 @@
 #include <svx/xmlsecctrl.hxx>
 #include <tools/urlobj.hxx>
 #include <bitmaps.hlst>
+#include <sal/log.hxx>
 
 SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item );
 
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index ed92af23be34..ce763fdc9f2e 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -25,6 +25,7 @@
 #include <vcl/settings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
+#include <sal/log.hxx>
 
 #include <svx/strings.hrc>
 
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 85ca2a280b08..d6031358738a 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -42,6 +42,7 @@
 #include <svx/svdoashp.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 #include <memory>
 #include <vector>
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 5dc1a3473135..e6616c0247e0 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -67,6 +67,7 @@
 #include <svx/sdr/overlay/overlayselection.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpagewindow.hxx>
+#include <sal/log.hxx>
 
 #include <memory>
 
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index b8976cfa12c4..61401a33262f 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -33,6 +33,7 @@
 #include <svl/rectitem.hxx>
 #include <svl/rngitem.hxx>
 #include <svl/whiter.hxx>
+#include <sal/log.hxx>
 
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/svdattr.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6cd4947da101..f2b2db4086cb 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -21,6 +21,7 @@
 #include <config_features.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 54c3d66846da..8ed836168792 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -23,6 +23,7 @@
 
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index c259f1b4bb1e..02179d16879f 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -86,6 +86,7 @@
 #include <rtl/ref.hxx>
 #include <bitmaps.hlst>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 63acf8d4f9f5..c1b8e57b7d34 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -53,6 +53,7 @@
 #include <svx/sdr/attribute/sdrformtextattribute.hxx>
 #include <o3tl/make_unique.hxx>
 #include <memory>
+#include <sal/log.hxx>
 
 using namespace sdr;
 
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 3c4ee03d89b3..a7e706da16a6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -61,6 +61,7 @@
 #include <vcl/virdev.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 0ef85952b253..70f23a4e5974 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -54,6 +54,7 @@
 #include <editeng/editobj.hxx>
 #include <editeng/overflowingtxt.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index b6bc08ce7d10..f7797f54fe15 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -85,6 +85,7 @@
 #include <vcl/BitmapTools.hxx>
 #include <vcl/dibtools.hxx>
 #include <com/sun/star/geometry/Matrix2D.hpp>
+#include <sal/log.hxx>
 
 namespace
 {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 5d8719b7abea..d039b68afae9 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -25,6 +25,7 @@
 #include <vcl/virdev.hxx>
 #include <tools/bigint.hxx>
 #include <unotools/syslocale.hxx>
+#include <sal/log.hxx>
 
 void MoveXPoly(XPolygon& rPoly, const Size& S)
 {
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 91bccc57f5e2..3cdbec76c362 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -51,6 +51,7 @@
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <drawinglayer/processor2d/contourextractor2d.hxx>
 #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx>
+#include <sal/log.hxx>
 
 
 SdrViewEvent::SdrViewEvent()
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index b3d473923633..3ca13ce06b6c 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -24,6 +24,7 @@
 #include <editeng/editobj.hxx>
 #include <editeng/overflowingtxt.hxx>
 #include <svx/textchainflow.hxx>
+#include <sal/log.hxx>
 
 TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
     : mpTargetLink(pChainTarget)
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index d2aa8fd866d4..cde45dcc4ffc 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <memory>
 #include <utility>
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index b9c4e8dd23bb..317e12efb62c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/table/XMergeableCell.hpp>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index d04e63fb668c..732e417ab06d 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -40,6 +40,7 @@
 #include <editeng/editdata.hxx>
 #include <svx/svdmodel.hxx>
 #include <editeng/svxrtf.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::table;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7a40126fdd1e..84bf6ee94990 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -106,6 +106,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <bitmaps.hlst>
+#include <sal/log.hxx>
 
 #define MAX_MRU_FONTNAME_ENTRIES    5
 
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 30a403a83d99..4eff1c5bb569 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -21,6 +21,7 @@
 #include <svx/tbxcolor.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <sal/log.hxx>
 
 
 namespace svx
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 7dc51166c3b5..f18938084d6d 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -51,6 +51,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/globname.hxx>
+#include <sal/log.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 20040a4ec4f4..459353b72a73 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -66,6 +66,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/fcontnr.hxx>
+#include <sal/log.hxx>
 
 
 #include <memory>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 40859838ebd7..4873ff2dc0cb 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
 #include <comphelper/serviceinfohelper.hxx>
+#include <sal/log.hxx>
 
 #include <svx/svdpool.hxx>
 #include <svx/svditer.hxx>
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index edc9b8ff5854..5130e081bd48 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -52,6 +52,7 @@
 #include <svx/svdview.hxx>
 #include <vcl/wmf.hxx>
 #include <svtools/embedhlp.hxx>
+#include <sal/log.hxx>
 
 #include <config_features.h>
 
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index a24533062e34..d59704051e5b 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -30,6 +30,7 @@
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <rtl/ref.hxx>
 #include <svx/unoprov.hxx>
 
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index a5058f1e7610..b3859a92acfd 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <sot/storage.hxx>
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 553522172a27..40c64f81fac4 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <comphelper/string.hxx>
 #include <sal/macros.h>
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 2d187c7609b6..7534de8a5687 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <comphelper/base64.hxx>
 #include <comphelper/graphicmimetype.hxx>
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index d4dce050dcd3..854dcd7b94eb 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -34,6 +34,7 @@
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <math.h>