diff options
23 files changed, 21 insertions, 46 deletions
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index fba247ffab1c..71bcb6c9e816 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/logging/LogLevel.hpp> #include <tools/diagnose_ex.h> -#include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> diff --git a/cui/IwyuFilter_cui.yaml b/cui/IwyuFilter_cui.yaml index b59411ef7340..c2f63e05282c 100644 --- a/cui/IwyuFilter_cui.yaml +++ b/cui/IwyuFilter_cui.yaml @@ -21,3 +21,6 @@ excludelist: # Actually used - com/sun/star/linguistic2/XMeaning.hpp - com/sun/star/linguistic2/XThesaurus.hpp + cui/source/customize/cfg.cxx: + # Actually used + - com/sun/star/ui/dialogs/XFilePicker3.hpp diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index ffe288506508..033219f4d9a0 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -19,13 +19,11 @@ #include <SvxConfigPageHelper.hxx> -#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <comphelper/random.hxx> -#include <comphelper/processfactory.hxx> #include <svtools/imgdef.hxx> #include <svtools/miscopt.hxx> diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index a811264d2ca0..d3fed61015a2 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -33,7 +33,6 @@ #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/ui/ImageType.hpp> #include <dlgname.hxx> diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index aa4101ed1657..58b4aa0c15ed 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -41,7 +41,6 @@ #include <unotools/configmgr.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/theUICommandDescription.hpp> -#include <com/sun/star/ui/ImageType.hpp> namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 7b929d2ad70e..740fa426feb0 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -39,7 +39,6 @@ #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/ui/ImageType.hpp> #include <dlgname.hxx> diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index 80e8f9815053..58a4fd317065 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -17,31 +17,20 @@ #include <comphelper/graphicmimetype.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/xmlsechelper.hxx> -#include <comphelper/storagehelper.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> #include <sfx2/objsh.hxx> #include <svx/xoutbmp.hxx> -#include <tools/date.hxx> -#include <tools/stream.hxx> -#include <unotools/localedatawrapper.hxx> -#include <unotools/streamwrap.hxx> -#include <unotools/syslocale.hxx> #include <utility> #include <vcl/graph.hxx> #include <vcl/weld.hxx> #include <svx/signaturelinehelper.hxx> +#include <tools/urlobj.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/security/CertificateKind.hpp> -#include <com/sun/star/security/DocumentDigitalSignatures.hpp> #include <com/sun/star/security/XCertificate.hpp> -#include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/ui/dialogs/FilePicker.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx index 7f6caabc49d9..224dcdecd4bb 100644 --- a/cui/source/dialogs/SignatureLineDialog.cxx +++ b/cui/source/dialogs/SignatureLineDialog.cxx @@ -9,10 +9,7 @@ #include <SignatureLineDialog.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/xmltools.hxx> -#include <tools/stream.hxx> -#include <unotools/streamwrap.hxx> #include <utility> #include <vcl/weld.hxx> #include <svx/signaturelinehelper.hxx> @@ -20,12 +17,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheetView.hpp> @@ -40,7 +33,6 @@ using namespace css::uno; using namespace css::beans; using namespace css::container; using namespace css::frame; -using namespace css::io; using namespace css::lang; using namespace css::frame; using namespace css::sheet; diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index ae7a75859c79..b82065868f09 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -10,12 +10,10 @@ #include <officecfg/Office/Common.hxx> #include <osl/file.hxx> #include <osl/security.hxx> -#include <osl/thread.h> #include <tools/diagnose_ex.h> #include "certpath.hxx" #include <com/sun/star/xml/crypto/NSSInitializer.hpp> -#include <com/sun/star/mozilla/MozillaBootstrap.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <comphelper/processfactory.hxx> diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 35d9b1a2299d..46b8268eb350 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -43,7 +43,6 @@ #include <rtl/ustring.hxx> #include <osl/file.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 6454c238fabc..7c2738dfbff8 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -21,7 +21,6 @@ #include <sal/log.hxx> #include <memory> -#include <vector> #include <config_java.h> diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index a732053bab7f..ac2def078f5c 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -22,8 +22,6 @@ #include <vcl/graphicfilter.hxx> #include <vcl/virdev.hxx> -#include <vector> - using namespace com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 8313d6d5cffc..b6fe01b08347 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -18,7 +18,6 @@ */ #include <algorithm> -#include <cassert> #include <optional> diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index dbc4c2ddd4c2..be9c2e28b254 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -116,3 +116,6 @@ excludelist: svx/source/unodraw/unoprov.cxx: # Needed for UnoType instantiation - com/sun/star/lang/Locale.hpp + svx/qa/unit/xoutdev.cxx: + # Needed for system-cppunit + - unotest/bootstrapfixturebase.hxx diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index fed83a0b39c3..ec23d4163ced 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -761,3 +761,15 @@ excludelist: - com/sun/star/frame/XModel.hpp sw/source/uibase/uno/dlelstnr.cxx: - com/sun/star/linguistic2/XProofreadingIterator.hpp + sw/qa/extras/ooxmlimport/ooxmlimport.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx + sw/qa/extras/ooxmlexport/ooxmlexport.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx + sw/qa/extras/ooxmlexport/ooxmlexport5.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx + sw/qa/extras/uiwriter/uiwriter.cxx: + # Required in C++20 mode. + - o3tl/cppunittraitshelper.hxx diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index c6136e807bc9..36df600df185 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -15,8 +15,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/frame/XDispatchHelper.hpp> -#include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> @@ -36,7 +34,6 @@ #include <svtools/rtftoken.h> #include <filter/msfilter/rtfutil.hxx> #include <sot/storage.hxx> -#include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <unotools/mediadescriptor.hxx> #include <svtools/htmlcfg.hxx> diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 8891ef5efcdf..955d830fcb1b 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -40,7 +40,6 @@ #include <vcl/scheduler.hxx> #include <vcl/vclevent.hxx> #include <vcl/bitmapaccess.hxx> -#include <svx/svxids.hrc> #include <vcl/ITiledRenderable.hxx> #include <tools/json_writer.hxx> #include <unotools/mediadescriptor.hxx> diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 781ba3b3de8c..0c07afb71521 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -10,8 +10,8 @@ #include <memory> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/i18n/TextConversionOption.hpp> -#include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/style/CaseMap.hpp> #include <vcl/errcode.hxx> #include <tools/gen.hxx> @@ -49,7 +49,6 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include <svx/xfillit0.hxx> #include <svl/itemiter.hxx> #include <svx/svxids.hrc> #include <unotools/localfilehelper.hxx> diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx index 15e20fc4d8f9..f3684b08cc39 100644 --- a/sw/qa/uibase/shells/shells.cxx +++ b/sw/qa/uibase/shells/shells.cxx @@ -29,7 +29,6 @@ #include <wrtsh.hxx> #include <IDocumentDrawModelAccess.hxx> #include <drawdoc.hxx> -#include <unotxdoc.hxx> #include <docsh.hxx> char const DATA_DIRECTORY[] = "/sw/qa/uibase/shells/data/"; diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx index bbb018bfcc72..3af99a1fb9e6 100644 --- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx +++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx @@ -26,7 +26,6 @@ #include <unoprnms.hxx> #include <editeng/unoprnms.hxx> #include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> @@ -36,7 +35,7 @@ #include <unotextrange.hxx> #include <comphelper/string.hxx> #include <comphelper/processfactory.hxx> -#include <unotools/intlwrapper.hxx> +#include <i18nlangtag/languagetag.hxx> #include <vcl/settings.hxx> #include <inspectorproperties.hrc> diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx index 9e1aec16b803..3d1873d02e83 100644 --- a/xmloff/qa/unit/text.cxx +++ b/xmloff/qa/unit/text.cxx @@ -11,7 +11,6 @@ #include <unotest/macros_test.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/container/XNameContainer.hpp> using namespace ::com::sun::star; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 26ef683e0650..75146f63839f 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -75,7 +75,6 @@ #include <com/sun/star/presentation/AnimationSpeed.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/text/XText.hpp> diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index a62dbd096aa0..774dd5e82721 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -12,8 +12,6 @@ #include <sal/config.h> -#include <cstdlib> - #include <test/bootstrapfixture.hxx> #include <unotest/macros_test.hxx> #include <test/xmltesttools.hxx> |