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 w* x* Change-Id: I27bff44da3d34d24262031c7489e755311599bc5 Reviewed-on: https://gerrit.libreoffice.org/57307 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-11 08:00:51 +02:00 · 2018-07-11 08:00:51 +02:00 · 0132f27d4e
commit 0132f27d4e
parent 7d710ee08f
167 changed files with 186 additions and 0 deletions
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@ -17,6 +17,8 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+
+#include <sal/log.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@ -18,6 +18,7 @@
 */

 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@ -22,6 +22,7 @@
 #include <ooxml/resourceids.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/sequence.hxx>
+#include <sal/log.hxx>

 namespace writerfilter {
 namespace dmapper {
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@ -78,6 +78,7 @@
 #include "GraphicHelpers.hxx"
 #include <dmapper/GraphicZOrderHelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>

 using namespace ::com::sun::star;
 using namespace oox;
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@ -36,6 +36,7 @@
 #include "ConversionHelper.hxx"
 #include "util.hxx"
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/sequence.hxx>

 #ifdef DEBUG_WRITERFILTER
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@ -33,6 +33,7 @@
 #include <ooxml/resourceids.hxx>
 #include "DomainMapper.hxx"
 #include <rtl/math.hxx>
+#include <sal/log.hxx>

 namespace writerfilter {
 namespace dmapper {
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@ -93,6 +93,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>


 using namespace ::com::sun::star;
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@ -20,6 +20,7 @@
 #include "FontTable.hxx"
 #include <ooxml/resourceids.hxx>
 #include <vector>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <rtl/tencinfo.h>
 #include <vcl/embeddedfontshelper.hxx>
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@ -28,6 +28,7 @@
 #include <com/sun/star/text/RelOrientation.hpp>

 #include <oox/drawingml/drawingmltypes.hxx>
+#include <sal/log.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@ -47,6 +47,7 @@
 #include <svx/unoapi.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <rtl/math.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/sequenceashashmap.hxx>
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@ -38,6 +38,7 @@

 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/propertyvalue.hxx>

--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@ -25,6 +25,7 @@
 #include <oox/ole/oleobjecthelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <unotools/mediadescriptor.hxx>
 #include <officecfg/Office/Common.hxx>
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@ -24,6 +24,7 @@
 #include <i18nutil/paper.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@ -12,6 +12,7 @@
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
+#include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <editeng/unoprnms.hxx>
 #include <vcl/svapp.hxx>
--- a/writerfilter/source/dmapper/SmartTagHandler.cxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.cxx
@ -15,6 +15,8 @@

 #include <ooxml/resourceids.hxx>

+#include <sal/log.hxx>
+
 namespace
 {
 OUString lcl_getTypePath(OUString& rType)
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@ -40,6 +40,7 @@
 #include <set>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/sequence.hxx>
 #include <tools/diagnose_ex.h>
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@ -22,6 +22,8 @@
 #include "DomainMapper_Impl.hxx"
 #include "util.hxx"

+#include <sal/log.hxx>
+
 namespace writerfilter
 {
 namespace dmapper
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@ -26,6 +26,8 @@
 #include "WrapPolygonHandler.hxx"
 #include "util.hxx"

+#include <sal/log.hxx>
+
 namespace writerfilter {

 using namespace com::sun::star;
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@ -30,6 +30,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@ -41,6 +41,8 @@
 #include <oox/ole/vbaproject.hxx>
 #include <ooxml/OOXMLDocument.hxx>
 #include <unotools/mediadescriptor.hxx>
+#include <rtl/ref.hxx>
+#include <sal/log.hxx>

 using namespace ::com::sun::star;

--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@ -20,6 +20,8 @@
 #include <ooxml/resourceids.hxx>
 #include "Handler.hxx"

+#include <sal/log.hxx>
+
 namespace writerfilter {
 namespace ooxml
 {
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@ -33,6 +33,7 @@
 #include "OOXMLFastDocumentHandler.hxx"
 #include "OOXMLPropertySet.hxx"

+#include <sal/log.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@ -22,6 +22,7 @@
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <ooxml/resourceids.hxx>
 #include <oox/token/namespaces.hxx>
+#include <sal/log.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <tools/globname.hxx>
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@ -22,6 +22,8 @@
 #include "OOXMLParserState.hxx"
 #include "Handler.hxx"

+#include <sal/log.hxx>
+
 namespace writerfilter {
 namespace ooxml
 {
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@ -17,6 +17,7 @@
 #include <filter/msfilter/escherex.hxx>
 #include <rtl/character.hxx>
 #include <tools/stream.hxx>
+#include <sal/log.hxx>

 #include <dmapper/DomainMapperFactory.hxx>
 #include <ooxml/resourceids.hxx>
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@ -19,6 +19,8 @@

 #include <ooxml/resourceids.hxx>

+#include <sal/log.hxx>
+
 #include "rtfsdrimport.hxx"
 #include "rtfskipdestination.hxx"

--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@ -14,6 +14,8 @@

 #include <ooxml/resourceids.hxx>

+#include <sal/log.hxx>
+
 #include "rtfreferenceproperties.hxx"
 #include "rtfskipdestination.hxx"

--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@ -15,6 +15,7 @@
 #include <comphelper/sequence.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <rtl/tencinfo.h>
 #include <tools/mapunit.hxx>

--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@ -32,6 +32,7 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/tencinfo.h>
+#include <sal/log.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <vcl/graph.hxx>
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@ -32,6 +32,7 @@
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <filter/msfilter/rtfutil.hxx>
+#include <sal/log.hxx>
 #include <svx/svdtrans.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/propertyvalue.hxx>
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@ -14,6 +14,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/character.hxx>
+#include <sal/log.hxx>
 #include "rtfskipdestination.hxx"
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@ -14,6 +14,7 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sfx2/passwd.hxx>
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@ -15,6 +15,7 @@
 #include <comphelper/seekableinput.hxx>

 #include <rtl/string.hxx>
+#include <sal/log.hxx>

 #include <sot/storage.hxx>

--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@ -10,6 +10,7 @@
 */

 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>

 #include <libe-book/libe-book.h>

--- a/writerperfect/source/writer/EPUBPackage.cxx
+++ b/writerperfect/source/writer/EPUBPackage.cxx
@ -16,6 +16,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>

+#include <sal/log.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/attrlist.hxx>
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@ -10,6 +10,7 @@
 */

 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>

 #include <libwps/libwps.h>

--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
@ -12,6 +12,8 @@
 #include "xmlimp.hxx"
 #include "xmltext.hxx"

+#include <sal/log.hxx>
+
 using namespace com::sun::star;

 namespace writerperfect
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@ -14,6 +14,8 @@
 #include "xmlimp.hxx"
 #include "xmltext.hxx"

+#include <sal/log.hxx>
+
 using namespace com::sun::star;

 namespace writerperfect
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@ -13,6 +13,8 @@
 #include "XMLTextFrameContext.hxx"
 #include "xmlimp.hxx"

+#include <sal/log.hxx>
+
 using namespace com::sun::star;

 namespace
--- a/writerperfect/source/writer/exp/xmlfmt.cxx
+++ b/writerperfect/source/writer/exp/xmlfmt.cxx
@ -13,6 +13,8 @@
 #include "txtstyli.hxx"
 #include "xmlimp.hxx"

+#include <sal/log.hxx>
+
 using namespace com::sun::star;

 namespace writerperfect
--- a/writerperfect/source/writer/exp/xmltbli.cxx
+++ b/writerperfect/source/writer/exp/xmltbli.cxx
@ -13,6 +13,8 @@
 #include "xmlimp.hxx"
 #include "xmltext.hxx"

+#include <sal/log.hxx>
+
 using namespace com::sun::star;

 namespace writerperfect
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@ -36,6 +36,7 @@
 #endif

 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>

 #include <algorithm>
 #include <set>
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@ -20,6 +20,7 @@
 #include <string.h>
 #include <rtl/character.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tvread.hxx>
 #include <expat.h>
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@ -30,6 +30,7 @@
 #include <xmloff/xmluconv.hxx>

 #include <tools/color.hxx>
+#include <sal/log.hxx>

 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@ -26,6 +26,7 @@
 #include "SchXMLSeries2Context.hxx"
 #include "SchXMLTools.hxx"
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@ -19,6 +19,7 @@

 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>

 #include <sax/tools/converter.hxx>

--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@ -26,6 +26,7 @@

 #include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/prstylei.hxx>
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@ -26,6 +26,8 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>

+#include <sal/log.hxx>
+
 #include <com/sun/star/chart/ChartLegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@ -27,6 +27,7 @@
 #include "SchXMLTools.hxx"

 #include <comphelper/processfactory.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@ -45,6 +45,7 @@
 #include <comphelper/processfactory.hxx>

 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

 #include <rtl/ustring.h>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>

 #include <typeinfo>
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@ -27,6 +27,7 @@
 #include "transporttypes.hxx"
 #include <XMLStringBufferImportContext.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@ -48,6 +48,7 @@

 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <algorithm>
 #include <map>

--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@ -24,6 +24,8 @@
 #include <xmloff/families.hxx>
 #include <xmloff/xmltypes.hxx>

+#include <sal/log.hxx>
+
 #include "XMLChartPropertyContext.hxx"

 using namespace com::sun::star;
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@ -27,6 +27,8 @@
 #include "contexts.hxx"
 #include "SchXMLChartContext.hxx"

+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 using namespace ::xmloff::token;

--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@ -43,6 +43,7 @@
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/document/NamedPropertyValues.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <unotools/configmgr.hxx>
 #include "xmlenums.hxx"
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@ -33,6 +33,7 @@
 #include <com/sun/star/xml/dom/NodeType.hpp>

 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>

 #include <comphelper/processfactory.hxx>

--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@ -37,6 +37,7 @@

 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>


 #include <vector>
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@ -29,6 +29,7 @@
 #include <com/sun/star/rdf/XDocumentRepository.hpp>

 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>

 #include <map>
 #include <iterator>
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@ -23,6 +23,7 @@
 #include <xmloff/SettingsExportHelper.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/base64.hxx>
--- a/xmloff/source/core/SvXMLAttrCollection.cxx
+++ b/xmloff/source/core/SvXMLAttrCollection.cxx
@ -10,6 +10,7 @@
 #include "SvXMLAttrCollection.hxx"
 #include <limits.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>

 bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const
 {
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@ -18,6 +18,7 @@
 */

 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/i18nmap.hxx>

 void SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName,
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@ -21,6 +21,7 @@

 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>

 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@ -20,6 +20,7 @@
 #include <xmloff/xmlerror.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/uno/Any.hxx>
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@ -19,6 +19,7 @@

 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>

 #include <stack>
 #include <string.h>
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@ -21,6 +21,7 @@
 #include <string.h>

 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@ -24,6 +24,7 @@
 #include <com/sun/star/util/Date.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <rtl/math.hxx>
--- a/xmloff/source/draw/SignatureLineContext.cxx
+++ b/xmloff/source/draw/SignatureLineContext.cxx
@ -17,6 +17,7 @@
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>

+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <xmloff/xmltoken.hxx>
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@ -24,6 +24,8 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>

+#include <sal/log.hxx>
+
 #include "sdxmlexp_impl.hxx"
 #include "sdxmlimp_impl.hxx"

--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@ -18,6 +18,7 @@
 */

 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <xmloff/XMLShapeStyleContext.hxx>
 #include <XMLShapePropertySetContext.hxx>
 #include <xmloff/contextid.hxx>
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@ -53,6 +53,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <o3tl/any.hxx>
 #include <sax/tools/converter.hxx>
+#include <sal/log.hxx>

 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include "sdxmlexp_impl.hxx"
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@ -23,6 +23,7 @@
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>

 #include <sax/tools/converter.hxx>
+#include <sal/log.hxx>

 #include <list>
 #include <comphelper/extract.hxx>
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@ -25,6 +25,7 @@
 #include <com/sun/star/presentation/ClickAction.hpp>
 #include <tools/urlobj.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>

 #include <sax/tools/converter.hxx>

--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@ -19,6 +19,7 @@


 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <com/sun/star/drawing/XLayerManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@ -18,6 +18,7 @@
 */

 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <propimp0.hxx>
 #include "sdxmlexp_impl.hxx"
 #include <com/sun/star/drawing/LineDash.hpp>
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@ -52,6 +52,7 @@
 #include <com/sun/star/util/Duration.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/gen.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmlaustp.hxx>
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@ -19,6 +19,7 @@

 #include <o3tl/make_unique.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>

 #include <xmloff/xmlscripti.hxx>
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@ -92,6 +92,7 @@

 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>

 #include <sax/tools/converter.hxx>

--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@ -21,6 +21,7 @@

 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>

 #include <com/sun/star/text/PositionLayoutDir.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@ -19,6 +19,7 @@

 #include <sax/tools/converter.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>

 #include "ximp3dscene.hxx"
 #include <xmloff/xmluconv.hxx>
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@ -38,6 +38,7 @@
 #include <PropertySetMerger.hxx>
 #include <animationimport.hxx>
 #include <osl/diagnose.hxx>
+#include <sal/log.hxx>

 using namespace ::com::sun::star;

--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@ -20,6 +20,7 @@
 #include <cassert>

 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@ -26,6 +26,7 @@
 #include <tools/debug.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>

 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@ -62,6 +62,7 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/extract.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>

 #include <algorithm>

--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@ -45,6 +45,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/sequence.hxx>
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@ -20,6 +20,7 @@
 #include "eventexport.hxx"
 #include "strings.hxx"
 #include <comphelper/sequence.hxx>
+#include <sal/log.hxx>

 namespace xmloff
 {
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@ -30,6 +30,7 @@
 #include <xmloff/contextid.hxx>
 #include <xmloff/controlpropertyhdl.hxx>
 #include <xmloff/maptype.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
 #include "controlpropertymap.hxx"
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@ -26,6 +26,7 @@

 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>

 #include <unordered_map>

--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@ -31,6 +31,7 @@
 #include <sax/tools/converter.hxx>
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@ -30,6 +30,7 @@
 #include <xmloff/nmspmap.hxx>
 #include <o3tl/temporary.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/extract.hxx>
 #include "callbacks.hxx"
 #include <xmloff/xmlnmspe.hxx>
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@ -19,6 +19,7 @@

 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>

 #include <xmloff/xmlmetae.hxx>
 #include <xmloff/xmlexp.hxx>
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@ -25,6 +25,7 @@

 #include <com/sun/star/container/XNameReplace.hpp>
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@ -32,6 +32,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>

 using namespace ::com::sun::star;
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@ -30,6 +30,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@ -31,6 +31,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>

 using namespace ::com::sun::star;
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@ -28,6 +28,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>

 using namespace css;
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@ -23,6 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>

+#include <sal/log.hxx>

 using ::com::sun::star::beans::XMultiPropertySet;
 using ::com::sun::star::beans::XPropertySet;
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@ -29,6 +29,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <tools/color.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlexp.hxx>
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@ -20,6 +20,7 @@
 #include <XMLClipPropertyHandler.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@ -27,6 +27,7 @@
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include <vcl/embeddedfontshelper.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>

 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
--- a/Show More
+++ b/Show More