diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-10-28 00:40:27 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2018-11-14 09:48:28 +0100 |
commit | f644e4be3c8568c34aca1a63d566269ce084eca2 (patch) | |
tree | 7d21ebc393bd805b1af76d4faaf21d357ae96561 /include/svl | |
parent | f750d900e5dac6f3f2d24bbbc0b8a319496c6760 (diff) |
tdf#42949 Fix IWYU warnings in include/svl/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ide75232858599c275e023c2300201090acd22307
Reviewed-on: https://gerrit.libreoffice.org/63237
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/svl')
33 files changed, 32 insertions, 80 deletions
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx index 8196767f9a62..72c87f0ba40b 100644 --- a/include/svl/IndexedStyleSheets.hxx +++ b/include/svl/IndexedStyleSheets.hxx @@ -10,8 +10,6 @@ #ifndef INCLUDED_SVL_INDEXEDSTYLESHEETS_HXX #define INCLUDED_SVL_INDEXEDSTYLESHEETS_HXX -#include <sal/types.h> - #include <svl/style.hxx> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> @@ -21,8 +19,6 @@ #include <unordered_map> #include <vector> -class SfxStyleSheetBase; - namespace svl { /** Function object to check whether a style sheet a fulfills specific criteria. diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 7be7e83352fd..d69b1f086f4b 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -20,12 +20,10 @@ #define INCLUDED_SVL_AEITEM_HXX #include <svl/svldllapi.h> -#include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <cstddef> #include <memory> -#include <vector> class SfxAllEnumValueArr; diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx index cef636155519..30dc1d7bcd0a 100644 --- a/include/svl/asiancfg.hxx +++ b/include/svl/asiancfg.hxx @@ -24,7 +24,6 @@ #include <memory> #include <com/sun/star/uno/Sequence.hxx> -#include <sal/types.h> #include <svl/svldllapi.h> namespace com { namespace sun { namespace star { namespace lang { diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx index e173e60f6287..c479edf0a434 100644 --- a/include/svl/cjkoptions.hxx +++ b/include/svl/cjkoptions.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVL_CJKOPTIONS_HXX #include <svl/svldllapi.h> -#include <sal/types.h> #include <unotools/options.hxx> #include <memory> diff --git a/include/svl/cryptosign.hxx b/include/svl/cryptosign.hxx index eacb4d78af25..61905360a1b9 100644 --- a/include/svl/cryptosign.hxx +++ b/include/svl/cryptosign.hxx @@ -7,10 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <config_features.h> #include <sal/types.h> -#include <memory> #include <vector> #include <rtl/strbuf.hxx> @@ -19,7 +17,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <svl/svldllapi.h> -#include <svl/sigstruct.hxx> namespace com { namespace sun { @@ -29,6 +26,7 @@ namespace security { }}} class SvStream; +struct SignatureInformation; namespace svl { diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx index b3a941f62c48..0996eac4a36d 100644 --- a/include/svl/ctloptions.hxx +++ b/include/svl/ctloptions.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVL_CTLOPTIONS_HXX #include <svl/svldllapi.h> -#include <sal/types.h> #include <unotools/options.hxx> #include <memory> diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index ec94f1f22dde..25531dc3332e 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -22,14 +22,11 @@ #include <svl/svldllapi.h> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XTruncate.hpp> - #include <svl/lockfilecommon.hxx> +namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } + namespace svt { class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index ce88c35f96f6..f37a9e5ef548 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -21,6 +21,7 @@ #include <svl/poolitem.hxx> #include <svl/svldllapi.h> +#include <tools/debug.hxx> class SvStream; diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index ecc99fd83e01..b856222ac04a 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -22,9 +22,10 @@ #include <svl/svldllapi.h> #include <svl/poolitem.hxx> -#include <com/sun/star/uno/Sequence.hxx> #include <vector> +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } + class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem { std::vector < sal_Int32 > m_aList; diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index 41b7b9aae5e7..6d5d01852072 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -22,7 +22,6 @@ #include <svl/svldllapi.h> #include <tools/inetmime.hxx> -#include <i18nlangtag/languagetag.hxx> /** Definitions for frequently used media type names. diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx index 08aef0ea4f66..913ca9cba0eb 100644 --- a/include/svl/itemiter.hxx +++ b/include/svl/itemiter.hxx @@ -23,8 +23,6 @@ #include <svl/itemset.hxx> class SfxPoolItem; -class SfxItemSet; -class SfxItemPool; class SVL_DLLPUBLIC SfxItemIter { diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 29f736f44ca1..155b85500b64 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -20,15 +20,12 @@ #ifndef INCLUDED_SVL_ITEMPOOL_HXX #define INCLUDED_SVL_ITEMPOOL_HXX -#include <rtl/string.hxx> #include <svl/poolitem.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> -#include <tools/solar.h> #include <memory> #include <vector> -class SvStream; class SfxBroadcaster; struct SfxItemPool_Impl; @@ -38,8 +35,6 @@ struct SfxItemInfo bool _bPoolable; }; -class SfxStyleSheetIterator; -struct SfxPoolItemArray_Impl; class SfxItemPool; class SVL_DLLPUBLIC SfxItemPoolUser diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index bf1e4bde664b..05618d231754 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -33,8 +33,6 @@ #include <svl/typedwhich.hxx> class SfxItemPool; -class SfxPoolItem; -class SvStream; namespace svl { diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index fadd74f08893..16774a2bf25c 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -24,8 +24,8 @@ #include <unotools/configitem.hxx> #include <unotools/options.hxx> #include <i18nlangtag/lang.h> -#include <o3tl/typed_flags_set.hxx> #include <memory> +namespace o3tl { template <typename T> struct typed_flags; } // class SvtLanguageOptions ---------------------------------------------------- diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx index ee4674840029..4c5c6b5fe2e7 100644 --- a/include/svl/lockfilecommon.hxx +++ b/include/svl/lockfilecommon.hxx @@ -22,11 +22,7 @@ #include <svl/svldllapi.h> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XTruncate.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> #include <tools/urlobj.hxx> diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 58dce1dc66ec..e88ef3fa7632 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -22,7 +22,6 @@ #include <svl/svldllapi.h> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase2.hxx> #include <memory> diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx index 3d87bf3b8378..fd0032c32c29 100644 --- a/include/svl/ondemand.hxx +++ b/include/svl/ondemand.hxx @@ -25,12 +25,9 @@ #include <i18nlangtag/lang.h> #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> -#include <unotools/collatorwrapper.hxx> -#include <com/sun/star/i18n/CollatorOptions.hpp> #include <unotools/transliterationwrapper.hxx> #include <unotools/nativenumberwrapper.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <i18nutil/transliteration.hxx> /* diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx index ef4d616032e1..7c3eae17b8ce 100644 --- a/include/svl/ownlist.hxx +++ b/include/svl/ownlist.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVL_OWNLIST_HXX #include <svl/svldllapi.h> -#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> #include <vector> namespace com { namespace sun { namespace star { @@ -30,6 +30,7 @@ namespace com { namespace sun { namespace star { } }}} +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } class SvCommand /* diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 6964f776c63d..d812f865411e 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -22,16 +22,13 @@ #include <sal/config.h> -#include <climits> #include <memory> #include <com/sun/star/uno/Any.hxx> #include <svl/hint.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> -#include <tools/debug.hxx> #include <tools/mapunit.hxx> -#include <tools/solar.h> class IntlWrapper; class SvStream; @@ -112,7 +109,6 @@ enum class SfxItemState { #define INVALID_POOL_ITEM reinterpret_cast<SfxPoolItem*>(-1) -class SvXMLUnitConverter; class SfxItemPool; class SfxItemSet; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index b4513c9e85fc..76e5022c441b 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -22,6 +22,7 @@ #include <svl/svldllapi.h> #include <svl/poolitem.hxx> #include <tools/gen.hxx> +#include <tools/debug.hxx> class SvStream; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index d37be512bc47..3dd119e1d089 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVL_RECTITEM_HXX #include <svl/svldllapi.h> -#include <tools/debug.hxx> #include <tools/gen.hxx> #include <svl/poolitem.hxx> diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx index 60f478651342..8dfa91669ddc 100644 --- a/include/svl/sharecontrolfile.hxx +++ b/include/svl/sharecontrolfile.hxx @@ -22,16 +22,15 @@ #include <svl/svldllapi.h> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XTruncate.hpp> - #include <svl/lockfilecommon.hxx> -#include <o3tl/enumarray.hxx> #include <vector> +namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XSeekable; } } } } +namespace com { namespace sun { namespace star { namespace io { class XStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XTruncate; } } } } + namespace svt { class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx index 74065e906b98..3498aff008fa 100644 --- a/include/svl/sigstruct.hxx +++ b/include/svl/sigstruct.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -30,6 +29,8 @@ #include <set> #include <vector> +namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } + /* * type of reference */ diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 4f9a82986a35..dc803e69103d 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -23,9 +23,10 @@ #include <svl/svldllapi.h> #include <svl/poolitem.hxx> -#include <com/sun/star/uno/Sequence.h> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } + class SVL_DLLPUBLIC SfxStringListItem : public SfxPoolItem { std::shared_ptr<std::vector<OUString>> mpList; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index a449f250ca39..00da71b1f7fe 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -21,7 +21,6 @@ #include <sal/config.h> #include <svl/svldllapi.h> -#include <com/sun/star/util/XSearchDescriptor.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchFlags.hpp> #include <i18nutil/transliteration.hxx> @@ -29,7 +28,6 @@ #include <unotools/configitem.hxx> #include <svl/style.hxx> #include <svl/poolitem.hxx> -#include <svl/srchdefs.hxx> // defines --------------------------------------------------------------- diff --git a/include/svl/style.hxx b/include/svl/style.hxx index c60d85fb833e..2f35e91be4e7 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -33,6 +33,7 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/stylesheetuser.hxx> #include <o3tl/typed_flags_set.hxx> +#include <tools/solar.h> #include <memory> diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 2f07eb768117..469ce90fc807 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -23,22 +23,15 @@ #include <sal/config.h> #include <svl/svldllapi.h> -#include <sot/exchange.hxx> +#include <sot/formats.hxx> +#include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/link.hxx> #include <memory> #include <vector> class DdeString; -class DdeData; class DdeConnection; -class DdeTransaction; -class DdeLink; -class DdeRequest; -class DdeHotLink; -class DdePoke; -class DdeExecute; -class DdeItem; class DdeTopic; class DdeService; struct DdeDataImp; diff --git a/include/svl/svlresid.hxx b/include/svl/svlresid.hxx index bc62e3cb7241..4b568bb12b39 100644 --- a/include/svl/svlresid.hxx +++ b/include/svl/svlresid.hxx @@ -12,7 +12,6 @@ #include <svl/svldllapi.h> #include <rtl/ustring.hxx> -#include <locale> SVL_DLLPUBLIC OUString SvlResId(const char* pId); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index b4b4a2eb0abd..c2862b886c6f 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -24,12 +24,9 @@ #include <tools/datetime.hxx> #include <o3tl/strong_int.hxx> -#include <limits> #include <memory> #include <vector> -struct MarkedUndoAction; - typedef o3tl::strong_int<sal_Int32, struct ViewShellIdTag> ViewShellId; class SVL_DLLPUBLIC SfxRepeatTarget diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx index 92668263837c..5d8171e21efa 100644 --- a/include/svl/urihelper.hxx +++ b/include/svl/urihelper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVL_URIHELPER_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <rtl/textenc.h> #include <svl/svldllapi.h> #include <tools/link.hxx> diff --git a/include/svl/whiter.hxx b/include/svl/whiter.hxx index a6473d8afb4b..db4f3ccda7d8 100644 --- a/include/svl/whiter.hxx +++ b/include/svl/whiter.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVL_WHITER_HXX #define INCLUDED_SVL_WHITER_HXX -#include <limits.h> #include <svl/svldllapi.h> class SfxItemSet; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index a288a67dcdae..143d14e03f50 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -23,22 +23,21 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <i18nlangtag/lang.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/i18n/NumberFormatCode.hpp> #include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/i18n/NumberFormatMapper.hpp> -#include <com/sun/star/i18n/Currency.hpp> #include <unotools/localedatawrapper.hxx> #include <tools/link.hxx> #include <svl/ondemand.hxx> #include <svl/nfkeytab.hxx> -#include <o3tl/typed_flags_set.hxx> #include <map> #include <memory> #include <set> +namespace com { namespace sun { namespace star { namespace i18n { class XNumberFormatCode; } } } } +namespace com { namespace sun { namespace star { namespace i18n { struct Currency; } } } } +namespace com { namespace sun { namespace star { namespace i18n { struct NumberFormatCode; } } } } +namespace o3tl { template <typename T> struct typed_flags; } + class Date; class Color; class CharClass; diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 4f5dcb243ec5..a9434979a1f8 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -20,21 +20,20 @@ #define INCLUDED_SVL_ZFORMAT_HXX #include <svl/svldllapi.h> -#include <i18nlangtag/mslangid.hxx> #include <svl/zforlist.hxx> #include <svl/nfkeytab.hxx> #include <vector> -#include <com/sun/star/i18n/NativeNumberXmlAttributes2.hpp> namespace utl { class DigitGroupingIterator; } +namespace com { namespace sun { namespace star { namespace i18n { struct NativeNumberXmlAttributes2; } } } } + class Color; class ImpSvNumberformatScan; // format code string scanner class ImpSvNumberInputScan; // input string scanner -class SvNumberFormatter; enum SvNumberformatLimitOps { |