diff options
156 files changed, 132 insertions, 271 deletions
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index e5fd9e2ab23c..b0997bab3abe 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -12,9 +12,7 @@ #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> -#include <cppuhelper/implbase.hxx> #include <sax/fastparser.hxx> #include <sax/fastattribs.hxx> #include <test/bootstrapfixture.hxx> diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index a12bd23fc2d5..79ac533f72b6 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -28,8 +28,6 @@ #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/xml/sax/XFastContextHandler.hpp> -#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index 161f9f11bba0..0ef8828b187d 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -20,7 +20,6 @@ #include <algorithm> #include <com/sun/star/xml/sax/SAXException.hpp> -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <sax/fastattribs.hxx> using namespace ::com::sun::star::uno; diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx index 41857c95ef19..39b01f175176 100644 --- a/sax/source/tools/fshelper.cxx +++ b/sax/source/tools/fshelper.cxx @@ -19,7 +19,6 @@ #include <sax/fshelper.hxx> #include "fastserializer.hxx" -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/scaddins/IwyuFilter_scaddins.yaml b/scaddins/IwyuFilter_scaddins.yaml index 09df2aa5ebcc..963ffe7d007c 100644 --- a/scaddins/IwyuFilter_scaddins.yaml +++ b/scaddins/IwyuFilter_scaddins.yaml @@ -8,6 +8,10 @@ excludelist: - com/sun/star/sheet/addin/XAnalysis.hpp - com/sun/star/sheet/XAddIn.hpp - com/sun/star/sheet/XCompatibilityNames.hpp + scaddins/source/analysis/analysisdefs.hxx: + # Needed for macros + - com/sun/star/lang/IllegalArgumentException.hpp + - cmath scaddins/source/datefunc/datefunc.hxx: # Base class needs complete type - com/sun/star/lang/XServiceInfo.hpp @@ -23,3 +27,12 @@ excludelist: - com/sun/star/sheet/addin/XPricingFunctions.hpp - com/sun/star/sheet/XAddIn.hpp - com/sun/star/sheet/XCompatibilityNames.hpp + scaddins/source/pricing/black_scholes.cxx: + # Needed for rtl::math::erfc + - rtl/math.hxx + scaddins/source/analysis/bessel.cxx: + # Needed for rtl::math::sin / cos + - rtl/math.hxx + scaddins/source/pricing/pricing.cxx: + # Needed for std::isfinite + - cmath diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 9db4d55fee6f..6fb4e9b958ff 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -20,12 +20,9 @@ #include "analysisdefs.hxx" #include "analysis.hxx" #include "bessel.hxx" -#include <cppuhelper/factory.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <o3tl/any.hxx> #include <rtl/math.hxx> #include <sal/macros.h> diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx index 4ee96be9ae0d..fec9ccc3fb87 100644 --- a/scaddins/source/analysis/analysisdefs.hxx +++ b/scaddins/source/analysis/analysisdefs.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_SCADDINS_SOURCE_ANALYSIS_ANALYSISDEFS_HXX #define INCLUDED_SCADDINS_SOURCE_ANALYSIS_ANALYSISDEFS_HXX +#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <cmath> + #define CHK_Freq ( nFreq != 1 && nFreq != 2 && nFreq != 4 ) #define CHK_FINITE(d) if( !std::isfinite( d ) ) throw css::lang::IllegalArgumentException() #define RETURN_FINITE(d) if( !std::isfinite( d ) ) throw css::lang::IllegalArgumentException(); return d; diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx index cf41b268eed7..a10696bfdefb 100644 --- a/scaddins/source/analysis/financial.cxx +++ b/scaddins/source/analysis/financial.cxx @@ -21,7 +21,6 @@ #include "analysis.hxx" #include "analysishelper.hxx" #include <o3tl/temporary.hxx> -#include <rtl/math.hxx> using namespace sca::analysis; diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 995db6235300..232fa9bb1d52 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -24,7 +24,6 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <rtl/ustrbuf.hxx> #include <unotools/resmgr.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 569e396c43da..026487a4e472 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -30,10 +30,8 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <iostream> #include <algorithm> -#include <rtl/math.hxx> +#include <cmath> #include <unotools/resmgr.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/sccomp/IwyuFilter_sccomp.yaml b/sccomp/IwyuFilter_sccomp.yaml index de0c24aac510..be2dc6eb42cf 100644 --- a/sccomp/IwyuFilter_sccomp.yaml +++ b/sccomp/IwyuFilter_sccomp.yaml @@ -6,3 +6,6 @@ excludelist: - com/sun/star/sheet/XSolver.hpp - com/sun/star/sheet/XSolverDescription.hpp - com/sun/star/lang/XServiceInfo.hpp + sccomp/source/solver/SolverComponent.cxx: + # Actually used + - com/sun/star/sheet/XSpreadsheetDocument.hpp diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 9b3e9481a3a2..d4afb41eaea3 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/uri.hxx> #include <sal/log.hxx> diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 22a2839b4042..124aa905ebb3 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -18,7 +18,6 @@ */ -#include "DialogModelProvider.hxx" #include "dlgprov.hxx" #include "dlgevtatt.hxx" #include <com/sun/star/awt/UnoControlDialog.hpp> @@ -41,7 +40,6 @@ #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp> #include <com/sun/star/util/theMacroExpander.hpp> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <sfx2/app.hxx> diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index b163a2000cce..e8fe67a1c502 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -37,11 +37,8 @@ #include <sfx2/objsh.hxx> #include <sfx2/frame.hxx> #include <sfx2/sfxdlg.hxx> -#include <vcl/abstdlg.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/processfactory.hxx> -#include <cppuhelper/factory.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <framework/documentundoguard.hxx> diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index d540b4d09749..eeb5cd0977b7 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -22,6 +22,7 @@ #include <cppuhelper/supportsservice.hxx> #include <unotools/mediadescriptor.hxx> +#include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> @@ -32,7 +33,6 @@ #include <tools/diagnose_ex.h> #include "BrowseNodeFactoryImpl.hxx" -#include "MasterScriptProvider.hxx" #include <util/MiscUtils.hxx> #include <vector> diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 007df949e93b..282d631a6f21 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -21,9 +21,7 @@ #include <comphelper/SetFlagContextHelper.hxx> #include <comphelper/documentinfo.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> @@ -43,7 +41,6 @@ #include <sal/log.hxx> #include "MasterScriptProvider.hxx" -#include "URIHelper.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index cc29abd0a969..acdb8f8da0ff 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/supportsservice.hxx> -#include "MasterScriptProvider.hxx" #include "MasterScriptProviderFactory.hxx" using namespace ::com::sun::star; diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 455174f2eff8..bcbb02bb8bbd 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/resource/MissingResourceException.hpp> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/ElementExistException.hpp> diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 4d43cfe78d24..3a5e33f3b8a6 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ref.hxx> namespace sdext::presenter { diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index cc35b54c835d..196feeba62ef 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -27,7 +27,6 @@ #include <osl/conditn.hxx> #include <algorithm> -#include <iterator> #include <memory> #include <set> diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml index 87396e719fc4..493d9aa47929 100644 --- a/sfx2/IwyuFilter_sfx2.yaml +++ b/sfx2/IwyuFilter_sfx2.yaml @@ -52,15 +52,6 @@ excludelist: - sfx2/docfile.hxx - ucbhelper/content.hxx - comphelper/processfactory.hxx - sfx2/source/appl/appquit.cxx: - # Needed for DELETEZ to avoid -Wdelete-incomplete warnings - - childwinimpl.hxx - - ctrlfactoryimpl.hxx - - sfx2/doctempl.hxx - - sfx2/fcontnr.hxx - - sfx2/msgpool.hxx - - sfx2/viewsh.hxx - - shellimpl.hxx sfx2/source/appl/appmisc.cxx: # Needed for TypedWhichId macro - svl/stritem.hxx @@ -85,9 +76,24 @@ excludelist: sfx2/source/bastyp/fltfnc.cxx: # Needed for UnoType to work - com/sun/star/task/XInteractionHandler.hpp + sfx2/source/control/dispatch.cxx: + # Needed for DENTERREGISTRATIONS DLEAVEREGISTRATIONS macros from sfx2/bindings.hxx in DBG_UTIL mode + - rtl/strbuf.hxx + sfx2/source/control/listview.cxx: + # Needed for MOREBUTTON in sfx2/inc/bitmaps.hlst to not fail, until a bit of cleanup there. + - tools/wintypes.hxx sfx2/source/control/sfxstatuslistener.cxx: # Actually used - com/sun/star/frame/XDispatchProvider.hpp + sfx2/source/control/statcach.cxx: + # Needed for template + - com/sun/star/frame/XFrame.hpp + sfx2/source/dialog/documentfontsdialog.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp + sfx2/source/dialog/versdlg.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp sfx2/source/doc/docinf.cxx: # Actually used - com/sun/star/document/XDocumentProperties.hpp @@ -100,6 +106,9 @@ excludelist: sfx2/source/doc/guisaveas.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx + sfx2/source/doc/iframe.cxx: + # Needed for template + - com/sun/star/awt/XWindowPeer.hpp sfx2/source/doc/objstor.cxx: # Actually used - com/sun/star/frame/XModel.hpp @@ -115,6 +124,9 @@ excludelist: sfx2/source/doc/sfxbasemodel.cxx: # Don't propose hxx -> h change in URE libs - cppuhelper/interfacecontainer.hxx + sfx2/source/doc/signaturestate.cxx: + # Actually used + - com/sun/star/security/DocumentSignatureInformation.hpp sfx2/source/inc/asyncfunc.hxx: # base class has to be a complete type - com/sun/star/lang/XUnoTunnel.hpp @@ -126,6 +138,9 @@ excludelist: sfx2/source/sidebar/Panel.cxx: # Actually used - com/sun/star/ui/XUIElement.hpp + sfx2/source/sidebar/ResourceManager.cxx: + # Needed for template + - com/sun/star/ui/XSidebarPanel.hpp sfx2/source/sidebar/SidebarToolBox.cxx: # Actually used - com/sun/star/frame/XFrame.hpp @@ -135,6 +150,18 @@ excludelist: - com/sun/star/awt/XWindowPeer.hpp - com/sun/star/frame/XDispatch.hpp - com/sun/star/ui/ContextChangeEventObject.hpp + sfx2/source/sidebar/SidebarDockingWindow.cxx: + # Needed for json_parser_error + - boost/property_tree/json_parser.hpp + sfx2/source/sidebar/SidebarPanelBase.cxx: + # Needed for template + - com/sun/star/awt/XWindowPeer.hpp + sfx2/source/view/ipclient.cxx: + # Needed for template + - com/sun/star/awt/XWindowPeer.hpp + sfx2/source/view/sfxbasecontroller.cxx: + # Needed for template + - com/sun/star/awt/XWindowPeer.hpp sfx2/source/view/viewfrm2.cxx: # Needed for direct member access - com/sun/star/embed/VerbDescriptor.hpp @@ -146,6 +173,8 @@ excludelist: # Actually used - com/sun/star/awt/XKeyHandler.hpp - com/sun/star/awt/XMouseClickHandler.hpp + # Needed for template + - com/sun/star/awt/XWindowPeer.hpp sfx2/source/view/viewsh.cxx: # Needed for TypedWhichId define - svl/eitem.hxx diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index f3138419f4a3..9f9909ff6bfa 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -24,7 +24,6 @@ #include <sfx2/app.hxx> #include <sfx2/frame.hxx> #include <basic/sberrors.hxx> -#include <tools/svlibrary.h> #include <svl/svdde.hxx> #include <unotools/configmgr.hxx> @@ -50,7 +49,6 @@ #include <sfx2/stbitem.hxx> #include <sfx2/dockwin.hxx> #include <shellimpl.hxx> -#include <comphelper/lok.hxx> #include <svtools/helpopt.hxx> #include <unotools/viewoptions.hxx> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index c9495eea5d16..d41136789ce7 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -43,7 +43,6 @@ #include <unotools/pathoptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> -#include <vcl/toolbox.hxx> #include <sal/log.hxx> #include <vcl/idle.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 864e2aaaf1a3..f7ddfb297d6a 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -21,8 +21,7 @@ #include <ucbhelper/content.hxx> #include <vcl/canvastools.hxx> -#include <vcl/svapp.hxx> -#include <vcl/graphicfilter.hxx> +#include <vcl/vectorgraphicdata.hxx> #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/graphic/Primitive2DTools.hpp> diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 1fafb81ceb42..d4a7fc134c66 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -20,12 +20,10 @@ #include <config_features.h> #include <basic/sbstar.hxx> -#include <tools/solar.h> #include <tools/debug.hxx> #include <sfx2/app.hxx> #include <appdata.hxx> -#include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d6190e604c78..ab441f70b7f5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> -#include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/drawing/ModuleDispatcher.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> @@ -28,8 +27,6 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> -#include <com/sun/star/system/SystemShellExecute.hpp> -#include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/text/ModuleDispatcher.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -54,7 +51,6 @@ #include <svl/visitem.hxx> #include <unotools/configmgr.hxx> -#include <tools/svlibrary.h> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> @@ -105,7 +101,6 @@ #include <comphelper/types.hxx> #include <officecfg/Office/Common.hxx> #include <unotools/confignode.hxx> -#include <officecfg/Setup.hxx> #include <memory> #include <openuriexternally.hxx> @@ -118,10 +113,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::script; -using namespace ::com::sun::star::system; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::document; using namespace ::com::sun::star::ui; namespace diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index 75755ecbe640..ccab2578e750 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -23,7 +23,6 @@ #include "newhelp.hxx" #include <tools/urlobj.hxx> #include <tools/debug.hxx> -#include <limits.h> using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 9f83906fbd65..6170c5db01f0 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -38,7 +38,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -71,7 +70,6 @@ #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <unotools/historyoptions.hxx> -#include <svtools/menuoptions.hxx> #include <unotools/viewoptions.hxx> #include <tools/urlobj.hxx> #include <svtools/imagemgr.hxx> @@ -80,7 +78,6 @@ #include <vcl/event.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/layout.hxx> -#include <vcl/taskpanelist.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 82775fd9a328..070d762b00dc 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -25,7 +25,6 @@ #include <tools/datetime.hxx> #include <tools/urlobj.hxx> #include <svl/inethist.hxx> -#include <vcl/gdimtf.hxx> #include <vcl/pngwrite.hxx> #include <vcl/svapp.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index f62cb1c368f4..99f5c5796d08 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -23,7 +23,6 @@ #include <vcl/svapp.hxx> #include <sfx2/charwin.hxx> #include <comphelper/dispatchcommand.hxx> -#include <comphelper/processfactory.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sfx2/source/control/listview.cxx b/sfx2/source/control/listview.cxx index 7b239d172739..d4b8769447cc 100644 --- a/sfx2/source/control/listview.cxx +++ b/sfx2/source/control/listview.cxx @@ -7,22 +7,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <vcl/headbar.hxx> #include <sfx2/listview.hxx> -#include <sfx2/doctempl.hxx> #include <sfx2/sfxresid.hxx> #include <tools/urlobj.hxx> -#include <vcl/svapp.hxx> - -#include <vcl/commandevent.hxx> -#include <vcl/event.hxx> #include <sfx2/strings.hrc> #include <osl/file.hxx> #include <osl/time.h> #include <comphelper/fileurl.hxx> -#include <string> #include <svtools/svtresid.hxx> #include <svtools/strings.hrc> @@ -30,6 +23,7 @@ #include <unotools/collatorwrapper.hxx> #include <unotools/syslocale.hxx> #include <unotools/intlwrapper.hxx> +#include <tools/wintypes.hxx> #include <bitmaps.hlst> #include <rtl/math.hxx> diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index 8a047b20ee8d..dbec7dac90db 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -17,7 +17,6 @@ #include <sfx2/templatelocalview.hxx> #include <tools/urlobj.hxx> #include <unotools/historyoptions.hxx> -#include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/ptrstyle.hxx> diff --git a/sfx2/source/control/templatedlglocalview.cxx b/sfx2/source/control/templatedlglocalview.cxx index 3e60830e5bd9..a1419ab5c8d6 100644 --- a/sfx2/source/control/templatedlglocalview.cxx +++ b/sfx2/source/control/templatedlglocalview.cxx @@ -12,7 +12,6 @@ #include <comphelper/string.hxx> #include <sfx2/inputdlg.hxx> #include <templateviewitem.hxx> -#include <sfx2/doctempl.hxx> #include <sfx2/sfxresid.hxx> #include <templatecontaineritem.hxx> #include <sfx2/strings.hrc> diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index d077b46a2f33..6c1597bea1ca 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -18,7 +18,6 @@ #include <sfx2/docfac.hxx> #include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> -#include <vcl/help.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/commandevent.hxx> diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 76bd2b9cefd5..c3ebe3bfe903 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -29,7 +29,6 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/pngread.hxx> diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 3e6a083a98ee..fce9d20a8bee 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -27,7 +27,6 @@ #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx> -#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 9185458f62af..e27b8bf7bbba 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -25,7 +25,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> @@ -51,8 +50,6 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <officecfg/Office/Common.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index d0cafa6926e2..c777ebed9c76 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -29,7 +29,6 @@ #include <sfx2/childwin.hxx> #include <sfx2/viewsh.hxx> #include <workwin.hxx> -#include <sfx2/lokhelper.hxx> #include <comphelper/lok.hxx> using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 915f33660e1d..c37c563567e7 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -9,7 +9,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <comphelper/dispatchcommand.hxx> -#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> @@ -22,7 +21,6 @@ #include <sfx2/objface.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> -#include <vcl/decoview.hxx> #include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 22acd6791b25..954db248f417 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -25,12 +25,12 @@ #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/sfxdlg.hxx> +#include <sfx2/viewsh.hxx> #include <unotools/viewoptions.hxx> #include <vcl/virdev.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> #include <comphelper/lok.hxx> -#include <sfx2/lokhelper.hxx> #include <sfx2/strings.hrc> #include <helpids.h> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4247bc272717..c76f06b14bbe 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -25,8 +25,6 @@ #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/event.hxx> -#include <vcl/help.hxx> -#include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weldutils.hxx> @@ -35,8 +33,6 @@ #include <svl/style.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <unotools/intlwrapper.hxx> -#include <unotools/collatorwrapper.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> @@ -63,7 +59,6 @@ #include <sfx2/docfac.hxx> #include <sfx2/module.hxx> #include <helpids.h> -#include <bitmaps.hlst> #include <sfx2/viewfrm.hxx> #include <comphelper/string.hxx> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 256b328e4978..3239fc185f8b 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -33,7 +33,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <tools/datetime.hxx> -#include <svtools/miscopt.hxx> #include <versdlg.hxx> #include <sfx2/strings.hrc> diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 578322556b60..fb0e0eacaa51 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/xml/sax/XFastParser.hpp> #include <com/sun/star/xml/dom/DOMException.hpp> diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index cb1cd95663de..1253eb75e593 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> - #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> #include <objshimp.hxx> diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 911ec9a33303..7165a475e291 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -20,7 +20,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/objitem.hxx> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 0733ccc72752..f94b66df540f 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -85,7 +85,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> #include <sfx2/objsh.hxx> #include <objshimp.hxx> #include <sfx2/event.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index ef9925549149..226321744a26 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> -#include <com/sun/star/security/CertificateValidity.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 7e1048da06b4..7e317cc29ea4 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/frame/DoubleInitializationException.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 09d1c506522c..47c379a3a8f6 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -28,7 +28,6 @@ #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/lang/XUnoTunnel.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/view/DuplexMode.hpp> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index dab70f396006..a14ff68b1a73 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -19,16 +19,10 @@ #include <sfx2/sfxmodelfactory.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> @@ -43,10 +37,7 @@ namespace sfx2 using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Any; - using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::uno::Sequence; - using ::com::sun::star::lang::XSingleServiceFactory; - using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::NamedValue; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::lang::XInitialization; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index dcacebb95446..0bfbe7ba2484 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -14,7 +14,6 @@ #include <templatesearchviewitem.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/propertysequence.hxx> #include <comphelper/string.hxx> #include <comphelper/storagehelper.hxx> #include <sfx2/app.hxx> @@ -30,7 +29,6 @@ #include <sfx2/thumbnailviewitem.hxx> #include <sot/storage.hxx> #include <svtools/imagemgr.hxx> -#include <svtools/langhelp.hxx> #include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/pathoptions.hxx> @@ -41,24 +39,19 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.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/system/SystemShellExecute.hpp> -#include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <comphelper/dispatchcommand.hxx> #include <sfx2/strings.hrc> -#include <bitmaps.hlst> const char TM_SETTING_MANAGER[] = "TemplateManager"; const char TM_SETTING_LASTFOLDER[] = "LastFolder"; @@ -1499,4 +1492,4 @@ IMPL_LINK_NOARG(SfxTemplateSelectionDlg, OkClickHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 33f219e3247e..ad4bd234389a 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <tools/solar.h> #include <svl/itempool.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index cff228473371..c87c37118755 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -18,8 +18,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/lok.hxx> #include <com/sun/star/frame/UnknownModuleException.hpp> -#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> -#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <officecfg/Office/UI/ToolbarMode.hxx> #include <com/sun/star/frame/XModuleManager.hpp> diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 65a50da3ef75..57c8ebe31751 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -19,15 +19,11 @@ #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/document/XEmbeddedScripts.hpp> -#include <com/sun/star/document/XScriptInvocationContext.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/uno/XInterface.hpp> #include <tools/urlobj.hxx> -#include <tools/diagnose_ex.h> #include <svl/macitem.hxx> #include <sfx2/objsh.hxx> #include <sfx2/evntconf.hxx> diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index a362e3d8d5cf..a2953e807e61 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -21,8 +21,6 @@ #include <sfx2/bindings.hxx> -#include <com/sun/star/lang/XComponent.hpp> - using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index c1d5974179a4..4a05db81f000 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -25,7 +25,7 @@ #include <sidebar/PanelTitleBar.hxx> #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Theme.hxx> -#include <sfx2/lokhelper.hxx> +#include <sfx2/viewsh.hxx> #include <vcl/event.hxx> #include <comphelper/lok.hxx> diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index d1ce0ef700e0..79ac22826ea5 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -23,13 +23,7 @@ #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sidebar/ControllerFactory.hxx> -#include <sidebar/Tools.hxx> #include <vcl/event.hxx> -#include <vcl/image.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <tools/diagnose_ex.h> - -#include <com/sun/star/frame/XDispatch.hpp> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 5b8b64fcae24..35fbdf41254d 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -29,11 +29,9 @@ #include <sidebar/Tools.hxx> #include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <sfx2/sidebar/Context.hxx> +#include <sfx2/viewsh.hxx> -#include <sfx2/lokhelper.hxx> -#include <sfx2/sfxresid.hxx> -#include <sfx2/strings.hrc> #include <framework/ContextChangeEventMultiplexerTunnel.hxx> #include <vcl/floatwin.hxx> #include <vcl/fixed.hxx> diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 3c187f117ba4..46b62f51ad93 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -23,10 +23,10 @@ #include <comphelper/dispatchcommand.hxx> #include <comphelper/processfactory.hxx> -#include <sfx2/lokhelper.hxx> #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> diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index b4cd8907d96b..0ac834b1318e 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -23,16 +23,12 @@ #include <sidebar/Tools.hxx> #include <sfx2/sidebar/FocusManager.hxx> #include <sfx2/sidebar/SidebarController.hxx> -#include <sfx2/strings.hrc> - -#include <sfx2/sfxresid.hxx> #include <comphelper/processfactory.hxx> #include <o3tl/safeint.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <tools/svborder.hxx> #include <svtools/acceleratorexecute.hxx> using namespace css; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index bd64a87b7907..140d203a495a 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -25,8 +25,6 @@ #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> -#include <com/sun/star/awt/Rectangle.hpp> - using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index de2ebdd0ae1b..3c6886630439 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -24,7 +24,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/gradient.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 1240100e9daa..88b04852b95d 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -42,10 +42,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> -#include <svtools/framestatuslistener.hxx> #include <comphelper/processfactory.hxx> -#include <vcl/taskpanelist.hxx> -#include <vcl/event.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/InterimItemWindow.hxx> diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index cdfa36ff82ed..24224233b964 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx index d5995e33ba8d..a03816b6052e 100644 --- a/sfx2/source/view/lokcharthelper.cxx +++ b/sfx2/source/view/lokcharthelper.cxx @@ -15,7 +15,6 @@ #include <sfx2/lokhelper.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/fract.hxx> -#include <tools/mapunit.hxx> #include <tools/UnitConversion.hxx> #include <vcl/virdev.hxx> diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 59fd331aa7da..38bd2445e747 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -13,7 +13,6 @@ #include <comphelper/processfactory.hxx> #include <rtl/strbuf.hxx> -#include <rtl/ustrbuf.hxx> #include <vcl/lok.hxx> #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 8beeeab61f17..70894ffc5439 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <officecfg/Office/Common.hxx> #include <officecfg/Setup.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 2da4bc1e81bd..919b736a6b8c 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -54,7 +54,6 @@ #include <framework/actiontriggerhelper.hxx> #include <comphelper/lok.hxx> -#include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -62,7 +61,6 @@ #include <vcl/commandinfoprovider.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <officecfg/Office/Common.hxx> #include <officecfg/Setup.hxx> #include <sfx2/app.hxx> #include <sfx2/flatpak.hxx> diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index e34ad8a9d5ff..cd48f7aaf9bb 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XCurrentContext.hpp> -#include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/weak.hxx> #include <osl/file.hxx> #include <osl/security.hxx> diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx index 3d2041c334d8..47c829dc5f9b 100644 --- a/shell/source/backends/kf5be/kf5backend.cxx +++ b/shell/source/backends/kf5be/kf5backend.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XCurrentContext.hpp> -#include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index 40945f5baccd..1b5f4ecbfe29 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -#include <rtl/string.hxx> namespace uno = css::uno ; namespace lang = css::lang ; diff --git a/slideshow/IwyuFilter_slideshow.yaml b/slideshow/IwyuFilter_slideshow.yaml index 42da88b505e7..850b78285300 100644 --- a/slideshow/IwyuFilter_slideshow.yaml +++ b/slideshow/IwyuFilter_slideshow.yaml @@ -14,6 +14,9 @@ excludelist: - config_lgpl.h # Wrapper for external lib - glm/gtc/type_ptr.hpp + slideshow/source/engine/box2dtools.cxx: + # Macro BOX2D_HEADER is resolved to this + - Box2D/Box2D.h slideshow/source/engine/opengl/Operation.cxx: # Wrapper for external lib - glm/gtc/matrix_transform.hpp @@ -22,6 +25,9 @@ excludelist: # Wrapper for external lib - glm/gtc/matrix_transform.hpp - glm/gtc/type_ptr.hpp + slideshow/source/engine/rehearsetimingsactivity.cxx: + # Needed for template + - com/sun/star/rendering/XCanvas.hpp slideshow/source/engine/smilfunctionparser.cxx: # Boost wrapper is needed - boost/spirit/include/classic_core.hpp diff --git a/slideshow/source/engine/animationnodes/animationphysicsnode.cxx b/slideshow/source/engine/animationnodes/animationphysicsnode.cxx index c750d333322a..6d2e5b756df1 100644 --- a/slideshow/source/engine/animationnodes/animationphysicsnode.cxx +++ b/slideshow/source/engine/animationnodes/animationphysicsnode.cxx @@ -19,7 +19,6 @@ #include "animationphysicsnode.hxx" #include <animationfactory.hxx> -#include <o3tl/any.hxx> constexpr double fDefaultStartVelocityX(0.0); constexpr double fDefaultStartVelocityY(0.0); diff --git a/slideshow/source/engine/animationnodes/animationphysicsnode.hxx b/slideshow/source/engine/animationnodes/animationphysicsnode.hxx index d9af6802a037..78298b23bcad 100644 --- a/slideshow/source/engine/animationnodes/animationphysicsnode.hxx +++ b/slideshow/source/engine/animationnodes/animationphysicsnode.hxx @@ -19,7 +19,6 @@ #pragma once #include "animationbasenode.hxx" -#include <com/sun/star/animations/XAnimateMotion.hpp> #include <com/sun/star/animations/XAnimatePhysics.hpp> namespace slideshow diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx index c822f564a008..8aeb46ac318f 100644 --- a/slideshow/source/engine/box2dtools.cxx +++ b/slideshow/source/engine/box2dtools.cxx @@ -16,11 +16,10 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> -#include <svx/svdogrp.hxx> +#include <svx/svdpage.hxx> #include <svx/unoapi.hxx> diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index a688f479caec..25ac6a41c157 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/animations/AnimationAdditiveMode.hpp> -#include <rtl/math.hxx> - using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 20d9a08b52e7..102dc6aaf3f4 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -23,6 +23,8 @@ #include "viewappletshape.hxx" #include <tools.hxx> +#include <osl/diagnose.h> + #include <algorithm> diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 093502815eaf..b107fe4af038 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <algorithm> diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index 55c302bc683c..64dfd2d0548d 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/drawing/XShape.hpp> +#include <osl/diagnose.h> #include "mediashape.hxx" #include "viewmediashape.hxx" diff --git a/slideshow/source/inc/box2dtools.hxx b/slideshow/source/inc/box2dtools.hxx index 53eaf0b88fad..c7edd00ca27b 100644 --- a/slideshow/source/inc/box2dtools.hxx +++ b/slideshow/source/inc/box2dtools.hxx @@ -12,7 +12,6 @@ #include "shape.hxx" #include "shapeattributelayer.hxx" #include "attributemap.hxx" -#include <map> #include <unordered_map> #include <queue> diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 556ae9334e54..d2ef96abf52c 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -23,6 +23,7 @@ #include "expressionnode.hxx" #include <basegfx/range/b2drectangle.hxx> +#include <rtl/ustring.hxx> #include <memory> diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 801cdf025d69..f4210e477ea2 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <comphelper/random.hxx> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <cppcanvas/color.hxx> diff --git a/starmath/IwyuFilter_starmath.yaml b/starmath/IwyuFilter_starmath.yaml index f8051ab7a379..2855b3bb1f37 100644 --- a/starmath/IwyuFilter_starmath.yaml +++ b/starmath/IwyuFilter_starmath.yaml @@ -4,6 +4,12 @@ excludelist: starmath/inc/smmod.hxx: # Needed for define - sfx2/app.hxx + starmath/qa/extras/mmlexport-test.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx + starmath/qa/cppunit/test_node.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx starmath/source/accessibility.hxx: # Base class needs complete type - com/sun/star/accessibility/XAccessible.hpp @@ -19,6 +25,12 @@ excludelist: starmath/source/accessibility.cxx: # Needed for implicit dtor - editeng/editobj.hxx + 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 @@ -32,3 +44,5 @@ excludelist: starmath/source/unodoc.cxx: # Avoid loplugin:unreffun error - register.hxx + # Needed for template + - com/sun/star/frame/XModel.hpp diff --git a/starmath/inc/AccessibleSmElement.hxx b/starmath/inc/AccessibleSmElement.hxx index 202de6690899..2fb130719acf 100644 --- a/starmath/inc/AccessibleSmElement.hxx +++ b/starmath/inc/AccessibleSmElement.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleStateSet.hpp> #include <com/sun/star/awt/Rectangle.hpp> @@ -29,7 +28,6 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/accessiblecomponenthelper.hxx> #include <sal/types.h> -#include <vcl/vclptr.hxx> class SmElementsControl; diff --git a/starmath/inc/AccessibleSmElementsControl.hxx b/starmath/inc/AccessibleSmElementsControl.hxx index 66cbd80bcef4..7d7e75b6ff4d 100644 --- a/starmath/inc/AccessibleSmElementsControl.hxx +++ b/starmath/inc/AccessibleSmElementsControl.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase3.hxx> -#include <vcl/vclptr.hxx> +#include <rtl/ref.hxx> #include <vector> diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index d7db4772e81c..dde0c3454958 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -33,6 +33,7 @@ #include "error.hxx" class SmBlankNode; +class SmBinVerNode; class SmBracebodyNode; class SmExpressionNode; class SmGlyphSpecialNode; diff --git a/starmath/source/AccessibleSmElement.cxx b/starmath/source/AccessibleSmElement.cxx index 9903ce75df48..b995c23818cc 100644 --- a/starmath/source/AccessibleSmElement.cxx +++ b/starmath/source/AccessibleSmElement.cxx @@ -25,12 +25,9 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star; diff --git a/starmath/source/AccessibleSmElementsControl.cxx b/starmath/source/AccessibleSmElementsControl.cxx index 29701ce81ad9..15b226931a60 100644 --- a/starmath/source/AccessibleSmElementsControl.cxx +++ b/starmath/source/AccessibleSmElementsControl.cxx @@ -22,21 +22,16 @@ #include <ElementsDockingWindow.hxx> #include <smmod.hxx> -#include <comphelper/accessiblewrapper.hxx> -#include <comphelper/processfactory.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <o3tl/safeint.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/vclevent.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 5083d94ff010..f45b42013af1 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -33,9 +33,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/sfxmodelfactory.hxx> #include <svl/stritem.hxx> -#include <svtools/colorcfg.hxx> #include <vcl/event.hxx> -#include <vcl/help.hxx> #include <vcl/settings.hxx> #include <vcl/uitest/eventdescription.hxx> #include <vcl/uitest/logger.hxx> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index a425e20f4b0e..b441b3802cc2 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -32,7 +32,6 @@ #include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> #include <svx/AccessibleTextHelper.hxx> -#include <svtools/colorcfg.hxx> #include <osl/diagnose.h> #include <edit.hxx> diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 9db1a3c4b4ed..085e4ce3e209 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -29,7 +29,6 @@ one go*/ #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/task/XStatusIndicator.hpp> @@ -55,7 +54,6 @@ one go*/ #include <xmloff/DocumentSettingsContext.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/namespacemap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlmetai.hxx> #include <svx/dialmgr.hxx> diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 9b3b3b64288e..9ab23e172d8d 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -19,16 +19,12 @@ #include <node.hxx> -#include <parse.hxx> #include <rect.hxx> #include <symbol.hxx> #include <smmod.hxx> -#include "mathtype.hxx" #include "tmpdevice.hxx" #include <visitors.hxx> -#include <starmathdatabase.hxx> -#include <comphelper/string.hxx> #include <tools/color.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> @@ -36,7 +32,6 @@ #include <vcl/outdev.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <rtl/math.hxx> #include <cassert> #include <cstdlib> diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index e3506c67de77..edb1e738ac59 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -30,7 +30,6 @@ #include <smmod.hxx> #include <cassert> -#include <cstdlib> namespace { diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index aa6280156619..c5dce8352061 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <sfx2/docfile.hxx> #include <unotools/mediadescriptor.hxx> -#include <sal/log.hxx> #include <sot/storage.hxx> #include <tools/diagnose_ex.h> diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index 78dc2183bca6..7ef93bfa0f3c 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -24,7 +24,6 @@ #include <svx/zoomctrl.hxx> #include <svx/zoomsliderctrl.hxx> #include <sfx2/docfac.hxx> -#include <svx/lboxctrl.hxx> #include <sfx2/app.hxx> #include <smdll.hxx> diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index f0a809803a9e..df9e9e589821 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -29,7 +29,6 @@ #include <smmod.hxx> #include "cfgitem.hxx" #include <dialog.hxx> -#include <edit.hxx> #include <view.hxx> #include <smmod.hrc> #include <starmath.hrc> diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx index 074903d3ceb6..8135640cc60c 100644 --- a/starmath/source/tmpdevice.cxx +++ b/starmath/source/tmpdevice.cxx @@ -21,7 +21,6 @@ #include "tmpdevice.hxx" #include <svtools/colorcfg.hxx> -#include <vcl/window.hxx> #include <sal/log.hxx> // SmTmpDevice diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index abd832340d99..27288ffa3469 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -55,7 +55,6 @@ #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/decoview.hxx> -#include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <sal/log.hxx> diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index abae73e2e6f6..3c7e518f758a 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -15,7 +15,6 @@ #include "tmpdevice.hxx" #include <cursor.hxx> #include <cassert> -#include "mathtype.hxx" #include <starmathdatabase.hxx> // SmDefaultingVisitor diff --git a/stoc/IwyuFilter_stoc.yaml b/stoc/IwyuFilter_stoc.yaml index 59588c0005f2..5b046e4da1e4 100644 --- a/stoc/IwyuFilter_stoc.yaml +++ b/stoc/IwyuFilter_stoc.yaml @@ -14,6 +14,9 @@ excludelist: - com/sun/star/java/XJavaThreadRegister_11.hpp - com/sun/star/java/XJavaVM.hpp - com/sun/star/lang/XServiceInfo.hpp + stoc/source/implementationregistration/mergekeys.cxx: + # Actually used + - com/sun/star/registry/XRegistryKey.hpp stoc/source/corereflection/crefl.cxx: # Safer to keep for use in cppu::UnoType template - com/sun/star/reflection/XTypeDescription.hpp @@ -25,6 +28,8 @@ excludelist: stoc/source/invocation_adapterfactory/iafactory.cxx: # Safer to keep for use in cppu::UnoType template - com/sun/star/script/XInvocation.hpp + # Complete type needed for uno_Interface + - uno/dispatcher.h stoc/source/loader/dllcomponentloader.cxx: # Needed for direct member access - com/sun/star/lang/XMultiServiceFactory.hpp @@ -34,6 +39,8 @@ excludelist: # Needed for __DIAGNOSE mode - vector - rtl/string.hxx + # Actually used + - com/sun/star/uno/Sequence.hxx stoc/source/security/access_controller.cxx: # Needed for __DIAGNOSE mode - rtl/ustrbuf.hxx diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 126af1f82851..7efacb98fb92 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <unordered_map> -#include <unordered_set> #include <vector> using namespace ::std; diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 73b0ddf557ff..524988146b4b 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -38,7 +38,6 @@ #include <jni.h> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index bbc962c17466..1b7a86e712ec 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/java/JavaVMCreationFailureException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> @@ -50,9 +49,6 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/SetFlagContextHelper.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <jvmaccess/classpath.hxx> #include <jvmaccess/unovirtualmachine.hxx> @@ -60,7 +56,6 @@ #include <rtl/process.h> #include <rtl/ustring.hxx> #include <sal/types.h> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <uno/current_context.hxx> #include <jvmfwk/framework.hxx> diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 29142064d537..a71b3644f9e4 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -21,7 +21,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/uno/XNamingService.hpp> diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 628bdb877b23..3ed0e7c802a7 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -22,7 +22,6 @@ #include <o3tl/any.hxx> #include <osl/mutex.hxx> #include <osl/diagnose.h> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx index 9120c909839c..95d3a03be1d1 100644 --- a/svgio/inc/svgnode.hxx +++ b/svgio/inc/svgnode.hxx @@ -23,7 +23,7 @@ #include "svgtools.hxx" #include "svgtoken.hxx" #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <memory> #include <vector> #include <optional> diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx index 62e39adb943b..1b3fcded0102 100644 --- a/svgio/inc/svgstyleattributes.hxx +++ b/svgio/inc/svgstyleattributes.hxx @@ -24,7 +24,7 @@ #include "svgnode.hxx" #include <tools/fontenum.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> // predefines diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx index 03eba690829c..56c06644184b 100644 --- a/svgio/source/svgreader/svggnode.cxx +++ b/svgio/source/svgreader/svggnode.cxx @@ -18,6 +18,7 @@ */ #include <svggnode.hxx> +#include <osl/diagnose.h> namespace svgio::svgreader { diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx index 995fa2919fd5..dfb6fdd23142 100644 --- a/svgio/source/svgreader/svgstylenode.cxx +++ b/svgio/source/svgreader/svgstylenode.cxx @@ -19,6 +19,7 @@ #include <svgstylenode.hxx> #include <svgdocument.hxx> +#include <osl/diagnose.h> namespace svgio::svgreader { diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx index 5498ee0f525b..202c7ef83371 100644 --- a/svgio/source/svgreader/svgtextnode.cxx +++ b/svgio/source/svgreader/svgtextnode.cxx @@ -23,6 +23,7 @@ #include <svgtrefnode.hxx> #include <svgtextpathnode.hxx> #include <svgtspannode.hxx> +#include <osl/diagnose.h> namespace svgio::svgreader { diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx index dbceb2b54134..9ff26e1a7e95 100644 --- a/svgio/source/svgreader/svgtitledescnode.cxx +++ b/svgio/source/svgreader/svgtitledescnode.cxx @@ -18,6 +18,7 @@ */ #include <svgtitledescnode.hxx> +#include <osl/diagnose.h> namespace svgio::svgreader diff --git a/svgio/source/svgreader/svgvisitor.cxx b/svgio/source/svgreader/svgvisitor.cxx index 48fc9aa71af4..203a9df7a020 100644 --- a/svgio/source/svgreader/svgvisitor.cxx +++ b/svgio/source/svgreader/svgvisitor.cxx @@ -12,7 +12,6 @@ #include <svgrectnode.hxx> #include <svgsvgnode.hxx> -#include <svggnode.hxx> #include <svgpathnode.hxx> #include <svggradientnode.hxx> diff --git a/svl/IwyuFilter_svl.yaml b/svl/IwyuFilter_svl.yaml index c2048dcc4c1b..e942fcb6de60 100644 --- a/svl/IwyuFilter_svl.yaml +++ b/svl/IwyuFilter_svl.yaml @@ -23,6 +23,15 @@ excludelist: - com/sun/star/task/XPasswordContainer2.hpp - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XEventListener.hpp + svl/qa/unit/items/stylepool.cxx: + # Needed for system-cppunit + - unotest/bootstrapfixturebase.hxx + svl/qa/unit/lockfiles/test_lockfiles.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx + svl/qa/unit/test_lngmisc.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx svl/source/crypto/cryptosign.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index b444251b272f..564f11c88f33 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -21,7 +21,6 @@ #include "itemholder2.hxx" #include <osl/diagnose.h> -#include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index 64f0fe4b59e0..ac2f6a0ee24b 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -23,7 +23,6 @@ #include <comphelper/random.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <filter/msfilter/mscodec.hxx> #include <o3tl/char16_t2wchar_t.hxx> #if HAVE_FEATURE_NSS && !defined(_WIN32) @@ -50,7 +49,6 @@ #if HAVE_FEATURE_NSS -#include <com/sun/star/xml/crypto/XDigestContext.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/NSSInitializer.hpp> #include <mutex> diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 98ec1feb8c65..91fe8d35f983 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -19,7 +19,6 @@ #include <fsfactory.hxx> -#include <cppuhelper/factory.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/io/IOException.hpp> #include <comphelper/processfactory.hxx> diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index f9dc14472ae0..65af28e13d71 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/ucb/IOErrorCode.hpp> #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XTruncate.hpp> diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index 5bec28898588..dd053f6d636f 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 7c85153b63a8..9f169c5bd032 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -20,9 +20,6 @@ #include <rtl/ustring.hxx> #include <svl/aeitem.hxx> -#include <climits> -#include <cstddef> - SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which): SfxPoolItem(which) { diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 072de0501f40..e3850c8bf5a1 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -24,7 +24,7 @@ #include <tools/bigint.hxx> #include <svl/metitem.hxx> #include <libxml/xmlwriter.h> -#include <boost/property_tree/json_parser.hpp> +#include <boost/property_tree/ptree.hpp> diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 6deec84947c0..44c0cf534b5d 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -22,7 +22,6 @@ #include <string.h> #include <libxml/xmlwriter.h> -#include <tools/solar.h> #include <osl/diagnose.h> #include <sal/log.hxx> #include <svl/SfxBroadcaster.hxx> @@ -30,7 +29,6 @@ #include <svl/itemset.hxx> #include <poolio.hxx> -#include <algorithm> #include <cassert> #include <vector> diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 313c431e9866..14613824eae4 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -22,7 +22,6 @@ #include <sal/log.hxx> #include <svl/itempool.hxx> -#include <algorithm> #include <memory> /// clear array of PoolItem variants diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index a115605f5c78..6cd15433e8b3 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -23,7 +23,7 @@ #include <osl/diagnose.h> #include <libxml/xmlwriter.h> #include <typeinfo> -#include <boost/property_tree/json_parser.hpp> +#include <boost/property_tree/ptree.hpp> ////////////////////////////////////////////////////////////////////////////// // list of classes derived from SfxPoolItem diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 2d7eaf3c222f..617b42e41cdc 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -35,8 +35,6 @@ #include <comphelper/servicehelper.hxx> #include <rtl/ustrbuf.hxx> -#include <string.h> - #ifdef DBG_UTIL namespace { diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 7a037a1b87db..40a59960a0d3 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -27,7 +27,6 @@ #include <cassert> #include <vector> #include <memory> -#include <map> // copy ctor of class SfxListener diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index dfdbc0e7be1e..472cf156ddf9 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> +#include <svl/zforlist.hxx> #include <memory> class Date; diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 64875df1bfda..5edbf931b927 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -27,7 +27,6 @@ #include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/NumberFormatCode.hpp> #include <com/sun/star/i18n/NumberFormatMapper.hpp> -#include <com/sun/star/i18n/XNumberFormatCode.hpp> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index dc7c35aea307..95f5a0b9296f 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -23,8 +23,10 @@ #include <rtl/ustring.hxx> #include <svl/nfkeytab.hxx> #include <svl/nfsymbol.hxx> +#include <svl/zforlist.hxx> #include <tools/color.hxx> #include <tools/date.hxx> +#include <unotools/localedatawrapper.hxx> class SvNumberFormatter; struct ImpSvNumberformatInfo; diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 893c7eb96ef8..bf38dce64904 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/task/MasterPasswordRequest.hpp> #include <com/sun/star/task/NoMasterException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/diagnose.h> #include <rtl/character.hxx> diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx index 937a2be66975..0a15bf989328 100644 --- a/svl/source/passwordcontainer/passwordcontainer.hxx +++ b/svl/source/passwordcontainer/passwordcontainer.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/task/XPasswordContainer2.hpp> #include <com/sun/star/task/PasswordRequestMode.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 3db663d844b8..156d4f0857a2 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -20,7 +20,6 @@ #include "syscreds.hxx" #include <osl/diagnose.h> #include <comphelper/sequence.hxx> -#include <iterator> using namespace com::sun::star; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 2ce8fa84bf17..8d27145af335 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -19,8 +19,6 @@ #include <svl/undo.hxx> -#include <com/sun/star/uno/Exception.hpp> - #include <osl/mutex.hxx> #include <sal/log.hxx> #include <comphelper/flagguard.hxx> diff --git a/svtools/IwyuFilter_svtools.yaml b/svtools/IwyuFilter_svtools.yaml index 7f2a6f35cbf5..19ad784bc3ef 100644 --- a/svtools/IwyuFilter_svtools.yaml +++ b/svtools/IwyuFilter_svtools.yaml @@ -14,3 +14,9 @@ excludelist: svtools/qa/unit/testHtmlReader.cxx: # Needed for the CPPUNIT_TEST_FIXTURE() macro. - unotest/bootstrapfixturebase.hxx + svtools/qa/unit/testHtmlWriter.cxx: + # Needed for --with-system-cppunit + - unotest/bootstrapfixturebase.hxx + svtools/source/uno/statusbarcontroller.cxx: + # Needed for template + - com/sun/star/ui/XStatusbarItem.hpp diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 0514d0238e5a..ecb6ea52c8d9 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -19,7 +19,6 @@ #pragma once -#include <svtools/svtdllapi.h> #include <table/tablemodel.hxx> #include <vcl/accessibletable.hxx> diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx b/svtools/qa/unit/svtools-dialogs-test.cxx index 2dc921a7bb8e..85537fc42572 100644 --- a/svtools/qa/unit/svtools-dialogs-test.cxx +++ b/svtools/qa/unit/svtools-dialogs-test.cxx @@ -10,9 +10,6 @@ #include <sal/config.h> #include <test/screenshot_test.hxx> #include <vcl/abstdlg.hxx> -#include <vcl/scheduler.hxx> -#include <vcl/wrkwin.hxx> -#include <svtools/valueset.hxx> using namespace ::com::sun::star; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index f1b42d910075..822ba21f7c00 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -19,15 +19,16 @@ #include <svtools/brwbox.hxx> #include <svtools/brwhead.hxx> -#include <svtools/recorditemwindow.hxx> #include <o3tl/numeric.hxx> #include <o3tl/safeint.hxx> #include "datwin.hxx" #include <tools/debug.hxx> #include <tools/fract.hxx> #include <sal/log.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <algorithm> #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp> diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index d2e9f4e04237..c7a83818c7a0 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -22,7 +22,7 @@ #include <osl/diagnose.h> #include <tools/debug.hxx> #include <svtools/brwbox.hxx> -#include <svtools/recorditemwindow.hxx> +#include <svtools/brwhead.hxx> #include "datwin.hxx" #include <svtools/colorcfg.hxx> #include <vcl/commandevent.hxx> diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index dec389c8769c..a8a20fae8918 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -19,6 +19,7 @@ #include "datwin.hxx" #include <o3tl/numeric.hxx> +#include <svtools/brwhead.hxx> #include <vcl/commandevent.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index b01e63fbbc7d..8ff37a137324 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -20,14 +20,10 @@ #pragma once #include <svtools/brwbox.hxx> -#include <svtools/brwhead.hxx> #include <tools/long.hxx> #include <vcl/scrbar.hxx> -#include <vcl/timer.hxx> -#include <vcl/transfer.hxx> #include <limits> -#include <vector> #define MIN_COLUMNWIDTH 2 diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 6557552fc7d5..5e22c9ba33c1 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -18,7 +18,6 @@ #include <svtools/editbrowsebox.hxx> #include <vcl/svapp.hxx> -#include <vcl/virdev.hxx> namespace svt { diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 31a7b28e7978..49ebadb062c1 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -23,7 +23,6 @@ #include <sal/log.hxx> #include <tools/debug.hxx> #include <vcl/timer.hxx> -#include <vcl/idle.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 4a0210cde5bd..2f7c3eb4dfdd 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -33,9 +33,7 @@ #include <rtl/math.hxx> #include <sal/macros.h> #include <sal/log.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <unotools/charclass.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> @@ -54,8 +52,6 @@ #include <rtl/bootstrap.hxx> -#include <boost/property_tree/ptree.hpp> - #include <borderline.hrc> #include <stdio.h> diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 006bc2981af9..907ddb32abbb 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -44,8 +44,6 @@ #include <tools/debug.hxx> #include <osl/file.hxx> #include <osl/mutex.hxx> -#include <vcl/event.hxx> -#include <vcl/svapp.hxx> #include <unotools/historyoptions.hxx> #include <unotools/pathoptions.hxx> #include <ucbhelper/commandenvironment.hxx> diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b376490fa4fd..0181b2627f2d 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -22,13 +22,9 @@ #include <osl/diagnose.h> #include <vcl/taskpanelist.hxx> -#include <vcl/settings.hxx> -#include <vcl/commandevent.hxx> -#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <svtools/framestatuslistener.hxx> -#include <svtools/valueset.hxx> #include <svtools/toolbarmenu.hxx> using namespace ::com::sun::star::uno; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index c43e8d070127..0973f9ff5a15 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -29,9 +29,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <unotools/accessiblerelationsethelper.hxx> using namespace ::com::sun::star; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c9a94de237a1..ce6bbaacba2a 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -21,16 +21,11 @@ #include <o3tl/safeint.hxx> #include <tools/debug.hxx> -#include <tools/stream.hxx> #include <comphelper/base64.hxx> #include <vcl/decoview.hxx> #include <vcl/event.hxx> -#include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#include <vcl/cvtgrf.hxx> -#include <vcl/help.hxx> #include <vcl/settings.hxx> -#include <vcl/commandevent.hxx> #include <vcl/virdev.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> @@ -40,7 +35,6 @@ #include "valueimp.hxx" #include <svtools/valueset.hxx> -#include <boost/property_tree/ptree.hpp> #include <uiobject.hxx> #include <vcl/uitest/logger.hxx> diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 339704dc6fc2..8a3b481b50f3 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -7,11 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/PasswordContainer.hpp> #include <com/sun/star/task/XPasswordContainer2.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -29,7 +27,6 @@ #include "ServerDetailsControls.hxx" using namespace std; -using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; using namespace com::sun::star::task; using namespace com::sun::star::ucb; diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 8bd6cbd38cee..fbfdc1b61609 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -19,10 +19,6 @@ #pragma once -#include <toolkit/awt/vclxwindow.hxx> -#include <toolkit/awt/vclxwindows.hxx> -#include <toolkit/helper/listenermultiplexer.hxx> - namespace com::sun::star::util { class XNumberFormatsSupplier; diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 0a36c491f556..5ff9e5fa8aae 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -35,8 +35,6 @@ #include <vcl/evntpost.hxx> #include <sal/log.hxx> #include <vcl/lok.hxx> -#include <vcl/window.hxx> -#include <vcl/svapp.hxx> #include <osl/mutex.hxx> namespace svt diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 6a0af5a84552..d8aa5bc81afc 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -18,7 +18,6 @@ */ #include <sal/config.h> -#include <sal/log.hxx> #include <osl/file.hxx> #include <svtools/templatefoldercache.hxx> diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 66986be60430..1f86c6ce0f0e 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -22,9 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> -#include <vcl/weldutils.hxx> -#include <svtools/framestatuslistener.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/toolbarmenu.hxx> diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index e4711daf33d2..f069cad74cc9 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -23,6 +23,7 @@ #include <table/defaultinputhandler.hxx> #include <table/gridtablerenderer.hxx> +#include <com/sun/star/awt/grid/XSortableGridData.hpp> #include <com/sun/star/util/Color.hpp> #include <o3tl/safeint.hxx> #include <sal/log.hxx> diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index 76f8d80c176d..4a69357626ae 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -28,12 +28,9 @@ #include <com/sun/star/awt/grid/XGridDataModel.hpp> #include <com/sun/star/awt/grid/XGridColumn.hpp> #include <com/sun/star/awt/grid/XGridColumn.hpp> -#include <com/sun/star/awt/grid/XSortableGridData.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <cppuhelper/weakref.hxx> -#include <memory> - namespace svt::table { diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index ddc87539c66a..b92c4afafdae 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -21,7 +21,6 @@ #include "wizardshell.hxx" #include <com/sun/star/container/NoSuchElementException.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/AlreadyInitializedException.hpp> diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 2790a0e57c73..69b864fbf049 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -21,8 +21,6 @@ #include "wizardpagecontroller.hxx" #include "wizardshell.hxx" -#include <com/sun/star/awt/XControl.hpp> - #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 21e3130e477b..a563ab9547a7 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -20,7 +20,6 @@ #pragma once #include <com/sun/star/ui/dialogs/XWizardController.hpp> -#include <com/sun/star/ui/dialogs/XWizard.hpp> #include <vcl/roadmapwizard.hxx> #include <map> #include <memory> |