diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-07-11 08:00:51 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-12 10:40:25 +0200 |
commit | 0132f27d4e062b9306e4fb90c38a58afffbe6cf0 (patch) | |
tree | 9d4504a59cb559e994c290b64c94b6e4918449ea /writerfilter | |
parent | 7d710ee08fbaecd376a8b731965e805ad0f4c59a (diff) |
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>
Diffstat (limited to 'writerfilter')
29 files changed, 37 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index 194e9e2722ec..a30b56a1c9a2 100644 --- 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 { diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d3719e745b13..80bcfa67175d 100644 --- 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; diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 443d44bbd40a..2e9bfa959249 100644 --- 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 diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 5b105402d1a5..633eca7e987b 100644 --- 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 { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8b1462b7b527..6b0663ad5d07 100644 --- 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; diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 67224202b886..1d3de2c1779e 100644 --- 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> diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index ca2892a013af..2b08671156de 100644 --- 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> diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index cf79af44647c..73f9746eb548 100644 --- 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> diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 5defd92f0d49..83e487c415e4 100644 --- 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> diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index fc0268623f5d..8ebf88c7c6f2 100644 --- 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> diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index ed7632b2551f..5cf50c69d0d6 100644 --- 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> diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index b80903e44efa..12c11c38798a 100644 --- 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> diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/writerfilter/source/dmapper/SmartTagHandler.cxx index e942c23aaa0f..41f68ac08b0e 100644 --- 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) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index a9bb010db5da..188359b4b38a 100644 --- 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> diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index 198a793e61e1..486381a0f08d 100644 --- 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 diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx index 010cf2e195a6..862dae53e2e2 100644 --- 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; diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index ba6e3faa8d97..b024a2214e1e 100644 --- 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> diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index eb3ead50bd97..655b0e57b17e 100644 --- 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; diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx index c0d59ffeadb6..290a4b749758 100644 --- 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 { diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 3b5cdd6573af..789a8e790963 100644 --- 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> diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index bac67461d74d..33db6201101c 100644 --- 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> diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index 0e13832c5631..4b3104f166db 100644 --- 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 { diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx index bb9253a201f5..02e6c3da72fd 100644 --- 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> diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index ec73d0b4b64d..d48893f38d4d 100644 --- 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" diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx index 5478f5ec0f1a..f7371ee7ac22 100644 --- 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" diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index f10e95119e26..14c7b93853bc 100644 --- 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> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 20fb1ca4fab8..f669fd52eada 100644 --- 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> diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 1b6c819b671d..272c7e796083 100644 --- 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> diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index a3a4aff2da7e..65a80932e90d 100644 --- 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> |