svx/IwyuFilter_svx.yaml | 33 +++++++++- svx/inc/formnavi.hrc | 2 svx/inc/frmsel.hrc | 1 svx/inc/galbrws2.hxx | 2 svx/inc/galobj.hxx | 1 svx/inc/sdr/contact/viewcontactofpageobj.hxx | 1 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx | 2 svx/inc/spacing.hrc | 2 svx/inc/svxerr.hrc | 2 svx/qa/unit/gallery/test_gallery.cxx | 1 svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 svx/source/customshapes/EnhancedCustomShape3d.cxx | 1 svx/source/dialog/ClassificationEditView.hxx | 3 svx/source/dialog/dlgctrl.cxx | 2 svx/source/dialog/srchdlg.cxx | 1 svx/source/engine3d/view3d1.cxx | 2 svx/source/fmcomp/gridcell.cxx | 1 svx/source/fmcomp/gridctrl.cxx | 1 svx/source/form/datanavi.cxx | 1 svx/source/form/fmscriptingenv.cxx | 7 -- svx/source/form/fmshimp.cxx | 1 svx/source/form/tbxform.cxx | 1 svx/source/gallery2/galbrws1.cxx | 4 - svx/source/gallery2/galbrws1.hxx | 1 svx/source/gallery2/gallery1.cxx | 1 svx/source/gallery2/gallerybinaryengine.cxx | 1 svx/source/gallery2/gallerybinaryengineentry.cxx | 7 -- svx/source/gallery2/galleryobjectcollection.cxx | 1 svx/source/gallery2/galmisc.cxx | 1 svx/source/gallery2/galtheme.cxx | 15 ---- svx/source/inc/StylesPreviewToolBoxControl.hxx | 5 - svx/source/inc/datalistener.hxx | 1 svx/source/inc/filtnav.hxx | 1 svx/source/inc/findtextfield.hxx | 2 svx/source/inc/fmexch.hxx | 1 svx/source/inc/fmexpl.hxx | 1 svx/source/inc/svdpdf.hxx | 1 svx/source/items/e3ditem.cxx | 1 svx/source/sdr/primitive2d/sdrattributecreator.cxx | 2 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 2 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 1 svx/source/sdr/properties/customshapeproperties.cxx | 2 svx/source/sidebar/effect/EffectPropertyPanel.cxx | 2 svx/source/sidebar/inspector/InspectorTextPanel.cxx | 1 svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2 svx/source/sidebar/text/TextPropertyPanel.cxx | 2 svx/source/svdraw/svdattr.cxx | 5 - svx/source/svdraw/svdedtv2.cxx | 2 svx/source/svdraw/svdotextdecomposition.cxx | 1 svx/source/svdraw/svdpdf.cxx | 1 svx/source/tbxctrls/StylesPreviewWindow.cxx | 4 - svx/source/tbxctrls/colrctrl.cxx | 1 svx/source/tbxctrls/fillctrl.cxx | 1 svx/source/tbxctrls/lboxctrl.cxx | 1 svx/source/tbxctrls/linemetricbox.hxx | 2 svx/source/tbxctrls/linewidthctrl.cxx | 1 svx/source/tbxctrls/tbcontrl.cxx | 1 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 1 svx/source/unodraw/unopage.cxx | 1 svx/source/unodraw/unoprov.cxx | 3 svx/source/unogallery/unogalitem.cxx | 1 svx/source/xml/xmlexport.cxx | 2 svx/source/xml/xmlxtimp.cxx | 1 63 files changed, 47 insertions(+), 110 deletions(-)
New commits: commit cdda62d60845f1f1a18b461df198e4dbfbc590ef Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Aug 11 20:24:32 2020 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Nov 25 11:45:05 2020 +0100 tdf#42949 Fix new IWYU warnings in directory svx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: If578c5119b85f991825e91df37c42e28f16e9de5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100555 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index 48e1b7b56cb2..ba5a19a5c118 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -1,19 +1,26 @@ --- assumeFilename: svx/source/svdraw/svdobj.cxx excludelist: - svx/source/svdraw/svdpdf.hxx: - # Needed on WIN32 + svx/source/inc/svdpdf.hxx: + # Needed for SdrPdfImportTest in sd to compile on WIN - prewin.h - postwin.h + - fpdfview.h svx/source/accessibility/ChildrenManagerImpl.cxx: # Actually used - com/sun/star/beans/XPropertySet.hpp + svx/source/accessibility/DescriptionGenerator.cxx: + # Actually used + - com/sun/star/drawing/XShape.hpp svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx: # Boost wrapper is needed - boost/spirit/include/classic_core.hpp svx/source/dialog/ClassificationCommon.cxx: # Actually used - com/sun/star/beans/XPropertyContainer.hpp + svx/source/dialog/svxruler.cxx: + # Needed for rtl::math::round + - rtl/math.hxx svx/source/dialog/srchdlg.cxx: # Actually used - comphelper/scopeguard.hxx @@ -24,13 +31,22 @@ excludelist: # Actually used - com/sun/star/sdbc/XConnection.hpp - com/sun/star/beans/XPropertySet.hpp + svx/source/gallery2/gallerybinaryengine.cxx: + # Don't propose hxx -> h change in URE libs + - osl/thread.hxx svx/source/gallery2/galtheme.cxx: # Don't propose hxx -> h change in URE libs - osl/thread.hxx + svx/source/gallery2/galobj.cxx: + # Actually used + - com/sun/star/frame/XModel.hpp svx/source/items/galleryitem.cxx: # Actually used - com/sun/star/graphic/XGraphic.hpp - com/sun/star/lang/XComponent.hpp + svx/source/form/formcontrolfactory.cxx: + # Actually used + - com/sun/star/sdbc/XDataSource.hpp svx/source/form/dataaccessdescriptor.cxx: # Actually used - com/sun/star/beans/XPropertySet.hpp @@ -101,9 +117,15 @@ excludelist: svx/source/svdraw/svdorect.cxx: # Actually used - svx/svdopath.hxx + svx/source/svdraw/svdpagv.cxx: + # Actually used + - comphelper/scopeguard.hxx svx/source/table/accessiblecell.cxx: # Needed for SvxTextEditSource object instantiation - svx/svdotext.hxx + svx/source/table/accessibletableshape.cxx: + # Actually used + - com/sun/star/drawing/XShape.hpp svx/source/unodraw/recoveryui.cxx: # Needed for LIBO_ETC_FOLDER on WIN32 - config_folders.h @@ -122,3 +144,10 @@ excludelist: svx/qa/unit/XTableImportExportTest.cxx: # Needed for --with-system-cppunit - unotest/bootstrapfixturebase.hxx + svx/sdi/svxslots.hrc: + # Needed for building svx/sdi/svx.sdi + - sfx2/sfxsids.hrc + - editeng/memberids.h + - editeng/editids.hrc + - svx/svxids.hrc + - svx/unomid.hxx diff --git a/svx/inc/formnavi.hrc b/svx/inc/formnavi.hrc index 78271e2f05c4..f105cca63292 100644 --- a/svx/inc/formnavi.hrc +++ b/svx/inc/formnavi.hrc @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_INC_FRMSEL_HRC #define INCLUDED_SVX_INC_FRMSEL_HRC -#include <utility> - #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) const char* RID_SVXSW_CONVERTMENU[] = diff --git a/svx/inc/frmsel.hrc b/svx/inc/frmsel.hrc index da3c258b293c..893d84de2faa 100644 --- a/svx/inc/frmsel.hrc +++ b/svx/inc/frmsel.hrc @@ -21,6 +21,7 @@ #define INCLUDED_SVX_INC_FRMSEL_HRC #include <utility> +#include <sal/types.h> #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 0ee663835a74..d26044056c7d 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -23,9 +23,9 @@ #include <vcl/transfer.hxx> #include <svl/lstner.hxx> #include <svx/galctrl.hxx> -#include <svtools/miscopt.hxx> #include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 1c2b013bf6f9..29c053baa114 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -25,7 +25,6 @@ #include <vcl/graph.hxx> #include <vcl/gdimtf.hxx> #include <svx/galmisc.hxx> -#include <svx/gallerybinaryengine.hxx> #define S_THUMB 80 diff --git a/svx/inc/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/sdr/contact/viewcontactofpageobj.hxx index f7ca5a7efd63..b32fd7cae7f9 100644 --- a/svx/inc/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofpageobj.hxx @@ -20,7 +20,6 @@ #pragma once #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -#include <svx/svxdllapi.h> #include <svx/svdopage.hxx> class SdrPage; diff --git a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx index 02d77f656263..202354332b55 100644 --- a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx @@ -20,8 +20,8 @@ #pragma once #include <basegfx/matrix/b2dhommatrix.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/sdrglowattribute.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <svx/svxdllapi.h> diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc index b8ca2661c528..8c9ba6da29a2 100644 --- a/svx/inc/spacing.hrc +++ b/svx/inc/spacing.hrc @@ -9,8 +9,6 @@ #ifndef INCLUDED_SVX_INC_SPACING_HRC #define INCLUDED_SVX_INC_SPACING_HRC -#include <utility> - #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) struct measurement diff --git a/svx/inc/svxerr.hrc b/svx/inc/svxerr.hrc index 79409d118b41..9691386c94e7 100644 --- a/svx/inc/svxerr.hrc +++ b/svx/inc/svxerr.hrc @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_INC_SVXERR_HRC #define INCLUDED_SVX_INC_SVXERR_HRC -#include <utility> - #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) #include <svx/svxerr.hxx> diff --git a/svx/qa/unit/gallery/test_gallery.cxx b/svx/qa/unit/gallery/test_gallery.cxx index d9ae9150ceb1..96bcc16fdc07 100644 --- a/svx/qa/unit/gallery/test_gallery.cxx +++ b/svx/qa/unit/gallery/test_gallery.cxx @@ -20,7 +20,6 @@ #include <galobj.hxx> #include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index a509520ba08c..bf4832585c54 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -29,7 +29,6 @@ #include <svx/svdorect.hxx> #include <svx/svdpage.hxx> #include <svx/xflclit.hxx> -#include <rtl/math.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> #include <svx/xlnstit.hxx> @@ -59,7 +58,6 @@ #include <algorithm> #include <cstdlib> -#include <math.h> #include <unordered_set> using namespace ::com::sun::star; diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 893984f3d90e..f83be9f8e817 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -24,7 +24,6 @@ #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> -#include <svl/poolitem.hxx> #include <svl/itemset.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> diff --git a/svx/source/dialog/ClassificationEditView.hxx b/svx/source/dialog/ClassificationEditView.hxx index 96adf83abfe9..b65e95399f9b 100644 --- a/svx/source/dialog/ClassificationEditView.hxx +++ b/svx/source/dialog/ClassificationEditView.hxx @@ -12,10 +12,7 @@ #define INCLUDED_SVX_CLASSIFICATIONEDITVIEW_HXX #include <sal/config.h> -#include <svx/svxdllapi.h> #include <svx/weldeditview.hxx> -#include <editeng/svxenum.hxx> -#include <vcl/customweld.hxx> namespace svx { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 37d5814597c8..bd562618d09b 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -26,10 +26,8 @@ #include <svx/relfld.hxx> #include <svx/xlineit0.hxx> #include <svx/xtable.hxx> -#include <svx/strings.hrc> #include <bitmaps.hlst> #include <svx/dlgctrl.hxx> -#include <svx/dialmgr.hxx> #include <tools/debug.hxx> #include <svxpixelctlaccessiblecontext.hxx> #include <svtools/colorcfg.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index adaf99f412e7..62d1d43803a1 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -66,7 +66,6 @@ #include <vcl/toolbox.hxx> #include <o3tl/typed_flags_set.hxx> #include <comphelper/lok.hxx> -#include <sfx2/lokhelper.hxx> #include <cstdlib> #include <memory> diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 7f0acf713f80..8bbda29a9b1a 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -18,7 +18,7 @@ */ -#include <svx/svdpool.hxx> +#include <svl/itempool.hxx> #include <svx/svdmodel.hxx> #include <svx/svxids.hrc> #include <svx/strings.hrc> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 67a17de94699..cc1c314a781d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -54,7 +54,6 @@ #include <connectivity/formattedcolumnvalue.hxx> #include <i18nlangtag/lang.h> -#include <rtl/math.hxx> #include <svl/numuno.hxx> #include <svl/zforlist.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 9864108c4932..c5eb6ba50ac6 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <tools/diagnose_ex.h> #include <tools/debug.hxx> -#include <tools/fract.hxx> #include <vcl/builder.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 37927fed7431..98a3dfe4bcd4 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -31,7 +31,6 @@ #include <tools/diagnose_ex.h> #include <unotools/resmgr.hxx> #include <svx/xmlexchg.hxx> -#include <svtools/miscopt.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 6edc70460d56..c1376df08f38 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -24,21 +24,14 @@ #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/TerminationVetoException.hpp> -#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/script/XScriptListener.hpp> #include <tools/diagnose_ex.h> #include <tools/debug.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <o3tl/sorted_vector.hxx> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index b83e2a1cbc07..9fabb0f386de 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -92,7 +92,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <vcl/image.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 97aac28af619..f888eccb3283 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -20,7 +20,6 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 8d71fe546b71..9ab962b6deb2 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -19,14 +19,11 @@ #include <sal/config.h> -#include <comphelper/processfactory.hxx> #include <tools/datetime.hxx> -#include <unotools/datetime.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <ucbhelper/content.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <sfx2/app.hxx> #include <helpids.h> @@ -34,7 +31,6 @@ #include <svx/galtheme.hxx> #include <svx/galmisc.hxx> #include "galbrws1.hxx" -#include <com/sun/star/util/DateTime.hpp> #include <svx/strings.hrc> #include <algorithm> #include <svx/dialmgr.hxx> diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index e0b83f940b9d..6d06129d75b5 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -20,6 +20,7 @@ #pragma once #include <svl/lstner.hxx> +#include <vcl/weld.hxx> #include <vector> #include <functional> diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 69b4ab1f59c6..b265d039622c 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -43,7 +43,6 @@ #include <svx/galtheme.hxx> #include <svx/gallery1.hxx> #include <svx/gallerybinaryengineentry.hxx> -#include <galobj.hxx> #include <vcl/weld.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/svx/source/gallery2/gallerybinaryengine.cxx b/svx/source/gallery2/gallerybinaryengine.cxx index b79aec7f12d6..8b7715eeb9ac 100644 --- a/svx/source/gallery2/gallerybinaryengine.cxx +++ b/svx/source/gallery2/gallerybinaryengine.cxx @@ -28,7 +28,6 @@ #include "codec.hxx" #include "gallerydrawmodel.hxx" #include <vcl/cvtgrf.hxx> -#include <sot/formats.hxx> #include <sal/log.hxx> diff --git a/svx/source/gallery2/gallerybinaryengineentry.cxx b/svx/source/gallery2/gallerybinaryengineentry.cxx index 8537d52b2a9d..bb11d015dfd0 100644 --- a/svx/source/gallery2/gallerybinaryengineentry.cxx +++ b/svx/source/gallery2/gallerybinaryengineentry.cxx @@ -19,16 +19,9 @@ #include <svx/gallerybinaryengineentry.hxx> #include <svx/galmisc.hxx> -#include <svx/unomodel.hxx> -#include <svx/fmmodel.hxx> #include <svx/gallery1.hxx> -#include "codec.hxx" -#include "gallerydrawmodel.hxx" - -#include <sal/log.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/streamwrap.hxx> #include <tools/urlobj.hxx> #include <tools/vcompat.hxx> diff --git a/svx/source/gallery2/galleryobjectcollection.cxx b/svx/source/gallery2/galleryobjectcollection.cxx index f48a342ba5ed..515f52759028 100644 --- a/svx/source/gallery2/galleryobjectcollection.cxx +++ b/svx/source/gallery2/galleryobjectcollection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <galobj.hxx> #include <svx/galleryobjectcollection.hxx> GalleryObjectCollection::GalleryObjectCollection() {} diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 4187a8055d7b..df089a47aff2 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -26,7 +26,6 @@ #include <ucbhelper/content.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <tools/urlobj.hxx> -#include <unotools/ucbstreamhelper.hxx> #include <vcl/graphicfilter.hxx> #include <svl/itempool.hxx> #include <sfx2/docfile.hxx> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 2319328dc8f9..2dad05a061af 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -20,41 +20,26 @@ #include <config_features.h> #include <sal/config.h> -#include <sal/log.hxx> #include <algorithm> -#include <comphelper/fileformat.h> -#include <comphelper/processfactory.hxx> #include <osl/file.hxx> #include <osl/thread.hxx> -#include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <tools/vcompat.hxx> #include <tools/datetime.hxx> -#include <unotools/datetime.hxx> -#include <unotools/streamwrap.hxx> -#include <unotools/ucbstreamhelper.hxx> -#include <unotools/tempfile.hxx> -#include <ucbhelper/content.hxx> -#include <com/sun/star/ucb/ContentCreationException.hpp> #include <sot/storage.hxx> #include <sot/formats.hxx> #include <sot/filelist.hxx> #include <vcl/virdev.hxx> -#include <vcl/cvtgrf.hxx> #include <avmedia/mediawindow.hxx> #include <svx/svdograf.hxx> -#include "codec.hxx" -#include <svx/unomodel.hxx> #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include <svx/galmisc.hxx> #include <svx/galtheme.hxx> #include <svx/svdpage.hxx> #include <svx/galleryobjectcollection.hxx> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/ucb/XContentAccess.hpp> #include <galobj.hxx> #include <svx/gallery1.hxx> #include "gallerydrawmodel.hxx" diff --git a/svx/source/inc/StylesPreviewToolBoxControl.hxx b/svx/source/inc/StylesPreviewToolBoxControl.hxx index c7ac3f9953b6..d8d12a0f20a8 100644 --- a/svx/source/inc/StylesPreviewToolBoxControl.hxx +++ b/svx/source/inc/StylesPreviewToolBoxControl.hxx @@ -20,11 +20,10 @@ #ifndef INCLUDED_SVX_SOURCE_INC_STYLES_PREVIEW_TOOLBOX_CONTROL_HXX #define INCLUDED_SVX_SOURCE_INC_STYLES_PREVIEW_TOOLBOX_CONTROL_HXX -#include <svx/svxdllapi.h> -#include <sfx2/tbxctrl.hxx> +#include <svtools/toolboxcontroller.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include "StylesPreviewWindow.hxx" -#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> class StylesPreviewToolBoxControl final diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index 9e023d906655..5d6621c97eea 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/xml/dom/events/XEventListener.hpp> -#include <vcl/vclptr.hxx> namespace svxform diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 9cff6330c1ff..5e6e91b58f1c 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -31,7 +31,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> -#include <vcl/image.hxx> #include "fmexch.hxx" #include "sqlparserclient.hxx" diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx index 3e5de483c91a..7ff507f8aac4 100644 --- a/svx/source/inc/findtextfield.hxx +++ b/svx/source/inc/findtextfield.hxx @@ -20,6 +20,8 @@ #pragma once #include <vcl/InterimItemWindow.hxx> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace svt { diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 039a185e2a1b..d3a7fdc969f5 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -31,7 +31,6 @@ #include <rtl/ref.hxx> #include <tools/link.hxx> #include <vcl/weld.hxx> -#include <vcl/window.hxx> #include <svx/svxdllapi.h> namespace svxform diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 8f0d99f5676a..1c755960e5e5 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -28,7 +28,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> -#include <vcl/image.hxx> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XFormComponent.hpp> diff --git a/svx/source/inc/svdpdf.hxx b/svx/source/inc/svdpdf.hxx index 08a05a50f156..bf0620db4ef5 100644 --- a/svx/source/inc/svdpdf.hxx +++ b/svx/source/inc/svdpdf.hxx @@ -24,7 +24,6 @@ #if HAVE_FEATURE_PDFIUM #include <sal/config.h> -#include <svx/svxdllapi.h> #include <memory> diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 971fb1bb3ec5..e911ae20d756 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/drawing/Direction3D.hpp> -#include <rtl/math.hxx> #include <libxml/xmlwriter.h> #include <svx/e3ditem.hxx> diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index c3cad4f96209..d5baa905e0a8 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -82,8 +82,6 @@ #include <sdr/attribute/sdrfilltextattribute.hxx> #include <com/sun/star/drawing/LineCap.hpp> -#include <sal/log.hxx> - using namespace com::sun::star; namespace drawinglayer diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index f237369e3562..0a352071500e 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -25,8 +25,6 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> -#include <sal/log.hxx> - using namespace com::sun::star; diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index f0f3ec6001ed..9d17e86959b9 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -49,7 +49,6 @@ #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> #include <drawinglayer/attribute/sdrshadowattribute.hxx> #include <drawinglayer/attribute/sdrglowattribute.hxx> -#include <sal/log.hxx> using namespace com::sun::star; diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 0d1443081910..1d0364941fae 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -28,8 +28,6 @@ #include <svl/whiter.hxx> #include <svl/hint.hxx> -#include <sal/log.hxx> - namespace sdr::properties { diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.cxx b/svx/source/sidebar/effect/EffectPropertyPanel.cxx index 6e0ade4095cd..6c429420cf65 100644 --- a/svx/source/sidebar/effect/EffectPropertyPanel.cxx +++ b/svx/source/sidebar/effect/EffectPropertyPanel.cxx @@ -14,12 +14,10 @@ #include <sfx2/dispatch.hxx> #include <svx/colorbox.hxx> #include <svx/sdmetitm.hxx> -#include <svx/sdooitm.hxx> #include <svx/sdprcitm.hxx> #include <svx/svddef.hxx> #include <svx/svxids.hrc> #include <svx/xcolit.hxx> -#include <rtl/math.hxx> namespace svx::sidebar { diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx index 13714e22bfde..4eb4a4889f8c 100644 --- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx +++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx @@ -25,7 +25,6 @@ #include <svl/languageoptions.hxx> #include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> using namespace css; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index aac8619a448e..99126931ad1d 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -41,7 +41,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/transfrmhelper.hxx> -#include <boost/property_tree/json_parser.hpp> +#include <boost/property_tree/ptree.hpp> #include <svtools/unitconv.hxx> diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 89292ea03bc1..4b5adca519ab 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <comphelper/lok.hxx> -#include <sfx2/lokhelper.hxx> +#include <sfx2/viewsh.hxx> using namespace css; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 2e007ea7d513..abd037967390 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -33,7 +33,6 @@ #include <editeng/eeitem.hxx> #include <editeng/lineitem.hxx> #include <editeng/xmlcnitm.hxx> -#include <editeng/adjustitem.hxx> #include <editeng/writingmodeitem.hxx> #include <editeng/charrotateitem.hxx> #include <osl/diagnose.h> @@ -93,6 +92,7 @@ #include <svx/sxmtpitm.hxx> #include <svx/sxmtritm.hxx> #include <svx/sxmuitm.hxx> +#include <svx/xcolit.hxx> #include <sxoneitm.hxx> #include <sxopitm.hxx> #include <sxreaitm.hxx> @@ -104,9 +104,6 @@ #include <sxsiitm.hxx> #include <sxsoitm.hxx> #include <sxtraitm.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> -#include <svx/xlineit0.hxx> #include <libxml/xmlwriter.h> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 11b4401349b8..3ce25459bea6 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -40,7 +40,6 @@ #include <editeng/eeitem.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svx/svxdlg.hxx> #include <svx/strings.hrc> #include <svx/svdoashp.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> @@ -51,6 +50,7 @@ #include <vector> #include <vcl/graph.hxx> #include <svx/svxids.hrc> +#include <svx/dstribut_enum.hxx> using namespace com::sun::star; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index de362466fe03..f95a59f44c80 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -44,7 +44,6 @@ #include <drawinglayer/animation/animationtiming.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/svapp.hxx> -#include <vcl/canvastools.hxx> #include <editeng/escapementitem.hxx> #include <editeng/svxenum.hxx> #include <editeng/flditem.hxx> diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index c7e6f223b10f..db83863b001a 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -24,7 +24,6 @@ #if HAVE_FEATURE_PDFIUM #include <fpdfview.h> #include <fpdf_edit.h> -#include <fpdf_text.h> #include <tools/UnitConversion.hxx> #include <vcl/graph.hxx> diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index f0f24e2bf907..8ba7afe23ae4 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -45,15 +45,13 @@ #include <editeng/brushitem.hxx> #include <svx/xfillit0.hxx> -#include <svx/svddef.hxx> +#include <svx/xdef.hxx> #include <svx/xflclit.hxx> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/weak.hxx> -#include <sal/log.hxx> - StyleStatusListener::StyleStatusListener( StylesPreviewWindow_Base* pPreviewControl, const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 44b139334ace..e38c49e4916c 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -42,7 +42,6 @@ #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <helpids.h> -#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index d0301b5d3b8c..99cc2401235e 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -41,7 +41,6 @@ #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> -#include <boost/property_tree/ptree.hpp> #include <memory> using namespace ::com::sun::star; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index ee04adc7da0b..78a765f9d47f 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -26,7 +26,6 @@ #include <svtools/toolbarmenu.hxx> #include <svx/dialmgr.hxx> #include <svx/lboxctrl.hxx> -#include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <svx/strings.hrc> diff --git a/svx/source/tbxctrls/linemetricbox.hxx b/svx/source/tbxctrls/linemetricbox.hxx index 1fb65114427b..81f19a1c641e 100644 --- a/svx/source/tbxctrls/linemetricbox.hxx +++ b/svx/source/tbxctrls/linemetricbox.hxx @@ -19,7 +19,7 @@ #pragma once #include <vcl/InterimItemWindow.hxx> -#include <svx/svxdllapi.h> +#include <com/sun/star/frame/XFrame.hpp> class XLineWidthItem; diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx index 564a12197d1a..b1f1cb536a56 100644 --- a/svx/source/tbxctrls/linewidthctrl.cxx +++ b/svx/source/tbxctrls/linewidthctrl.cxx @@ -24,7 +24,6 @@ #include <svx/svxids.hrc> #include <svx/xlnwtit.hxx> #include <svx/linectrl.hxx> -#include <svx/itemwin.hxx> #include "linemetricbox.hxx" using namespace ::com::sun::star::uno; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 31507e4347a6..2679f0c7c839 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <typeinfo> #include <utility> #include <comphelper/configurationlistener.hxx> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index e31765478cf0..8d2e29f1317a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 27651bc95e70..d139fe2ab5c2 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> -#include <config_feature_desktop.h> #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index c6a6ab7ada94..9b4cb8e43a53 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/Locale.hpp> +#include <tools/debug.hxx> #include <tools/fldunit.hxx> #include <vcl/svapp.hxx> #include <comphelper/propertysetinfo.hxx> @@ -36,12 +37,10 @@ #include <svx/dialmgr.hxx> #include <svx/unoapi.hxx> #include <svx/unoshprp.hxx> -#include <svx/svx3ditems.hxx> #include <svx/svxids.hrc> #include <svx/svdobjkind.hxx> #include <svx/strings.hrc> #include <strings.hxx> -#include <svx/svdobj.hxx> #include "shapeimpl.hxx" #include <unordered_map> diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index c10c16e5c7dd..0116a25a94ca 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -22,7 +22,6 @@ #include "unogaltheme.hxx" #include <svx/galtheme.hxx> #include <svx/galmisc.hxx> -#include <svx/gallery1.hxx> #include <svx/fmmodel.hxx> #include <vcl/svapp.hxx> #include <vcl/graph.hxx> diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index e36f6f5191b7..c5c7ef7f52a2 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/xml/sax/InputSource.hpp> -#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 25da3328fc15..9474a88860eb 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -43,7 +43,6 @@ #include <xmloff/MarkerStyle.hxx> #include <xmloff/xmlictxt.hxx> #include <svx/xmlgrhlp.hxx> -#include <xmloff/attrlist.hxx> #include <xmlxtimp.hxx> #include <tools/diagnose_ex.h> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
