diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-02-19 22:43:10 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-03-01 08:21:00 +0100 |
| commit | 144057a54a7283bf819de4a19c8067a3b8e2b3bf (patch) | |
| tree | 1277a08c24d80a3fee42f7deabb63a5a57c3f47f | |
| parent | 5787a610df7f0e63054c51968c573b539452f67b (diff) | |
Recheck modules s[f-t]* with IWYU
See tdf#42949 for motivation
Change-Id: I1f520aad1b1c942ad5616d96851016fc366ac58f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130203
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
124 files changed, 91 insertions, 257 deletions
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml index 493d9aa47929..f7563993186e 100644 --- a/sfx2/IwyuFilter_sfx2.yaml +++ b/sfx2/IwyuFilter_sfx2.yaml @@ -1,9 +1,6 @@ --- assumeFilename: sfx2/source/appl/app.cxx excludelist: - sfx2/inc/sidebar/Accessible.hxx: - # base class has to be a complete type - - com/sun/star/accessibility/XAccessible.hpp sfx2/inc/sidebar/UnoDeck.hxx: # base class has to be a complete type - com/sun/star/ui/XDeck.hpp @@ -55,6 +52,10 @@ excludelist: sfx2/source/appl/appmisc.cxx: # Needed for TypedWhichId macro - svl/stritem.hxx + sfx2/source/appl/appquit.cxx: + # Full type is needed for implicit dtor + - sfx2/stbitem.hxx + - sfx2/tbxctrl.hxx sfx2/source/appl/appbas.cxx: # Needed for createSfxPoolItem calls - svl/eitem.hxx @@ -103,6 +104,9 @@ excludelist: sfx2/source/doc/graphhelp.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx + sfx2/source/doc/doctempl.cxx: + # Needed for template + - com/sun/star/ucb/NumberedSortingInfo.hpp sfx2/source/doc/guisaveas.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx diff --git a/sfx2/inc/charmapcontrol.hxx b/sfx2/inc/charmapcontrol.hxx index 039fed4aae4b..e2c1e1e07349 100644 --- a/sfx2/inc/charmapcontrol.hxx +++ b/sfx2/inc/charmapcontrol.hxx @@ -20,7 +20,6 @@ #pragma once #include <sal/config.h> -#include <sfx2/dllapi.h> #include <sfx2/charwin.hxx> #include <svtools/toolbarmenu.hxx> #include <deque> diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx b/sfx2/inc/commandpopup/CommandPopup.hxx index 5cea112609ad..a34425f0d693 100644 --- a/sfx2/inc/commandpopup/CommandPopup.hxx +++ b/sfx2/inc/commandpopup/CommandPopup.hxx @@ -9,13 +9,7 @@ #pragma once -#include <vcl/layout.hxx> - -#include <sfx2/dllapi.h> -#include <sfx2/viewfrm.hxx> - #include <vcl/weld.hxx> -#include <vcl/window.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc index 819892da6d5a..153fedb1ff92 100644 --- a/sfx2/inc/dinfdlg.hrc +++ b/sfx2/inc/dinfdlg.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SFX2_INC_DINFDLG_HRC #define INCLUDED_SFX2_INC_DINFDLG_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId SFX_CB_PROPERTY_STRINGARRAY[] = diff --git a/sfx2/inc/doctempl.hrc b/sfx2/inc/doctempl.hrc index ef2310d860de..d6b98a0e2a6b 100644 --- a/sfx2/inc/doctempl.hrc +++ b/sfx2/inc/doctempl.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SFX2_INC_DOCTEMPL_HRC #define INCLUDED_SFX2_INC_DOCTEMPL_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId TEMPLATE_LONG_NAMES_ARY[] = diff --git a/sfx2/inc/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx index b4267fbaf8f6..50b70dc57d8d 100644 --- a/sfx2/inc/emojicontrol.hxx +++ b/sfx2/inc/emojicontrol.hxx @@ -10,7 +10,6 @@ #pragma once #include <sal/config.h> -#include <sfx2/dllapi.h> #include <svtools/toolbarmenu.hxx> #include <vcl/customweld.hxx> diff --git a/sfx2/inc/notebookbar/NotebookbarTabControl.hxx b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx index c793480f51d1..ebbffc4f9b1a 100644 --- a/sfx2/inc/notebookbar/NotebookbarTabControl.hxx +++ b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx @@ -9,9 +9,10 @@ #pragma once -#include <sfx2/dllapi.h> #include <vcl/tabctrl.hxx> +#include <com/sun/star/frame/XFrame.hpp> + namespace com::sun::star::ui { class XUIConfigurationListener; } namespace com::sun::star::uno { class XComponentContext; } diff --git a/sfx2/inc/recentdocsview.hxx b/sfx2/inc/recentdocsview.hxx index b347fc25029a..44cda470b7bc 100644 --- a/sfx2/inc/recentdocsview.hxx +++ b/sfx2/inc/recentdocsview.hxx @@ -10,7 +10,7 @@ #pragma once #include <sfx2/thumbnailview.hxx> -#include <vcl/image.hxx> +#include <vcl/bitmapex.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/sfx2/inc/sidebar/ControllerFactory.hxx b/sfx2/inc/sidebar/ControllerFactory.hxx index 10ddf97c9df5..8d45a2e3b1ed 100644 --- a/sfx2/inc/sidebar/ControllerFactory.hxx +++ b/sfx2/inc/sidebar/ControllerFactory.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include <sfx2/dllapi.h> #include <com/sun/star/uno/Reference.hxx> #include <vcl/toolbox.hxx> diff --git a/sfx2/inc/sidebar/SidebarToolBox.hxx b/sfx2/inc/sidebar/SidebarToolBox.hxx index 1dd26503b0fa..acae7475e69a 100644 --- a/sfx2/inc/sidebar/SidebarToolBox.hxx +++ b/sfx2/inc/sidebar/SidebarToolBox.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX #define INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX -#include <config_options.h> -#include <sfx2/dllapi.h> #include <vcl/builder.hxx> #include <vcl/toolbox.hxx> #include <map> diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index 8264acc24e65..1f589508db18 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -18,9 +18,8 @@ */ #pragma once -#include <sidebar/SidebarToolBox.hxx> #include <sfx2/sidebar/Theme.hxx> -#include <sfx2/weldutils.hxx> +#include <vcl/weld.hxx> namespace sfx2::sidebar { diff --git a/sfx2/inc/sidebar/Tools.hxx b/sfx2/inc/sidebar/Tools.hxx index 8c795dfed1c4..fb3dc54b498f 100644 --- a/sfx2/inc/sidebar/Tools.hxx +++ b/sfx2/inc/sidebar/Tools.hxx @@ -19,11 +19,7 @@ #pragma once #include <vcl/image.hxx> -#include <vcl/gradient.hxx> -#include <sfx2/dllapi.h> - -#include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/util/URL.hpp> namespace com::sun::star::frame { class XController; } diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx index 85d5f7c82fee..5dc93943f7d7 100644 --- a/sfx2/inc/unoctitm.hxx +++ b/sfx2/inc/unoctitm.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/multiinterfacecontainer4.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weakref.hxx> #include <svl/lstner.hxx> diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx index eea95d93f92e..bbf137a5a09d 100644 --- a/sfx2/qa/cppunit/test_misc.cxx +++ b/sfx2/qa/cppunit/test_misc.cxx @@ -25,13 +25,11 @@ #include <com/sun/star/packages/zip/ZipFileAccess.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/ucb/NameClashException.hpp> #include <test/bootstrapfixture.hxx> #include <test/xmltesttools.hxx> #include <unotest/macros_test.hxx> -#include <unotools/mediadescriptor.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index b8bec0d6ff5e..cd4acc552132 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_feature_desktop.h> #include <sal/log.hxx> #include <tools/debug.hxx> @@ -53,7 +52,6 @@ #include <sidebar/ControllerFactory.hxx> #include <officecfg/Office/Common.hxx> -#include <unotools/viewoptions.hxx> #include <rtl/strbuf.hxx> #include <memory> #include <mutex> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 74e157bc9e16..3c8c8c301be7 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <comphelper/sequence.hxx> #include <osl/file.hxx> #include <rtl/ustring.hxx> @@ -38,7 +37,6 @@ #include <officecfg/Inet.hxx> #include <officecfg/Office/Common.hxx> #include <officecfg/Office/Recovery.hxx> -#include <unotools/saveopt.hxx> #include <unotools/securityoptions.hxx> #include <unotools/pathoptions.hxx> #include <svtools/miscopt.hxx> diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index 4da8ad32f33a..246eb441359e 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -18,9 +18,6 @@ */ -#include <osl/diagnose.h> -#include <tools/debug.hxx> - #include <sfx2/app.hxx> #include <appdata.hxx> #include <workwin.hxx> diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 9f6e09267858..d72369dfb772 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -20,15 +20,11 @@ #include <config_features.h> #include <appdata.hxx> -#include <sfxpicklist.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/stbitem.hxx> #include <sfx2/childwin.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/doctempl.hxx> -#include <sfx2/fcontnr.hxx> #include <sfx2/module.hxx> -#include <sfx2/msgpool.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/objsh.hxx> #include <appbaslib.hxx> diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index b5c6ee54b6fc..6e7db00012c7 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <config_features.h> #include <rtl/character.hxx> #include <rtl/malformeduriexception.hxx> diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index a20bec463334..52afe118ecbb 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -43,9 +43,7 @@ #include <unoctitm.hxx> #include <appdata.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/msgpool.hxx> #include <nochaos.hxx> -#include <sfxpicklist.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 0cb8bd4412a5..b34550dc7f51 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -24,14 +24,11 @@ #include <sfx2/app.hxx> #include <appdata.hxx> -#include <sfx2/tbxctrl.hxx> #include <sfx2/stbitem.hxx> +#include <sfx2/tbxctrl.hxx> #include <sfx2/childwin.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/msgpool.hxx> -#include <sfx2/fcontnr.hxx> #include <nochaos.hxx> -#include <sfx2/doctempl.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> #include <appbaslib.hxx> diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index 5d27a45c50b8..662e485b629d 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -25,7 +25,6 @@ #include <inettbc.hxx> #include <sfx2/stbitem.hxx> #include <sfx2/infobar.hxx> -#include <sfx2/navigat.hxx> #include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include <partwnd.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4c0aa1b85e46..85316c6cf2de 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -49,7 +49,6 @@ #include <comphelper/sequence.hxx> #include <svtools/addresstemplate.hxx> -#include <svtools/miscopt.hxx> #include <svtools/restartdialog.hxx> #include <svl/visitem.hxx> @@ -63,7 +62,6 @@ #include <basic/basrdll.hxx> #include <basic/sberrors.hxx> #include <vcl/help.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <osl/file.hxx> #include <vcl/EnumContext.hxx> diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index f122d2bfc874..29fc51c22660 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <comphelper/string.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 674c1717f6c9..f9d1b4aabf2d 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -25,7 +25,6 @@ #include <srchdlg.hxx> #include <sfx2/sfxhelp.hxx> #include <sal/log.hxx> -#include <osl/diagnose.h> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index cd031e725e78..91a97e09c344 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -23,7 +23,6 @@ #include "shutdownicon.hxx" #include <sfx2/strings.hrc> #include <sfx2/app.hxx> -#include <osl/mutex.hxx> #include <svtools/imagemgr.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/frame/Desktop.hpp> diff --git a/sfx2/source/commandpopup/CommandPopup.cxx b/sfx2/source/commandpopup/CommandPopup.cxx index 7575a5794b32..47df143a889b 100644 --- a/sfx2/source/commandpopup/CommandPopup.cxx +++ b/sfx2/source/commandpopup/CommandPopup.cxx @@ -9,25 +9,21 @@ #include <commandpopup/CommandPopup.hxx> -#include <workwin.hxx> - #include <sfx2/msgpool.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/msg.hxx> +#include <sfx2/viewfrm.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/dispatchcommand.hxx> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/theUICommandDescription.hpp> -#include <com/sun/star/ui/theUICategoryDescription.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/i18n/CharacterClassification.hpp> #include <vcl/commandinfoprovider.hxx> +#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 4c891e2e86b7..7b8b7283b415 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -22,6 +22,7 @@ #include <iomanip> #include <comphelper/servicehelper.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> #include <svl/itempool.hxx> #include <svl/itemiter.hxx> diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index 445815a7568f..86c820dd230a 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -21,7 +21,6 @@ #include <emojipopup.hxx> #include <emojiview.hxx> #include <sfx2/thumbnailviewitem.hxx> -#include <rtl/ustrbuf.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/dispatchcommand.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index f125552296e4..a257ac85bf2c 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -16,7 +16,6 @@ #include <officecfg/Office/Common.hxx> #include <comphelper/processfactory.hxx> #include <vcl/event.hxx> -#include <vcl/svapp.hxx> #include <vcl/weldutils.hxx> #include <orcus/json_document_tree.hpp> diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx index 6d506b198efb..99a7273159c4 100644 --- a/sfx2/source/control/emojiviewitem.cxx +++ b/sfx2/source/control/emojiviewitem.cxx @@ -14,7 +14,6 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <com/sun/star/lang/Locale.hpp> -#include <rtl/ustrbuf.hxx> #include <tools/poly.hxx> using namespace basegfx; diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 09b52ee01954..5ee3d471f21a 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -23,7 +23,6 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <svl/visitem.hxx> -#include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 23814e9548db..ef1eaf1a1508 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/servicehelper.hxx> -#include <cppuhelper/weak.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 5bde610b0831..17ff4b3feb56 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <vcl/vclptr.hxx> #include <vector> class ThumbnailView; diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index a77083e030c2..5562acc1e709 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -24,10 +24,12 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx> +#include <drawinglayer/attribute/fontattribute.hxx> +#include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx> #include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolygonStrokeArrowPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx> +#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index ba3d5761d0dc..e7da4f4274f6 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -19,7 +19,6 @@ #include <config_java.h> -#include <rtl/strbuf.hxx> #include <tools/debug.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -34,17 +33,14 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Template.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/status/Visibility.hpp> #include <comphelper/processfactory.hxx> -#include <officecfg/Office/Common.hxx> #include <uno/current_context.hxx> #include <vcl/svapp.hxx> #include <vcl/uitest/logger.hxx> @@ -64,14 +60,9 @@ #include <sfx2/msg.hxx> #include <sfx2/viewsh.hxx> #include <slotserv.hxx> -#include <osl/file.hxx> #include <rtl/ustring.hxx> -#include <unotools/pathoptions.hxx> -#include <osl/time.h> #include <sfx2/lokhelper.hxx> -#include <basic/sberrors.hxx> -#include <map> #include <memory> #include <string_view> @@ -83,7 +74,6 @@ #include <desktop/crashreport.hxx> #include <vcl/threadex.hxx> #include <unotools/mediadescriptor.hxx> -#include <tools/json_writer.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sfx2/source/devtools/DocumentModelTreeHandler.cxx b/sfx2/source/devtools/DocumentModelTreeHandler.cxx index 49484309dfd4..c5358c02b48e 100644 --- a/sfx2/source/devtools/DocumentModelTreeHandler.cxx +++ b/sfx2/source/devtools/DocumentModelTreeHandler.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> -#include <com/sun/star/sheet/XSpreadsheets.hpp> #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp> #include <com/sun/star/sheet/XDataPilotTables.hpp> #include <com/sun/star/table/XTableChartsSupplier.hpp> diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx index 7787c61d9468..79b69d612b79 100644 --- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx +++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx @@ -18,11 +18,9 @@ #include <com/sun/star/beans/theIntrospection.hpp> #include <com/sun/star/beans/XIntrospection.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> -#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyConcept.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/MethodConcept.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/reflection/theCoreReflection.hpp> #include <com/sun/star/reflection/XIdlReflection.hpp> diff --git a/sfx2/source/devtools/SelectionChangeHandler.hxx b/sfx2/source/devtools/SelectionChangeHandler.hxx index 612f8e46ff33..15a2b35963e2 100644 --- a/sfx2/source/devtools/SelectionChangeHandler.hxx +++ b/sfx2/source/devtools/SelectionChangeHandler.hxx @@ -10,8 +10,6 @@ #pragma once -#include <memory> - #include <sfx2/devtools/DevelopmentToolDockingWindow.hxx> #include <com/sun/star/frame/XController.hpp> diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx index 00de2837bced..cc9f94168a93 100644 --- a/sfx2/source/dialog/StyleList.cxx +++ b/sfx2/source/dialog/StyleList.cxx @@ -18,6 +18,7 @@ */ #include <memory> +#include <unordered_map> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -28,23 +29,15 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weldutils.hxx> +#include <vcl/window.hxx> #include <svl/intitem.hxx> -#include <svl/stritem.hxx> #include <svl/style.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequenceashashmap.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/UnknownModuleException.hpp> #include <officecfg/Office/Common.hxx> -#include <sal/log.hxx> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> -#include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/templdlg.hxx> #include <templdgi.hxx> #include <tplcitem.hxx> #include <sfx2/styfitem.hxx> @@ -67,7 +60,6 @@ #include <sfx2/StylePreviewRenderer.hxx> #include <StyleList.hxx> -#include <vcl/toolbox.hxx> using namespace css; using namespace css::beans; diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 8d27ef81d412..15fe92ccd408 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <unotools/saveopt.hxx> #include <alienwarn.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index c3e47f6507fe..58794771cefc 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -24,7 +24,6 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/virdev.hxx> #include <unotools/historyoptions.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 60fb167c359a..06e9809d1d44 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/ui/dialogs/XControlInformation.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/XFilePreview.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index aac78f33bc13..ff9f8a9f781a 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -21,12 +21,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/navigat.hxx> -#include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> -#include <vcl/layout.hxx> #include <helpids.h> -#include <tools/debug.hxx> SfxNavigatorWrapper::SfxNavigatorWrapper(vcl::Window* pParentWnd, sal_uInt16 nId) : SfxChildWindow(pParentWnd , nId) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index e221714d0b3e..0e1fe5b822cc 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -19,15 +19,7 @@ #include <memory> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/event.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> -#include <vcl/weldutils.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> @@ -47,26 +39,16 @@ #include <sfx2/bindings.hxx> #include <sfx2/templdlg.hxx> #include <templdgi.hxx> -#include <tplcitem.hxx> #include <sfx2/styfitem.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/viewsh.hxx> -#include <sfx2/newstyle.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> -#include <sfx2/docfac.hxx> -#include <sfx2/module.hxx> #include <helpids.h> #include <sfx2/viewfrm.hxx> -#include <comphelper/string.hxx> - -#include <sfx2/StyleManager.hxx> -#include <sfx2/StylePreviewRenderer.hxx> - using namespace css; using namespace css::beans; using namespace css::frame; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a064bee327ce..61d8c38b3582 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -105,7 +105,6 @@ #include <ucbhelper/content.hxx> #include <ucbhelper/interactionrequest.hxx> #include <sot/storage.hxx> -#include <unotools/saveopt.hxx> #include <svl/documentlockfile.hxx> #include <svl/msodocumentlockfile.hxx> #include <com/sun/star/document/DocumentRevisionListPersistence.hpp> @@ -128,7 +127,6 @@ #include <sfx2/viewfrm.hxx> #include <comphelper/threadpool.hxx> #include <condition_variable> -#include <comphelper/scopeguard.hxx> #include <com/sun/star/io/WrongFormatException.hpp> diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 04fbea3cce7c..18d51016d579 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -39,7 +39,6 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <memory> -#include <osl/diagnose.h> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 70250cf51270..2e7888c3c0f2 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyExistException.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/beans/StringPair.hpp> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index bc289ebb2ff5..0aa47efe74e0 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -50,10 +50,8 @@ #include <guisaveas.hxx> #include <sal/log.hxx> -#include <unotools/pathoptions.hxx> #include <svl/itemset.hxx> #include <svl/eitem.hxx> -#include <unotools/saveopt.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 9da250188825..33c5213d25b1 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -45,8 +45,6 @@ #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <toolkit/helper/vclunohelper.hxx> - #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Any.h> #include <com/sun/star/task/ErrorCodeRequest.hpp> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 0ccdb1b1f2b0..d2ac4883ea78 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/view/PaperFormat.hpp> #include <com/sun/star/view/PaperOrientation.hpp> #include <com/sun/star/ucb/NameClash.hpp> -#include <com/sun/star/ucb/ContentCreationException.hpp> -#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/view/DuplexMode.hpp> #include <comphelper/processfactory.hxx> @@ -40,7 +38,6 @@ #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> #include <comphelper/interfacecontainer4.hxx> -#include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 37187ffbc691..1127ed9d57e2 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -28,13 +28,11 @@ #include <templateviewitem.hxx> #include <sfx2/thumbnailviewitem.hxx> #include <sot/storage.hxx> -#include <svtools/imagemgr.hxx> #include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <vcl/event.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> @@ -48,7 +46,7 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <comphelper/dispatchcommand.hxx> diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx index 5391b4ecbcfd..f6ba9f318593 100644 --- a/sfx2/source/inc/StyleList.hxx +++ b/sfx2/source/inc/StyleList.hxx @@ -21,6 +21,15 @@ #include <sal/config.h> +#include <o3tl/typed_flags_set.hxx> +#include <sfx2/bindings.hxx> +#include <sfx2/styfitem.hxx> +#include <svl/eitem.hxx> +#include <svl/style.hxx> +#include <vcl/idle.hxx> +#include <vcl/transfer.hxx> +#include <vcl/weld.hxx> + class SfxObjectShell; class SfxStyleFamilyItem; class SfxTemplateItem; diff --git a/sfx2/source/inc/helpids.h b/sfx2/source/inc/helpids.h index d154b6bc4af6..91248f469163 100644 --- a/sfx2/source/inc/helpids.h +++ b/sfx2/source/inc/helpids.h @@ -19,6 +19,8 @@ #ifndef INCLUDED_SFX2_SOURCE_INC_HELPIDS_H #define INCLUDED_SFX2_SOURCE_INC_HELPIDS_H +#include <rtl/string.hxx> + inline constexpr OStringLiteral HID_TEMPLATE_FMT = "SFX2_HID_TEMPLATE_FMT"; inline constexpr OStringLiteral HID_TEMPLATE_FILTER = "SFX2_HID_TEMPLATE_FILTER"; inline constexpr OStringLiteral HID_TEMPLDLG_NEWBYEXAMPLE = "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"; diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 6d5da6668725..a5333d395b7f 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -21,24 +21,18 @@ #include <sal/config.h> -#include <array> #include <memory> -#include <optional> #include <vcl/transfer.hxx> #include <vcl/weld.hxx> -#include <svl/lstner.hxx> #include <svl/eitem.hxx> #include <svl/style.hxx> -#include <sfx2/childwin.hxx> #include <sfx2/objsh.hxx> #include <sfx2/styfitem.hxx> #include <sfx2/templdlg.hxx> -#include <vcl/idle.hxx> - #include "StyleList.hxx" class SfxTemplateControllerItem; diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 0966d1c5a6ec..165dd2eeb596 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -20,7 +20,6 @@ #include <inettbc.hxx> -#include <com/sun/star/uno/Any.h> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 75ae422747b1..87564e74ed65 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -34,7 +34,6 @@ #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer4.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ref.hxx> #include <comphelper/enumhelper.hxx> #include <sfx2/app.hxx> #include <tools/diagnose_ex.h> diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 6a5e45eb6be7..b6ddffa89550 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -29,12 +29,7 @@ #include <vcl/event.hxx> #include <comphelper/lok.hxx> -#include <vcl/commandevent.hxx> -#include <vcl/IDialogRenderable.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <tools/svborder.hxx> #include <tools/json_writer.hxx> -#include <sal/log.hxx> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index ef623a64a483..c24c93a511f9 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -20,7 +20,6 @@ #include <sidebar/DeckLayouter.hxx> #include <sidebar/DeckTitleBar.hxx> #include <sidebar/PanelTitleBar.hxx> -#include <sfx2/sidebar/Deck.hxx> #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/SidebarDockingWindow.hxx> diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 42379e5354f3..2a9bbb287261 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -19,10 +19,10 @@ #include <sidebar/DeckTitleBar.hxx> #include <sfx2/sidebar/Theme.hxx> -#include <sfx2/sfxresid.hxx> -#include <sfx2/strings.hrc> +#include <vcl/bitmapex.hxx> #include <vcl/customweld.hxx> +#include <vcl/outdev.hxx> #include <vcl/ptrstyle.hxx> #ifdef DEBUG diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 519c6eb52f43..3f85c8ae522a 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -20,7 +20,6 @@ #include <sfx2/sidebar/Panel.hxx> #include <sidebar/PanelTitleBar.hxx> #include <sidebar/PanelDescriptor.hxx> -#include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/SidebarPanelBase.hxx> @@ -33,7 +32,6 @@ #include <sfx2/sidebar/Deck.hxx> #endif -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/ui/XToolPanel.hpp> #include <com/sun/star/ui/XSidebarPanel.hpp> #include <com/sun/star/ui/XUIElement.hpp> diff --git a/sfx2/source/sidebar/PanelLayout.cxx b/sfx2/source/sidebar/PanelLayout.cxx index fb7e5a48c2a2..ef80cb3d26f5 100644 --- a/sfx2/source/sidebar/PanelLayout.cxx +++ b/sfx2/source/sidebar/PanelLayout.cxx @@ -8,12 +8,12 @@ */ #include <sal/log.hxx> -#include <sfx2/sidebar/SidebarController.hxx> +#include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/PanelLayout.hxx> -#include <sfx2/sidebar/TabBar.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/viewsh.hxx> #include <vcl/event.hxx> +#include <vcl/svapp.hxx> using namespace sfx2::sidebar; diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 6e0677252e4b..50d6e6abb58a 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -18,12 +18,9 @@ */ #include <sidebar/PanelTitleBar.hxx> -#include <sfx2/sfxresid.hxx> -#include <sfx2/strings.hrc> #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sidebar/ControllerFactory.hxx> -#include <vcl/event.hxx> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index eb1bfc5bbb9a..898898a09d4a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -35,6 +35,7 @@ #include <framework/ContextChangeEventMultiplexerTunnel.hxx> +#include <vcl/EnumContext.hxx> #include <vcl/uitest/logger.hxx> #include <vcl/uitest/eventdescription.hxx> #include <vcl/svapp.hxx> @@ -49,8 +50,6 @@ #include <sal/log.hxx> #include <officecfg/Office/UI/Sidebar.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <boost/property_tree/ptree.hpp> -#include <boost/property_tree/json_parser.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 71e55767450e..0a22eb08848c 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -26,13 +26,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/viewsh.hxx> #include <svtools/acceleratorexecute.hxx> #include <tools/gen.hxx> -#include <tools/json_writer.hxx> #include <vcl/event.hxx> -#include <comphelper/lok.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <osl/diagnose.h> #include <boost/property_tree/json_parser.hpp> diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index f0829599e6db..5f72192f13f6 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -21,7 +21,8 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> -#include <vcl/layout.hxx> +#include <vcl/EnumContext.hxx> +#include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 99fcdb67b10e..b975877672c5 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -18,7 +18,6 @@ */ #include <sfx2/sidebar/Theme.hxx> -#include <sidebar/Tools.hxx> #include <sfx2/app.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index dfd767062004..e61503f94bab 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -54,7 +54,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/module.hxx> #include <sfx2/app.hxx> -#include <sidebar/ControllerFactory.hxx> #include <unoctitm.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 91bea023858e..8e577221c58f 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -29,7 +29,6 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <tools/svborder.hxx> -#include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include <appdata.hxx> diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index cb8194c1cabf..69cbc8b3d131 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -30,7 +30,6 @@ #include <sfx2/viewfrm.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> -#include <editeng/outliner.hxx> #include <sfx2/msgpool.hxx> #include <boost/property_tree/json_parser.hpp> diff --git a/sfx2/source/view/prnmon.hxx b/sfx2/source/view/prnmon.hxx index 665d3ac07630..06b3217fa9c8 100644 --- a/sfx2/source/view/prnmon.hxx +++ b/sfx2/source/view/prnmon.hxx @@ -21,7 +21,6 @@ #include <memory> #include <sal/config.h> -#include <vcl/vclptr.hxx> #include <vcl/weld.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 2d1faf2a5ced..7de17349ccfb 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -27,7 +27,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/classificationhelper.hxx> #include <sfx2/notebookbar/SfxNotebookBar.hxx> -#include <svx/svdview.hxx> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/DispatchRecorder.hpp> @@ -73,8 +72,6 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/UnknownModuleException.hpp> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -84,7 +81,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/docpasswordrequest.hxx> #include <comphelper/docpasswordhelper.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <com/sun/star/uno/Reference.h> @@ -97,7 +93,6 @@ #include <optional> -#include <unotools/configmgr.hxx> #include <comphelper/sequenceashashmap.hxx> #include <commandpopup/CommandPopup.hxx> @@ -145,7 +140,6 @@ using ::com::sun::star::container::XIndexContainer; #define ShellClass_SfxViewFrame #include <sfxslots.hxx> -#include <sfx2/sidebar/SidebarController.hxx> constexpr OUStringLiteral CHANGES_STR = u"private:resource/toolbar/changes"; SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewFrame,SfxShell) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 77a9c40cd074..5a850d355a5d 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -26,14 +26,12 @@ #include <comphelper/propertyvalue.hxx> #include <officecfg/Office/Common.hxx> #include <sal/log.hxx> -#include <svl/itempool.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svtools/prnsetup.hxx> #include <svl/flagitem.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> -#include <sfx2/app.hxx> #include <unotools/useroptions.hxx> #include <tools/datetime.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 1cc61a8aa2b0..ad16d0ccc463 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -20,16 +20,15 @@ #include <config_features.h> #include <sal/log.hxx> -#include <rtl/strbuf.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <svl/whiter.hxx> -#include <toolkit/awt/vclxmenu.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/weld.hxx> #include <svl/intitem.hxx> #include <svtools/langhelp.hxx> +#include <com/sun/star/awt/XPopupMenu.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/io/IOException.hpp> diff --git a/slideshow/IwyuFilter_slideshow.yaml b/slideshow/IwyuFilter_slideshow.yaml index 850b78285300..f75f9b536684 100644 --- a/slideshow/IwyuFilter_slideshow.yaml +++ b/slideshow/IwyuFilter_slideshow.yaml @@ -16,7 +16,7 @@ excludelist: - glm/gtc/type_ptr.hpp slideshow/source/engine/box2dtools.cxx: # Macro BOX2D_HEADER is resolved to this - - Box2D/Box2D.h + - box2d/box2d.h slideshow/source/engine/opengl/Operation.cxx: # Wrapper for external lib - glm/gtc/matrix_transform.hpp diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 7ef3f455996f..1c730970e44f 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -18,15 +18,12 @@ */ #include <comphelper/processfactory.hxx> -#include <comphelper/servicehelper.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/SystemPointer.hpp> -#include <com/sun/star/presentation/XShapeEventListener.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> -#include <svx/unoshape.hxx> #include <svx/ImageMapInfo.hxx> #include "shapemanagerimpl.hxx" diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 83607ddd7aaf..033af87565c4 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -50,7 +50,6 @@ #include <box2dtools.hxx> #include <vcl/graphicfilter.hxx> #include <svx/svdograf.hxx> -#include <svx/unoshape.hxx> using namespace ::com::sun::star; diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index b5e0cd687f56..ca5278a7acc7 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -18,7 +18,6 @@ */ #include <sal/types.h> -#include <tools/long.hxx> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index be8d6ecb0c82..275de3ae3207 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -22,7 +22,6 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <unoview.hxx> #include <unoviewcontainer.hxx> #include "tests.hxx" diff --git a/sot/IwyuFilter_sot.yaml b/sot/IwyuFilter_sot.yaml index 9c19013558e9..c4d281721410 100644 --- a/sot/IwyuFilter_sot.yaml +++ b/sot/IwyuFilter_sot.yaml @@ -5,9 +5,6 @@ excludelist: # Base class needs complete type - com/sun/star/embed/XOLESimpleStorage.hpp - com/sun/star/lang/XServiceInfo.hpp - sot/source/sdstor/stgcache.hxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h - sot/source/sdstor/stgcache.cxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h + sot/source/base/formats.cxx: + # Needed on WIN32 + - o3tl/char16_t2wchar_t.hxx diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index 301769385f64..9881d6e0e7a7 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -20,7 +20,6 @@ #include <string.h> #include <osl/endian.h> #include <osl/diagnose.h> -#include <tools/solar.h> #include <sot/stg.hxx> #include "stgcache.hxx" diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 565de5a5b63a..58bfe785fb25 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/io/TempFile.hpp> -#include <comphelper/interfacecontainer2.hxx> #include <comphelper/storagehelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/starmath/IwyuFilter_starmath.yaml b/starmath/IwyuFilter_starmath.yaml index 2855b3bb1f37..72047b7c8ecc 100644 --- a/starmath/IwyuFilter_starmath.yaml +++ b/starmath/IwyuFilter_starmath.yaml @@ -4,6 +4,9 @@ excludelist: starmath/inc/smmod.hxx: # Needed for define - sfx2/app.hxx + starmath/inc/format.hxx: + # Needed for FONTNAME_MATH macro + - types.hxx starmath/qa/extras/mmlexport-test.cxx: # Required in C++20 mode. - o3tl/cppunittraitshelper.hxx @@ -28,9 +31,6 @@ excludelist: starmath/source/node.cxx: # Actually used - vector - starmath/source/mathmlexport.cxx: - # Needed for rtl::math::round - - rtl/math.hxx starmath/source/smdll.cxx: # Needed to inherit linker visibility - smdll.hxx @@ -46,3 +46,9 @@ excludelist: - register.hxx # Needed for template - com/sun/star/frame/XModel.hpp + starmath/source/mathml/def.cxx: + # Needed for extern + - mathml/attribute.hxx + starmath/source/mathml/mathmlexport.cxx: + # Needed for rtl::math::round + - rtl/math.hxx diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 9f8849da4b82..3b8e9fa9788d 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -24,7 +24,8 @@ #include <vcl/weld.hxx> #include <unotools/resmgr.hxx> -#include "parse.hxx" +#include "node.hxx" +#include "parsebase.hxx" #include "AccessibleSmElementsControl.hxx" class SmDocShell; diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index 4b670e61cb8c..5886ffaf2eac 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -11,6 +11,8 @@ #include "caret.hxx" +#include <list> + /** Factor to multiple the squared horizontal distance with * Used for Up and Down movement. */ diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 7403d35cf5a8..214d9a9ce558 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -30,7 +30,8 @@ #include <oox/export/utils.hxx> #include "format.hxx" -#include "parse.hxx" +#include "node.hxx" +#include "parsebase.hxx" #include "smdllapi.hxx" #include "mathml/iterator.hxx" diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 3c5d498a364b..503cdd8452a9 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -21,7 +21,6 @@ #include <svx/weldeditview.hxx> #include <vcl/idle.hxx> -#include <vcl/transfer.hxx> class SmDocShell; class SmViewShell; diff --git a/starmath/inc/mathml/element.hxx b/starmath/inc/mathml/element.hxx index 901e0021daa3..ce5d7073b606 100644 --- a/starmath/inc/mathml/element.hxx +++ b/starmath/inc/mathml/element.hxx @@ -10,7 +10,6 @@ #pragma once #include "attribute.hxx" -#include "starmathdatabase.hxx" #include <rect.hxx> #include <editeng/editdata.hxx> diff --git a/starmath/inc/mathml/export.hxx b/starmath/inc/mathml/export.hxx index 125f2602c491..0bd83e6ef238 100644 --- a/starmath/inc/mathml/export.hxx +++ b/starmath/inc/mathml/export.hxx @@ -28,8 +28,7 @@ #include <xmloff/xmltoken.hxx> // Extras -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/io/XOutputStream.hpp> class SfxMedium; class SmDocShell; diff --git a/starmath/inc/mathml/import.hxx b/starmath/inc/mathml/import.hxx index f14682bdfb8b..d98cc8cf4b66 100644 --- a/starmath/inc/mathml/import.hxx +++ b/starmath/inc/mathml/import.hxx @@ -17,7 +17,6 @@ #include <xmloff/xmlimp.hxx> // Extras -#include <com/sun/star/beans/PropertyAttribute.hpp> class SfxMedium; class SmDocShell; diff --git a/starmath/inc/mathml/mathmlattr.hxx b/starmath/inc/mathml/mathmlattr.hxx index 16161fb4b8fb..b7d1160bb8ca 100644 --- a/starmath/inc/mathml/mathmlattr.hxx +++ b/starmath/inc/mathml/mathmlattr.hxx @@ -14,7 +14,6 @@ #include <string_view> #include <rtl/ustring.hxx> -#include <sal/types.h> #include <tools/fract.hxx> // MathML 3: 2.1.5.1 Syntax notation used in the MathML specification diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 427966279dd6..0a8a6c369065 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -68,6 +68,7 @@ #include "nodetype.hxx" #include <editeng/editdata.hxx> +#include <rtl/ustrbuf.hxx> enum class FontAttribute { None = 0x0000, diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index c69a6e2654be..a62d515b5f7a 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -23,7 +23,7 @@ #pragma once -#include "parse5.hxx" +#include "parsebase.hxx" namespace starmathdatabase { diff --git a/starmath/inc/parse5.hxx b/starmath/inc/parse5.hxx index 69528c403c0a..5b72378676ee 100644 --- a/starmath/inc/parse5.hxx +++ b/starmath/inc/parse5.hxx @@ -24,6 +24,7 @@ #pragma once #include "parsebase.hxx" +#include <unotools/charclass.hxx> class SmParser5 final : public AbstractSmParser { diff --git a/starmath/inc/parsebase.hxx b/starmath/inc/parsebase.hxx index d655e7615096..c5618525626f 100644 --- a/starmath/inc/parsebase.hxx +++ b/starmath/inc/parsebase.hxx @@ -23,11 +23,12 @@ #pragma once -#include <unotools/charclass.hxx> #include <unotools/resmgr.hxx> #include "node.hxx" +#include <set> + #define DEPTH_LIMIT 1024 // Those are the errors that the parser may encounter. diff --git a/starmath/inc/smediteng.hxx b/starmath/inc/smediteng.hxx index 4e0b3162a811..6c95b5804490 100644 --- a/starmath/inc/smediteng.hxx +++ b/starmath/inc/smediteng.hxx @@ -8,7 +8,6 @@ #pragma once #include <editeng/editeng.hxx> -#include <editeng/fontitem.hxx> #include <unotools/lingucfg.hxx> class SmEditEngine final : public EditEngine diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc index 69c7affb7acd..885af214742e 100644 --- a/starmath/inc/smmod.hrc +++ b/starmath/inc/smmod.hrc @@ -9,6 +9,8 @@ #pragma once +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId RID_UI_SYMBOLSET_NAMES[] = diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx index f0796a6622cb..e22625155ff2 100644 --- a/starmath/inc/strings.hxx +++ b/starmath/inc/strings.hxx @@ -15,6 +15,8 @@ #pragma once +#include <rtl/ustring.hxx> + inline constexpr OUStringLiteral RID_UNDOFORMATNAME = u"Format"; // clang-format off diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index 808195dca9d3..86ee287d51c8 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -28,19 +28,11 @@ #pragma once -#include "types.hxx" -#include <rtl/ustrbuf.hxx> #include <tools/color.hxx> #include <o3tl/typed_flags_set.hxx> // std imports -#include <cassert> #include <memory> -#include <vector> -#include <stack> -#include <tuple> -#include <list> -#include <set> // TokenGroups enum class TG diff --git a/starmath/qa/cppunit/test_cursor.cxx b/starmath/qa/cppunit/test_cursor.cxx index b77007eb9b86..56c673c1bd22 100644 --- a/starmath/qa/cppunit/test_cursor.cxx +++ b/starmath/qa/cppunit/test_cursor.cxx @@ -17,6 +17,7 @@ #include <document.hxx> #include <node.hxx> #include <cursor.hxx> +#include <parse5.hxx> #include <memory> diff --git a/starmath/qa/cppunit/test_node.cxx b/starmath/qa/cppunit/test_node.cxx index c51b86759879..f16f195aa8bc 100644 --- a/starmath/qa/cppunit/test_node.cxx +++ b/starmath/qa/cppunit/test_node.cxx @@ -17,7 +17,7 @@ #include <document.hxx> #include <smdll.hxx> #include <node.hxx> -#include <parse.hxx> +#include <parse5.hxx> #include <utility.hxx> #include <memory> diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index 3d05965224c4..6f714321de82 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -16,6 +16,7 @@ #include <document.hxx> #include <node.hxx> +#include <parse5.hxx> #include <visitors.hxx> #include <cursor.hxx> diff --git a/starmath/qa/cppunit/test_parse.cxx b/starmath/qa/cppunit/test_parse.cxx index daa236105b9f..2171cde80e56 100644 --- a/starmath/qa/cppunit/test_parse.cxx +++ b/starmath/qa/cppunit/test_parse.cxx @@ -15,7 +15,7 @@ #include <document.hxx> #include <smdll.hxx> #include <node.hxx> -#include <parse.hxx> +#include <parse5.hxx> #include <memory> diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 8cc905aed45b..60eb85944571 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -9,7 +9,6 @@ #include <sal/config.h> -#include <config_features.h> #include <config_fonts.h> #include <vcl/print.hxx> diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 23888cf95311..7f1b86120ad0 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -23,6 +23,7 @@ #include <strings.hrc> #include <smmod.hxx> #include <cfgitem.hxx> +#include <parse.hxx> #include <view.hxx> #include <visitors.hxx> #include <document.hxx> diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index b5686d01b97b..c2ae7bb41e1a 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -26,27 +26,18 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> -#include <com/sun/star/i18n/WordType.hpp> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> -#include <svx/AccessibleTextHelper.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <vcl/window.hxx> #include <vcl/unohelp2.hxx> #include <vcl/settings.hxx> #include <tools/gen.hxx> -#include <svl/itemset.hxx> #include <editeng/editobj.hxx> -#include <editeng/editdata.hxx> -#include <editeng/editview.hxx> -#include <editeng/eeitem.hxx> -#include <editeng/outliner.hxx> -#include <editeng/unoedhlp.hxx> #include "accessibility.hxx" diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 5431b9f85b37..0ea2c2f3686e 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -28,11 +28,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Reference.h> #include <cppuhelper/implbase.hxx> -#include <svl/SfxBroadcaster.hxx> -#include <editeng/editeng.hxx> -#include <editeng/unoedsrc.hxx> -#include <edit.hxx> #include <view.hxx> class SmDocShell; diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 156b61b8b2d5..16e6d67b7312 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -19,7 +19,6 @@ #include <svl/itemset.hxx> #include <svl/intitem.hxx> -#include <svl/itempool.hxx> #include <svl/eitem.hxx> #include <svl/languageoptions.hxx> #include <unotools/configmgr.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index dde2dd1cfc6b..23034ede3e3c 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -49,12 +49,7 @@ #include <svl/stritem.hxx> #include <svl/undo.hxx> #include <svl/whiter.hxx> -#include <editeng/editstat.hxx> -#include <editeng/eeitem.hxx> -#include <editeng/fhgtitem.hxx> -#include <editeng/fontitem.hxx> #include <vcl/mapmod.hxx> -#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <tools/mapunit.hxx> #include <vcl/settings.hxx> @@ -63,6 +58,7 @@ #include <action.hxx> #include <dialog.hxx> #include <format.hxx> +#include <parse.hxx> #include <starmath.hrc> #include <strings.hrc> #include <smmod.hxx> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index e8e79a24e12c..6b192a930d97 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -31,7 +31,6 @@ #include <sfx2/sfxsids.hrc> #include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/AccessibleTextHelper.hxx> #include <osl/diagnose.h> #include <edit.hxx> @@ -40,7 +39,6 @@ #include <document.hxx> #include <cfgitem.hxx> #include <smediteng.hxx> -#include "accessibility.hxx" using namespace com::sun::star::accessibility; using namespace com::sun::star; diff --git a/starmath/source/mathml/export.cxx b/starmath/source/mathml/export.cxx index 554bb1b0d5d1..b7b7d6c82733 100644 --- a/starmath/source/mathml/export.cxx +++ b/starmath/source/mathml/export.cxx @@ -22,6 +22,7 @@ #include <mathml/iterator.hxx> // LO tools to use +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Any.h> @@ -29,27 +30,22 @@ #include <com/sun/star/xml/sax/Writer.hpp> // Extra LO tools -#include <comphelper/fileformat.h> #include <comphelper/genericpropertyset.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysetinfo.hxx> -#include <sax/tools/converter.hxx> #include <sfx2/frame.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> -#include <sot/storage.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> #include <unotools/streamwrap.hxx> #include <xmloff/namespacemap.hxx> // Our starmath tools -#include <cfgitem.hxx> #include <document.hxx> #include <smmod.hxx> #include <strings.hrc> #include <unomodel.hxx> -#include <utility.hxx> #include <xparsmlbase.hxx> #include <starmathdatabase.hxx> diff --git a/starmath/source/mathml/import.cxx b/starmath/source/mathml/import.cxx index a9af99c07949..2e3e390c1785 100644 --- a/starmath/source/mathml/import.cxx +++ b/starmath/source/mathml/import.cxx @@ -32,27 +32,22 @@ #include <sfx2/docfile.hxx> #include <sfx2/frame.hxx> #include <sfx2/sfxsids.hrc> -#include <sfx2/sfxmodelfactory.hxx> #include <sot/storage.hxx> #include <svtools/sfxecode.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> -#include <sax/tools/converter.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <tools/diagnose_ex.h> #include <unotools/streamwrap.hxx> #include <xmloff/DocumentSettingsContext.hxx> #include <xmloff/xmlmetai.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/xmluconv.hxx> // Our starmath tools #include <cfgitem.hxx> #include <document.hxx> #include <xparsmlbase.hxx> -#include <utility.hxx> #include <smmod.hxx> #include <starmathdatabase.hxx> #include <unomodel.hxx> diff --git a/starmath/source/mathml/iterator.cxx b/starmath/source/mathml/iterator.cxx index 481ff799689c..cfa9a0b78865 100644 --- a/starmath/source/mathml/iterator.cxx +++ b/starmath/source/mathml/iterator.cxx @@ -9,8 +9,6 @@ #include <mathml/iterator.hxx> -#include <stdlib.h> - /** The purpose of this iterator is to be able to iterate threw an infinite element tree * infinite -> as much as your memory can hold * No call-backs that will end up in out of stack diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx index ec8bb1d61395..b52b447b3439 100644 --- a/starmath/source/mathml/mathmlexport.cxx +++ b/starmath/source/mathml/mathmlexport.cxx @@ -37,7 +37,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> #include <osl/diagnose.h> -#include <unotools/saveopt.hxx> #include <sot/storage.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> diff --git a/starmath/source/mathml/starmathdatabase.cxx b/starmath/source/mathml/starmathdatabase.cxx index 9a45ff0edacf..d52a5fa37cdc 100644 --- a/starmath/source/mathml/starmathdatabase.cxx +++ b/starmath/source/mathml/starmathdatabase.cxx @@ -18,6 +18,7 @@ */ #include <starmathdatabase.hxx> +#include <types.hxx> SmToken starmathdatabase::Identify_SmXMLOperatorContext_Impl(sal_Unicode cChar, bool bIsStretchy) { diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 995595df20d6..0941edc1acb2 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -21,6 +21,8 @@ #include <node.hxx> +#include <set> + class SfxMedium; class SotStorage; class SvStream; diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 14d42334c61e..66daec9d241d 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -18,6 +18,7 @@ */ #include <parse.hxx> +#include <parse5.hxx> #include <smmod.hxx> #include <cfgitem.hxx> diff --git a/starmath/source/parse5.cxx b/starmath/source/parse5.cxx index 2fc1395ebf8d..60e341bab71d 100644 --- a/starmath/source/parse5.cxx +++ b/starmath/source/parse5.cxx @@ -32,6 +32,8 @@ #include <cfgitem.hxx> #include <starmathdatabase.hxx> +#include <stack> + using namespace ::com::sun::star::i18n; //Definition of math keywords diff --git a/starmath/source/smediteng.cxx b/starmath/source/smediteng.cxx index ca1592eb2add..5560d501ef5a 100644 --- a/starmath/source/smediteng.cxx +++ b/starmath/source/smediteng.cxx @@ -10,13 +10,15 @@ #include <smmod.hxx> #include <cfgitem.hxx> -#include <svx/weldeditview.hxx> #include <vcl/settings.hxx> -#include <sfx2/viewfrm.hxx> +#include <editeng/editview.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> +#include <vcl/outdev.hxx> +#include <vcl/svapp.hxx> SmEditEngine::SmEditEngine(SfxItemPool* pItemPool) : EditEngine(pItemPool) diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index 1d93202f9c48..b9e2ca4e993b 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp> diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index 75298583b0c4..e8f7db0bfc4a 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -23,7 +23,6 @@ #include "UriReference.hxx" -#include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 054c6ca3d76c..59eadd9f2db2 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> -#include <osl/mutex.hxx> #include <rtl/character.hxx> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index f8717b37b9dd..2a3211a08856 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -30,7 +30,6 @@ #include <rtl/textenc.h> #include <rtl/uri.h> #include <rtl/uri.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index 14132fa70031..aa96e6a86bf8 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp> @@ -36,7 +35,6 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/textenc.h> #include <rtl/uri.hxx> @@ -45,8 +43,6 @@ #include <sal/types.h> #include <sal/macros.h> -#include <cstdlib> - namespace { #define TEST_ASSERT_EQUAL(token1, token2, token3, expected, actual) \ |