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 /sfx2/source | |
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>
Diffstat (limited to 'sfx2/source')
60 files changed, 30 insertions, 147 deletions
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> |