diff options
95 files changed, 120 insertions, 80 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 3c8efde81a15..1725324bff3b 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/ui/dialogs/FilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <comphelper/string.hxx> +#include <svl/srchdefs.hxx> #include <sfx2/dinfdlg.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 97540e7d6707..0d7ff9cb2a00 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> +#include <svl/srchdefs.hxx> #include <sal/log.hxx> #include <sfx2/childwin.hxx> #include <sfx2/docfac.hxx> diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx index fd0e0de509c2..7e96f3dd7a28 100644 --- a/editeng/inc/editattr.hxx +++ b/editeng/inc/editattr.hxx @@ -24,6 +24,7 @@ #include <svl/poolitem.hxx> #include <boost/optional.hpp> #include <tools/color.hxx> +#include <tools/debug.hxx> class SvxFont; class SvxFontItem; diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index 548d94b2beb2..c8db48792835 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index c22b989bfc0e..d010f72d58b1 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -23,6 +23,7 @@ #include <editeng/eerdll.hxx> #include <tools/stream.hxx> +#include <tools/debug.hxx> #include <com/sun/star/table/CellHoriJustify.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 25e6bfb1cb22..1c6363d61667 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -23,6 +23,8 @@ #include <editeng/editrids.hrc> #include <osl/diagnose.h> +#include <climits> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 1e50742ee19a..a102db77d024 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -18,6 +18,7 @@ */ #include <memory> +#include <climits> #include <com/sun/star/xml/AttributeData.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <o3tl/any.hxx> @@ -25,6 +26,8 @@ #include <xmloff/xmlcnimp.hxx> #include <xmloff/unoatrcn.hxx> #include <editeng/xmlcnitm.hxx> +#include <tools/debug.hxx> +#include <tools/solar.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 27281c3ade9b..8c76af4c45f6 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -21,6 +21,7 @@ #include <svl/eitem.hxx> #include <svl/itemprop.hxx> #include <tools/helpers.hxx> +#include <tools/debug.hxx> #include <editeng/unoipset.hxx> #include <editeng/editids.hrc> #include <editeng/editeng.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 3a29d0881a9c..393ace33ac8b 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -284,3 +284,13 @@ blacklist: include/i18nutil/transliteration.hxx: # Needed for template - o3tl/typed_flags_set.hxx + include/svl/numuno.hxx: + # base class has to be a complete type + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/util/XNumberFormatsSupplier.hpp + include/svl/srchdefs.hxx: + # Needed for template + - o3tl/typed_flags_set.hxx + include/svl/urihelper.hxx: + # base class has to be a complete type + - tools/link.hxx diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index de6079c221f8..c61bd2eaccef 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -20,6 +20,8 @@ #define INCLUDED_EDITENG_FHGTITEM_HXX #include <svl/poolitem.hxx> +#include <tools/debug.hxx> +#include <tools/solar.h> #include <editeng/editengdllapi.h> class SvXMLUnitConverter; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 1fa20df5f1a1..94cc2e90cf07 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> #include <tools/link.hxx> +#include <tools/solar.h> #include <svl/poolitem.hxx> #include <editeng/svxenum.hxx> #include <tools/gen.hxx> diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 3401549b1bed..78ac2d1a6fe2 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -23,6 +23,7 @@ #include <sfx2/dllapi.h> #include <sal/types.h> #include <svl/poolitem.hxx> +#include <tools/debug.hxx> #if defined( DBG_UTIL ) #include <sfx2/msg.hxx> #endif 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 { diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 589a38aa42fd..94f844aa56fe 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -37,6 +37,7 @@ #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> #include <rtl/instance.hxx> +#include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 830b0e47b4a7..9ca759a18da3 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -21,6 +21,7 @@ #include <cppuhelper/factory.hxx> #include <i18nlangtag/mslangid.hxx> #include <osl/file.hxx> +#include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 685947c4cdf8..557ca5d62c06 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -57,6 +57,7 @@ #include <i18nlangtag/languagetag.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> +#include <tools/debug.hxx> #include <deque> #include <map> diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index 4af6a0c97b67..bc3c041946ff 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -219,6 +219,8 @@ blacklist: sc/inc/global.hxx: # base class has to be a complete type - tools/ref.hxx + # Needed for macro #define + - com/sun/star/i18n/CollatorOptions.hpp sc/inc/linkuno.hxx: # base class has to be a complete type - com/sun/star/beans/XPropertySet.hpp diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 7c02660300e5..e6a33de7830b 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -25,6 +25,7 @@ #include <svx/svdtypes.hxx> #include <tools/ref.hxx> #include <sal/types.h> +#include <com/sun/star/i18n/CollatorOptions.hpp> #include "scdllapi.h" #include <rtl/ustring.hxx> diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 64eba11bc6aa..f0c418fb856f 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -87,6 +87,7 @@ #include <svx/svdocapt.hxx> #include <svl/srchitem.hxx> #include <svl/sharedstringpool.hxx> +#include <unotools/collatorwrapper.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 16e272ab0b71..02ae04ccbc81 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -42,6 +42,7 @@ #include <tools/fract.hxx> #include <editeng/editobj.hxx> #include <svl/sharedstring.hxx> +#include <unotools/collatorwrapper.hxx> #include <vector> diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 99995fb3a0d9..333a38d3070d 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -35,6 +35,7 @@ #include <rtl/math.hxx> #include <unotools/textsearch.hxx> #include <unotools/localedatawrapper.hxx> +#include <unotools/collatorwrapper.hxx> #include <svl/zforlist.hxx> #include <o3tl/make_unique.hxx> #include <osl/diagnose.h> diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index f6d2e9812f9e..8a705d3ac5ef 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -23,6 +23,7 @@ #include <unotools/collatorwrapper.hxx> #include <unotools/transliterationwrapper.hxx> #include <rtl/math.hxx> +#include <unotools/collatorwrapper.hxx> const sal_Int32 ScDPItemData::DateFirst = -1; const sal_Int32 ScDPItemData::DateLast = 10000; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 008e570bb61f..59dd62bba3ca 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -32,6 +32,7 @@ #include <editeng/langitem.hxx> #include <tools/urlobj.hxx> #include <comphelper/fileformat.h> +#include <unotools/collatorwrapper.hxx> #include <unotools/transliterationwrapper.hxx> #include <tools/tenccvt.hxx> #include <o3tl/make_unique.hxx> diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx index c94684a97c40..2a2cf71ded7c 100644 --- a/sc/source/core/tool/compare.cxx +++ b/sc/source/core/tool/compare.cxx @@ -22,6 +22,7 @@ #include <document.hxx> #include <docoptio.hxx> +#include <unotools/collatorwrapper.hxx> #include <unotools/textsearch.hxx> #include <rtl/math.hxx> #include <osl/diagnose.h> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index b83406223a17..f752ff00841a 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -38,6 +38,7 @@ #include <sal/log.hxx> #include <unicode/uchar.h> #include <unicode/regex.h> +#include <i18nlangtag/mslangid.hxx> #include <patattr.hxx> #include <global.hxx> diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 7a24e96d431a..d960d54f42a9 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp> #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <sal/macros.h> #include <rtl/math.hxx> diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 7f08053b7500..87297db0797f 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/text/XTextCursor.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 3132e4c86b11..3ce9e7699c2f 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/text/WritingMode2.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <oox/core/filterbase.hxx> diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 6c963e2dc3a1..6f1419dcceb4 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -29,6 +29,7 @@ #include <rtl/ref.hxx> #include <sot/formats.hxx> #include <vcl/vclptr.hxx> +#include <tools/solar.h> class SvxClipboardFormatItem; class TransferableDataHelper; diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index acc7cce99b52..d1f57b46dead 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -25,6 +25,7 @@ #include <vcl/weld.hxx> #include <svl/zforlist.hxx> #include <sfx2/app.hxx> +#include <unotools/collatorwrapper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sheet/DataPilotFieldFilter.hpp> diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 93ca656d4059..2785c8097dcf 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -33,6 +33,7 @@ #include <svl/ilstitem.hxx> #include <svl/int64item.hxx> #include <svl/srchitem.hxx> +#include <svl/srchdefs.hxx> #include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <svl/zformat.hxx> diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx index 4dbd6bb22171..1b44681fbb01 100644 --- a/sfx2/source/control/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -23,6 +23,7 @@ #include <vcl/idle.hxx> #include <svl/itempool.hxx> +#include <tools/debug.hxx> class SfxItemDisruptor_Impl { diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 3e861b9ecede..711aaf992771 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -21,6 +21,7 @@ #include <svl/eitem.hxx> #include <sfx2/msg.hxx> +#include <climits> SfxSlotKind SfxSlot::GetKind() const { diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index edb1a560765d..f2432563533f 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <tools/solar.h> #include <svl/itempool.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index f2a91b3e2f1f..cd68d7472427 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <com/sun/star/sheet/GeneralFunction.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <i18nlangtag/lang.h> diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index 57da138391ed..ea2813be4202 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -8,6 +8,8 @@ */ #include <svl/cryptosign.hxx> +#include <svl/sigstruct.hxx> +#include <config_features.h> #include <rtl/character.hxx> #include <rtl/strbuf.hxx> diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 6db0ee975080..270b1402a110 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -22,6 +22,7 @@ #include <svl/itempool.hxx> #include <svl/SfxBroadcaster.hxx> +#include <tools/debug.hxx> #include <deque> #include <memory> #include <unordered_map> diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 8c4dc2e04faf..afebf9d72a9b 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -20,6 +20,7 @@ #include <rtl/ustring.hxx> #include <svl/aeitem.hxx> +#include <climits> #include <cstddef> #include <vector> diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 11400851d6bf..df18182c768c 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -22,6 +22,7 @@ #include <string.h> #include <libxml/xmlwriter.h> +#include <tools/solar.h> #include <osl/diagnose.h> #include <sal/log.hxx> #include <svl/SfxBroadcaster.hxx> diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index f9e29a7879a5..2cc33549659b 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -23,6 +23,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svl/poolcach.hxx> +#include <tools/debug.hxx> SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, const SfxPoolItem *pPutItem ): diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 7b9264910597..9d09e1103038 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -25,6 +25,7 @@ #include <svl/itemset.hxx> #include <svl/poolitem.hxx> #include <tools/stream.hxx> +#include <tools/debug.hxx> SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) : SfxPoolItem(which), diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 47f260865101..46a4a726b850 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -21,6 +21,7 @@ #include <svl/itemiter.hxx> #include <svl/itempool.hxx> #include <o3tl/make_unique.hxx> +#include <tools/debug.hxx> #include <algorithm> #include <map> #include <memory> diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 2bd806b04b0c..837005bd6f85 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -24,6 +24,11 @@ #include <com/sun/star/ucb/NameClashException.hpp> #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/io/TempFile.hpp> +#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 <osl/time.h> #include <osl/security.hxx> diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 604d4226a241..aab66e24013f 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -35,6 +35,9 @@ #include <com/sun/star/i18n/KNumberFormatType.hpp> #include <com/sun/star/i18n/FormatElement.hpp> #include <com/sun/star/i18n/Currency2.hpp> +#include <com/sun/star/i18n/NumberFormatCode.hpp> +#include <com/sun/star/i18n/XNumberFormatCode.hpp> +#include <com/sun/star/i18n/NumberFormatMapper.hpp> #include <comphelper/processfactory.hxx> #include <unotools/misccfg.hxx> diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 8e45f70f7212..d9b2afc23b6e 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/i18n/CalendarDisplayCode.hpp> #include <com/sun/star/i18n/AmPmValue.hpp> #include <com/sun/star/i18n/NativeNumberMode.hpp> +#include <com/sun/star/i18n/NativeNumberXmlAttributes2.hpp> #include <svl/zformat.hxx> #include "zforscan.hxx" diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 104727c942b8..1838408d0e63 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -26,6 +26,8 @@ #include <unotools/charclass.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/NumberFormatCode.hpp> +#include <com/sun/star/i18n/NumberFormatMapper.hpp> +#include <com/sun/star/i18n/XNumberFormatCode.hpp> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 05de89628ffe..cb12b415a8eb 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -28,6 +28,7 @@ #include <o3tl/char16_t2wchar_t.hxx> #include <osl/thread.h> +#include <sot/exchange.hxx> DdeData::DdeData() { diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index e7f0765cb737..8bc13f62ec28 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -19,6 +19,7 @@ #include <svx/svxids.hrc> #include <svx/rulritem.hxx> +#include <tools/debug.hxx> #include <tools/mapunit.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 7e2960769025..cffccb570087 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -41,6 +41,8 @@ #include <editeng/eerdll.hxx> #include <svx/unomid.hxx> +#include <climits> + using namespace ::com::sun::star; diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index e65524194958..f4479727fa9b 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> #include <float.h> +#include <climits> #include <svx/chrtitem.hxx> diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index ade306fa32a7..3d6012620191 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -24,6 +24,8 @@ #include <svx/e3ditem.hxx> +#include <climits> + using namespace ::com::sun::star; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index e450806ab628..2a50eb6329b7 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -107,6 +107,7 @@ #include <o3tl/typed_flags_set.hxx> #include <bitmaps.hlst> #include <sal/log.hxx> +#include <unotools/collatorwrapper.hxx> #define MAX_MRU_FONTNAME_ENTRIES 5 diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 3597e35b8f07..093df4572bb7 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -36,6 +36,8 @@ blacklist: - o3tl/typed_flags_set.hxx sw/inc/swtypes.hxx: - o3tl/typed_flags_set.hxx + # Needed for macro #define + - com/sun/star/i18n/CollatorOptions.hpp sw/inc/doc.hxx: - o3tl/deleter.hxx sw/inc/docsh.hxx: diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index ead0f04620b4..17297494c889 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_INC_DOCUFLD_HXX #define INCLUDED_SW_INC_DOCUFLD_HXX +#include <tools/solar.h> #include <tools/date.hxx> #include <tools/datetime.hxx> #include <rtl/ref.hxx> diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 1ae82ceb8e16..8a5d64108ced 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -23,6 +23,7 @@ #include "format.hxx" #include "hintids.hxx" #include <rtl/ustring.hxx> +#include <tools/solar.h> #include <vector> #include <memory> diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 7678f4bde1fd..cdbbc7b27580 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -23,6 +23,7 @@ #include "fmtfld.hxx" #include <cstddef> #include <vcl/vclptr.hxx> +#include <tools/solar.h> #include "SidebarWindowsTypes.hxx" class SfxBroadcaster; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 890f44431638..21348a36662b 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_INC_SWTABLE_HXX #define INCLUDED_SW_INC_SWTABLE_HXX +#include <tools/solar.h> #include <tools/ref.hxx> #include "tblenum.hxx" #include "swtypes.hxx" diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 1b1c88d28523..a89413ccfa7d 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -22,6 +22,7 @@ #include <limits.h> #include <com/sun/star/uno/Reference.h> +#include <com/sun/star/i18n/CollatorOptions.hpp> #include "swdllapi.h" #include <o3tl/typed_flags_set.hxx> #include <i18nlangtag/lang.h> diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index ca0b7819fd32..5da40eb2555b 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -56,6 +56,7 @@ #include <sfx2/classificationhelper.hxx> #include <svx/ClassificationCommon.hxx> #include <svl/cryptosign.hxx> +#include <svl/sigstruct.hxx> #include <utility> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index 2705b773c48c..d02bbec26c6a 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -35,6 +35,7 @@ #include <scriptinfo.hxx> #include <editeng/charhiddenitem.hxx> #include <calbck.hxx> +#include <tools/solar.h> class Point; diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 7d4c570c78b8..f14edf751681 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SW_SOURCE_CORE_INC_ACORRECT_HXX #include <memory> +#include <tools/solar.h> #include <editeng/svxacorr.hxx> #include <swundo.hxx> diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx index ddf636cd5f77..b3ecc1f07d9c 100644 --- a/sw/source/core/inc/txtfly.hxx +++ b/sw/source/core/inc/txtfly.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX #define INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX +#include <tools/solar.h> #include <swtypes.hxx> #include <swrect.hxx> #include <com/sun/star/text/WrapTextMode.hpp> diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 353474ab236c..278f0d7178ec 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -56,6 +56,7 @@ #include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <svx/rulritem.hxx> +#include <unotools/collatorwrapper.hxx> #include <tabledlg.hxx> #include <fmtclds.hxx> #include <tabcol.hxx> |