diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-06-16 08:26:04 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-06-20 09:22:34 +0200 |
commit | 2a06796fa6f6255314cf4c1271f62154f08bac4f (patch) | |
tree | 91b5699fefb8c2a0742ed1c6611b448d1220dcf5 /sw/source/filter/ww8 | |
parent | ccecd6644ccec54f665e9070660f8b1139370ebc (diff) |
tdf#42949 Fix IWYU warnings in sw/source/filter/*/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I7ccd6af737c21a50fe7df25266198ee6989c4c69
Reviewed-on: https://gerrit.libreoffice.org/74110
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/filter/ww8')
34 files changed, 41 insertions, 24 deletions
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index b9290e24d3d5..628f3194b805 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -27,6 +27,7 @@ #include <o3tl/make_shared.hxx> #include <tools/stream.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> namespace ww8 { diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index b404d4b69820..afd4e696780d 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -23,7 +23,6 @@ #include <memory> #include <vector> -#include <tools/solar.h> #include <rtl/ustring.hxx> #include <IDocumentExternalData.hxx> diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 0ecda9170a19..b5d4897253ea 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -29,6 +29,7 @@ #include <ndtxt.hxx> #include <dbgoutsw.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> namespace ww8 { diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 2439cfabf5f8..72116df53bc2 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -31,13 +31,10 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <swtypes.hxx> -#include <wrtswtbl.hxx> #include <fldbas.hxx> #include <IDocumentRedlineAccess.hxx> #include <unotools/saveopt.hxx> -#include <vector> - class Point; class SvxCaseMapItem; class SvxColorItem; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f2c30c2eb654..cf6f5f2e8ab8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -117,6 +117,7 @@ #include <ndtxt.hxx> #include <pagedesc.hxx> #include <paratr.hxx> +#include <poolfmt.hxx> #include <charatr.hxx> #include <swmodule.hxx> #include <swtable.hxx> diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 647a73e315c5..8c858f5a107a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -26,6 +26,7 @@ #include "fields.hxx" #include <IMark.hxx> #include "docxexport.hxx" +#include <wrtswtbl.hxx> #include <editeng/boxitem.hxx> #include <sax/fshelper.hxx> diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index f11c4cbdd82f..b9870a93e30e 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -64,6 +64,7 @@ #include <section.hxx> #include <ftninfo.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include <swdbdata.hxx> #include <editeng/unoprnms.hxx> diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 1de037fb7662..0424f2619e75 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -23,13 +23,10 @@ #include "wrtww8.hxx" #include <sax/fshelper.hxx> -#include <sax/fastattribs.hxx> #include <rtl/ustring.hxx> #include <cstdio> #include <memory> -#include <vector> -#include <boost/optional.hpp> #include <ndole.hxx> class DocxAttributeOutput; diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index c2ec261d0d20..614069f0dd5d 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX +#include <sal/types.h> + #include <vector> class SwFormatFootnote; diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 84943a518cac..eee4bd1cc0fb 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -29,6 +29,7 @@ #include <fmtanchr.hxx> #include <fmtsrnd.hxx> #include <fmtcntnt.hxx> +#include <fmtornt.hxx> #include <ndtxt.hxx> #include <txatbase.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index a38f0c02b0e7..3e7e49edf0fc 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -21,6 +21,8 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_ESCHER_HXX #include <filter/msfilter/escherex.hxx> +#include <svx/svdtrans.hxx> +#include "wrtww8.hxx" const sal_uInt32 nInlineHack = 0x00010001; class SwFrameFormat; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index fca115a6e26f..01135c7aaba6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -83,6 +83,7 @@ #include <grfatr.hxx> #include <ndole.hxx> #include <lineinfo.hxx> +#include <redline.hxx> #include <rtf.hxx> #include <IDocumentSettingAccess.hxx> #include <vcl/cvtgrf.hxx> diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 66e902a770fc..136e84146f69 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -26,6 +26,8 @@ #include "attributeoutputbase.hxx" #include "rtfstringbuffer.hxx" +#include <wrtswtbl.hxx> + #include <rtl/strbuf.hxx> #include <boost/optional.hpp> diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 504424b70d8a..4c8ed0281537 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -43,6 +43,8 @@ #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> #include <lineinfo.hxx> +#include <poolfmt.hxx> +#include <redline.hxx> #include <swmodule.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentStylePoolAccess.hxx> @@ -50,6 +52,7 @@ #include <svtools/rtfkeywd.hxx> #include <filter/msfilter/rtfutil.hxx> #include <unotools/docinfohelper.hxx> +#include <osl/diagnose.h> #include <rtl/tencinfo.h> #include <sal/log.hxx> #if OSL_DEBUG_LEVEL > 1 diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index 2e36fba4155c..7efec13aa9ff 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_SORTEDARRAY_HXX #include <osl/diagnose.h> -#include <sal/log.hxx> #include <algorithm> //simple template that manages a static [] array by sorting at construction diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx index c832e133cff8..f2fd85817c49 100644 --- a/sw/source/filter/ww8/types.hxx +++ b/sw/source/filter/ww8/types.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_TYPES_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_TYPES_HXX +#include <sal/types.h> + #include <vector> namespace ww diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index eb46cfb1463c..5e62280a501a 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -48,6 +48,8 @@ #include <docary.hxx> #include <charfmt.hxx> #include <fchrfmt.hxx> +#include <redline.hxx> +#include "types.hxx" #include <unotools/streamwrap.hxx> #include <svtools/embedhlp.hxx> #include <numrule.hxx> diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 80430bcca9d7..4f6f67e49b8d 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <sfx2/objsh.hxx> -#include "types.hxx" #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svx/svdtypes.hxx> diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index fc69bb8ed574..c802760b4cdf 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -43,6 +43,7 @@ #include <fmtclds.hxx> #include <hfspacingitem.hxx> #include <fmtfsize.hxx> +#include <poolfmt.hxx> #include <swrect.hxx> #include <fmthdft.hxx> #include <frmatr.hxx> diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx index 362a8e19a342..3b532356602a 100644 --- a/sw/source/filter/ww8/writerwordglue.hxx +++ b/sw/source/filter/ww8/writerwordglue.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_WRITERWORDGLUE_HXX #include "needed_cast.hxx" -#include "types.hxx" class SwFrameFormat; class SfxItemSet; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index bf682a5880d5..1f3dec9ef7ce 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -76,6 +76,7 @@ #include <ndole.hxx> #include <unodraw.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include "ww8par.hxx" #include <breakit.hxx> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 6651baaa15b0..c65de3898ff6 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -57,6 +57,7 @@ #include <lineinfo.hxx> #include <fmtline.hxx> #include <swtable.hxx> +#include <redline.hxx> #include <msfilter.hxx> #include <swmodule.hxx> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index bf8fb4665528..7773e25549ce 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -71,6 +71,7 @@ #include <shellio.hxx> #include <docstat.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include <IMark.hxx> #include <swtable.hxx> #include "wrtww8.hxx" diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index f72302f88538..cc2255e78411 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -26,7 +26,6 @@ #include <editeng/editdata.hxx> #include <shellio.hxx> -#include <wrt_fn.hxx> #include "ww8struc.hxx" #include "ww8scan.hxx" diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index ae95c7a13d76..05b42b9a0478 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -104,6 +104,7 @@ #include <flddat.hxx> #include <ndtxt.hxx> #include <swrect.hxx> +#include <redline.hxx> #include <reffld.hxx> #include <ftninfo.hxx> #include <charfmt.hxx> diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 96dc246e9919..10b0d12ba17a 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -24,6 +24,7 @@ #include <swerror.h> #include <ndtxt.hxx> #include <pam.hxx> +#include <poolfmt.hxx> #include <shellio.hxx> #include <docsh.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 6d865ad787c5..61b3f6fc6741 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -22,6 +22,8 @@ #include <memory> #include <sot/storage.hxx> + +#include <doc.hxx> #include "ww8scan.hxx" class SwTextBlocks; diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index ce3c2e4410a0..0e98b7ddda5c 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -22,7 +22,12 @@ #include <vector> #include <stack> + +#include <filter/msfilter/msdffimp.hxx> +#include <svx/svdpage.hxx> + #include "writerhelper.hxx" +#include "ww8struc.hxx" struct EscherShape { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index aa596ad3ee2d..77fe6fae93c7 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -46,6 +46,7 @@ #include <editeng/outlobj.hxx> #include <editeng/brushitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/langitem.hxx> @@ -81,6 +82,7 @@ #include <ndtxt.hxx> #include <pagedesc.hxx> #include <paratr.hxx> +#include <poolfmt.hxx> #include <fmtclbl.hxx> #include <section.hxx> #include <docsh.hxx> diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 4875270e6e27..86f84364aa0e 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -20,11 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR2_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR2_HXX -#include <swtypes.hxx> #include <fmtfsize.hxx> -#include <fmtornt.hxx> -#include <fmtsrnd.hxx> -#include <editeng/lrspitem.hxx> #include <svl/itemset.hxx> #include <svx/swframetypes.hxx> #include <swtable.hxx> diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 9b0ffaf3b602..8b276eab3138 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -77,6 +77,7 @@ #include <breakit.hxx> #include <fmtclds.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include <SwStyleNameMapper.hxx> #include "ww8scan.hxx" diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index e7308ac7e60e..723581862ef7 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -70,6 +70,7 @@ #include <i18nlangtag/mslangid.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include "sortedarray.hxx" #include "sprmids.hxx" #include <fmtpdsc.hxx> #include <node.hxx> diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index d22a32180dbf..de25d6e09c1d 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8SCAN_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8SCAN_HXX -#ifndef LONG_MAX -#include <limits.h> -#endif -#include <algorithm> #include <cassert> #include <cstddef> #include <deque> @@ -36,13 +32,10 @@ #include <tools/solar.h> #include <tools/stream.hxx> #include <rtl/ustring.hxx> -#include "sortedarray.hxx" #include "ww8struc.hxx" #include "types.hxx" -#include <unomid.h> - class SvStream; //Commonly used string literals for stream and storage names in word docs diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 5e2a468947cc..f4f50e1e748d 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -22,13 +22,15 @@ #include <sal/config.h> -#include <osl/endian.h> #include <rtl/ustring.hxx> -#include <editeng/borderline.hxx> #include <filter/msfilter/util.hxx> #include <i18nlangtag/lang.h> #include <tools/color.hxx> +#include <tools/solar.h> +#include <tools/stream.hxx> + +#include <vector> #ifdef _WIN32 # pragma pack(push, 2) |