diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-02-28 00:49:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-03-02 10:55:00 +0100 |
| commit | 00bcbbf86d94792b11bbcc11b86acf8f63e34ae4 (patch) | |
| tree | 2634c4e66a1346dd1f1853dfc10027e129eb7c67 /svx/source | |
| parent | 068c133ac41c97652909b88c432e3b73010efc3e (diff) | |
tdf#42949 Fix IWYU warnings in svx/source/s*/*cxx
Except for already done svx/source/sdr/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I1c4b34cf42aa9faa2f7de36fe1602059460c6c1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89656
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx/source')
99 files changed, 25 insertions, 637 deletions
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index af804342fa34..ce1d5785f4dc 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -27,7 +27,6 @@ #include <comphelper/processfactory.hxx> #include <sfx2/lokhelper.hxx> #include <sfx2/viewsh.hxx> -#include <tools/diagnose_ex.h> using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 39704527deac..0265032b0e0e 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -18,8 +18,6 @@ */ #include "EmptyPanel.hxx" -#include <svx/strings.hrc> -#include <svx/dialmgr.hxx> namespace svx::sidebar { diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index a22a889a382a..5800099ecfa8 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -35,12 +35,9 @@ #include <GalleryControl.hxx> #include "EmptyPanel.hxx" #include <sfx2/sidebar/SidebarPanelBase.hxx> -#include <sfx2/sidebar/Tools.hxx> -#include <sfx2/sfxbasecontroller.hxx> #include <sfx2/templdlg.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> -#include <rtl/ref.hxx> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 1c909a9720f2..78a0f95e90bf 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/util/URLTransformer.hpp> #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/TabBar.hxx> #include <svx/sidebar/PanelLayout.hxx> diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index 4dfe18cd07b4..14134980f390 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -18,12 +18,10 @@ */ #include <svx/sidebar/SelectionAnalyzer.hxx> -#include <svx/svdmrkv.hxx> +#include <svx/svdmark.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdpage.hxx> -#include <svx/fmglob.hxx> -#include <svx/globl3d.hxx> using vcl::EnumContext; diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index 580b67625c1e..c015578e8671 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <svx/sidebar/SelectionChangeHandler.hxx> -#include <svx/sidebar/SelectionAnalyzer.hxx> #include <svx/sidebar/ContextChangeEventMultiplexer.hxx> -#include <svx/svdmrkv.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <vcl/EnumContext.hxx> -#include <sfx2/shell.hxx> using namespace css; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 19bfb333eb62..f71754888d19 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -17,20 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sidebar/ControlFactory.hxx> #include "AreaPropertyPanel.hxx" #include <svx/svxids.hrc> -#include <sfx2/objsh.hxx> #include <svx/xfltrit.hxx> #include <svx/xflftrit.hxx> -#include <svx/xtable.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <svtools/valueset.hxx> -#include <unotools/pathoptions.hxx> -#include <svx/svxitems.hrc> -#include <vcl/toolbox.hxx> -#include <svtools/toolbarmenu.hxx> using namespace css; diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 489c17fa89a6..efb93236e4ff 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sidebar/SidebarController.hxx> -#include <sfx2/sidebar/ControlFactory.hxx> +#include <osl/diagnose.h> #include <svx/sidebar/AreaPropertyPanelBase.hxx> #include <svx/drawitem.hxx> #include <svx/svxids.hrc> @@ -26,14 +25,6 @@ #include <svx/xfltrit.hxx> #include <svx/xflftrit.hxx> #include <svx/xtable.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/bindings.hxx> -#include <svtools/valueset.hxx> -#include <unotools/pathoptions.hxx> -#include <svx/svxitems.hrc> -#include <vcl/toolbox.hxx> -#include <svtools/toolbarmenu.hxx> -#include <svx/tbcontrl.hxx> #include <sfx2/opengrf.hxx> #include <sfx2/weldutils.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 93de4d218dc3..a6330f03f644 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/app.hxx> #include <svx/sidebar/AreaTransparencyGradientPopup.hxx> #include <svx/sidebar/AreaPropertyPanelBase.hxx> #include <svx/xflftrit.hxx> diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 0d21d84397e4..c29142c1415d 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sidebar/ControlFactory.hxx> + #include "GraphicPropertyPanel.hxx" #include <svx/strings.hrc> #include <svx/svxids.hrc> diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index bd0fde7a8674..070512cd33aa 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -16,28 +16,13 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sidebar/ControlFactory.hxx> + #include "LinePropertyPanel.hxx" #include <svx/svxids.hrc> -#include <sfx2/objsh.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <svx/xtable.hxx> -#include <svx/xdash.hxx> -#include <svx/drawitem.hxx> -#include <svx/svxitems.hrc> -#include <svtools/valueset.hxx> -#include <unotools/pathoptions.hxx> -#include <unotools/viewoptions.hxx> -#include <i18nlangtag/mslangid.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlndsit.hxx> -#include <vcl/svapp.hxx> #include <svx/xlnwtit.hxx> -#include <vcl/toolbox.hxx> #include <svx/xlntrit.hxx> -#include <svx/xlnstit.hxx> -#include <svx/xlnedit.hxx> #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 348e3905a843..fe7ff32ea3f4 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -18,33 +18,12 @@ */ #include <memory> -#include <osl/diagnose.h> -#include <sfx2/sidebar/ControlFactory.hxx> #include <svx/sidebar/LinePropertyPanelBase.hxx> -#include <sfx2/sidebar/SidebarToolBox.hxx> -#include <svx/strings.hrc> -#include <svx/svxids.hrc> -#include <svx/dialmgr.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> +#include <com/sun/star/drawing/LineStyle.hpp> #include <sfx2/weldutils.hxx> -#include <svx/xtable.hxx> -#include <svx/xdash.hxx> -#include <svx/drawitem.hxx> #include <svx/linectrl.hxx> -#include <svx/svxitems.hrc> -#include <svtools/valueset.hxx> -#include <unotools/pathoptions.hxx> -#include <unotools/viewoptions.hxx> -#include <i18nlangtag/mslangid.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlndsit.hxx> -#include <vcl/svapp.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlntrit.hxx> -#include <svx/xlnstit.hxx> -#include <svx/xlnedit.hxx> #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> #include <bitmaps.hlst> diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.cxx b/svx/source/sidebar/lists/ListsPropertyPanel.cxx index 7d2fcd3b9660..e82c3adfa274 100644 --- a/svx/source/sidebar/lists/ListsPropertyPanel.cxx +++ b/svx/source/sidebar/lists/ListsPropertyPanel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "ListsPropertyPanel.hxx" -#include <vcl/toolbox.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> using namespace css; diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx index 909eb2798a22..63626aaa777d 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "MediaPlaybackPanel.hxx" -#include <vcl/outdev.hxx> -#include <avmedia/mediawindow.hxx> -#include <avmedia/mediaplayer.hxx> -#include <svtools/miscopt.hxx> #include <avmedia/mediaitem.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/dispatch.hxx> diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 2f18654af52f..6960a87b659e 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -22,13 +22,11 @@ #include <svl/itemset.hxx> #include <sfx2/request.hxx> #include <svl/stritem.hxx> -#include <editeng/unolingu.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/objsh.hxx> #include <editeng/flstitem.hxx> #include <svl/itempool.hxx> #include <vcl/outdev.hxx> -#include <svx/gallery.hxx> #include <editeng/brushitem.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> @@ -38,22 +36,16 @@ #include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> -#include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> #include <editeng/eeitem.hxx> -#include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> -#include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/text/DefaultNumberingProvider.hpp> -#include <com/sun/star/text/XNumberingFormatter.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/processfactory.hxx> -#include <com/sun/star/text/XNumberingTypeInfo.hpp> #include <memory> using namespace com::sun::star; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 13d662bc9763..4e52822f71c4 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -20,7 +20,6 @@ #include "ParaLineSpacingControl.hxx" #include <editeng/editids.hrc> -#include <editeng/kernitem.hxx> #include <editeng/lspcitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> @@ -28,6 +27,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/unitconv.hxx> +#include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svx/ParaLineSpacingPopup.hxx> diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 867e0846a970..28bbf44c13dc 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -19,9 +19,7 @@ #include "ParaLineSpacingControl.hxx" -#include <editeng/lspcitem.hxx> #include <svx/ParaLineSpacingPopup.hxx> -#include <unotools/viewoptions.hxx> #include <vcl/toolbox.hxx> using namespace svx; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index bf2cddd89040..75d376eb2dd6 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "ParaPropertyPanel.hxx" -#include <sfx2/sidebar/Tools.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/weldutils.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <svx/dlgctrl.hxx> #include <svx/svxids.hrc> #include <svl/intitem.hxx> diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index d097a907aa8a..d7c0b3538dd0 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -25,7 +25,6 @@ #include <editeng/editids.hrc> #include <svx/ParaSpacingControl.hxx> #include <vcl/toolbox.hxx> -#include <svl/itempool.hxx> #include <sfx2/sfxsids.hrc> #include <svl/intitem.hxx> #include <comphelper/processfactory.hxx> diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index e29cb7e177da..d887a942d6c1 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -24,7 +24,6 @@ #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <svl/itempool.hxx> -#include <svl/intitem.hxx> using namespace svx; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 7d87dca1c488..18be1aa4d2c5 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -21,34 +21,26 @@ #include <algorithm> -#include <sfx2/sidebar/ControlFactory.hxx> #include "PosSizePropertyPanel.hxx" #include <svx/svxids.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/lokhelper.hxx> #include <sfx2/module.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/weldutils.hxx> #include <svx/dialcontrol.hxx> -#include <svx/dlgutil.hxx> #include <svx/rectenum.hxx> -#include <unotools/localedatawrapper.hxx> #include <unotools/viewoptions.hxx> #include <vcl/canvastools.hxx> #include <vcl/fieldvalues.hxx> -#include <vcl/virdev.hxx> -#include <vcl/svapp.hxx> -#include <svl/aeitem.hxx> #include <svl/intitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/transfrmhelper.hxx> #include <svtools/unitconv.hxx> -#include <comphelper/lok.hxx> using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 5b97a5f619a0..b0f135519030 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -10,25 +10,16 @@ #include "ShadowPropertyPanel.hxx" #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <sfx2/sidebar/ControlFactory.hxx> #include <svx/colorbox.hxx> #include <svx/svxids.hrc> -#include <sfx2/objsh.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xtable.hxx> -#include <svtools/valueset.hxx> #include <unotools/localedatawrapper.hxx> -#include <unotools/pathoptions.hxx> -#include <svx/svddef.hxx> #include <svx/sdooitm.hxx> #include <svx/sdshitm.hxx> #include <svx/sdshtitm.hxx> #include <svx/sdprcitm.hxx> #include <svx/sdsxyitm.hxx> -#include <svx/svdmodel.hxx> -#include <svx/drawitem.hxx> #include <svx/sdshcitm.hxx> using namespace css; diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index bb92e6f3d45e..e0aeb0df2b69 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <comphelper/dispatchcommand.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/outdev.hxx> #include <vcl/settings.hxx> namespace svx::sidebar { diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index bf3a99892684..72ef14ce8bf7 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -21,13 +21,10 @@ #include <unotools/viewoptions.hxx> #include <editeng/editids.hrc> #include <editeng/kernitem.hxx> -#include <editeng/fhgtitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/sidebar/Theme.hxx> #include <svx/TextCharacterSpacingPopup.hxx> -#include <vcl/settings.hxx> #include <svl/itempool.hxx> #include <helpids.h> diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 5ae14443e231..17bf25ce2924 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -18,9 +18,7 @@ */ #include <svx/TextCharacterSpacingPopup.hxx> #include "TextCharacterSpacingControl.hxx" -#include <unotools/viewoptions.hxx> #include <vcl/toolbox.hxx> -#include <editeng/kernitem.hxx> using namespace svx; diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index eff6cb932843..1ae19e653bc0 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -20,11 +20,9 @@ #include <svx/svxids.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/sidebar/Theme.hxx> #include <svx/TextUnderlinePopup.hxx> #include <editeng/editids.hrc> #include <editeng/udlnitem.hxx> -#include <vcl/settings.hxx> #include <helpids.h> namespace svx { diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 4199bf8b7171..e5b0a483a0c7 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -18,7 +18,6 @@ */ #include <svx/TextUnderlinePopup.hxx> #include "TextUnderlineControl.hxx" -#include <editeng/udlnitem.hxx> #include <vcl/toolbox.hxx> using namespace svx; diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 92356778d333..026bf581a9d4 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -19,11 +19,8 @@ #include <svx/sidebar/ValueSetWithTextControl.hxx> #include <sfx2/sidebar/Theme.hxx> -#include <limits.h> #include <i18nlangtag/mslangid.hxx> #include <svtools/valueset.hxx> -#include <editeng/brushitem.hxx> -#include <vcl/graph.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 640fb8a7938c..a81bce9609c3 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -26,17 +26,13 @@ #include <com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> #include <com/sun/star/deployment/ExtensionManager.hpp> -#include <com/sun/star/text/XTextMarkup.hpp> #include <com/sun/star/smarttags/SmartTagRecognizerMode.hpp> #include <com/sun/star/i18n/BreakIterator.hpp> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XChangesBatch.hpp> @@ -45,8 +41,6 @@ #include <comphelper/sequence.hxx> #include <rtl/ustring.hxx> -#include <com/sun/star/text/XTextRange.hpp> - using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::i18n; diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index eaad418e4909..8139d6329df8 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -19,8 +19,6 @@ #include <vcl/status.hxx> #include <svl/eitem.hxx> -#include <sfx2/app.hxx> -#include <sfx2/dispatch.hxx> #include <tools/debug.hxx> #include <svx/strings.hrc> diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 634781f11956..ef1f8a68bd49 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -23,7 +23,6 @@ #include <vcl/idle.hxx> #include <vcl/event.hxx> #include <svl/eitem.hxx> -#include <sfx2/app.hxx> #include <tools/debug.hxx> #include <svx/strings.hrc> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 72e5d3f530be..13d3102fdce1 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <limits.h> #include <vcl/builder.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> @@ -29,11 +28,7 @@ #include <vcl/svapp.hxx> #include <svl/stritem.hxx> #include <svl/ptitem.hxx> -#include <svl/itempool.hxx> -#include <sfx2/app.hxx> #include <sfx2/module.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/objsh.hxx> #include <svl/intitem.hxx> #include <sal/log.hxx> @@ -42,7 +37,6 @@ #define PAINT_OFFSET 5 #include <editeng/sizeitem.hxx> -#include <svx/dlgutil.hxx> #include "stbctrls.h" #include <svx/svxids.hrc> diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 7d8ec66ff8ca..df54a7ae4f40 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -22,12 +22,10 @@ #include <vcl/menu.hxx> #include <vcl/status.hxx> #include <svl/intitem.hxx> -#include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> #include <svx/selctrl.hxx> -#include "stbctrls.h" #include <bitmaps.hlst> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 92807494e8e0..c7b2bf2dca7d 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -25,16 +25,10 @@ #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <sfx2/signaturestate.hxx> -#include <sfx2/app.hxx> #include <sfx2/module.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/sfxsids.hrc> #include <svl/intitem.hxx> -#include <svl/eitem.hxx> - #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/xmlsecctrl.hxx> diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index d5445b56faa5..7ac0bc81afcc 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -25,16 +25,13 @@ #include <vcl/status.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> -#include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> #include <sal/log.hxx> #include <svx/strings.hrc> #include <svx/zoomctrl.hxx> -#include <svx/zoomslideritem.hxx> #include <sfx2/zoomitem.hxx> -#include "stbctrls.h" #include <svx/dialmgr.hxx> #include "modctrl_internal.hxx" #include <bitmaps.hlst> diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx index 5b93b837c00d..6d77c18be8a6 100644 --- a/svx/source/styles/CommonStylePreviewRenderer.cxx +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -20,17 +20,13 @@ #include <svx/xdef.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> -#include <svx/xcolit.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/boxitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/emphasismarkitem.hxx> -#include <editeng/flstitem.hxx> -#include <editeng/lineitem.hxx> #include <editeng/postitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/udlnitem.hxx> diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index f75ac0e40a97..d582c57d7a37 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -18,10 +18,6 @@ */ #include <svx/charthelper.hxx> -#include <tools/globname.hxx> -#include <comphelper/classids.hxx> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/XUpdatable2.hpp> diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index cc36f493a9f2..ecb219836d31 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <tools/helpers.hxx> #include <vcl/canvastools.hxx> -#include <vcl/outdev.hxx> void GradTransformer::GradToVec(GradTransGradient const & rG, GradTransVector& rV, const SdrObject* pObj) diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 7cbdbc1c80f4..2a93dc372555 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/processor2d/hittestprocessor2d.hxx> #include <svx/svdpagv.hxx> #include <svx/sdr/contact/viewcontact.hxx> -#include <svx/svdmodel.hxx> // #i101872# new Object HitTest as View-tooling diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index ac6c871c9cc3..1d084391896a 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -20,7 +20,6 @@ #include <svx/sdrmasterpagedescriptor.hxx> #include <sdr/contact/viewcontactofmasterpagedescriptor.hxx> #include <svx/svdpage.hxx> -#include <svx/svdobj.hxx> #include <svx/xdef.hxx> #include <svx/xfillit0.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 31a28277cb71..fb3155c0eb14 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -19,23 +19,17 @@ #include <svx/sdrpagewindow.hxx> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/util/XModeChangeBroadcaster.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> -#include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svx/svdouno.hxx> -#include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/fmview.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <sfx2/lokhelper.hxx> #include <tools/debug.hxx> diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 29bbec832122..991c2022b6ab 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/lok.hxx> -#include <comphelper/random.hxx> #include <svx/sdrpaintwindow.hxx> #include <sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 203a0b572a16..e1d56b706b25 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -28,22 +28,17 @@ #include <com/sun/star/drawing/MeasureTextHorzPos.hpp> #include <com/sun/star/drawing/MeasureTextVertPos.hpp> #include <com/sun/star/drawing/CircleKind.hpp> -#include <com/sun/star/uno/Sequence.hxx> #include <editeng/boxitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/lineitem.hxx> -#include <editeng/shaditem.hxx> #include <editeng/xmlcnitm.hxx> #include <editeng/adjustitem.hxx> -#include <editeng/editdata.hxx> #include <editeng/writingmodeitem.hxx> #include <editeng/charrotateitem.hxx> #include <osl/diagnose.h> #include <i18nutil/unicode.hxx> -#include <svl/solar.hrc> #include <tools/bigint.hxx> -#include <tools/stream.hxx> #include <unotools/intlwrapper.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> @@ -78,7 +73,6 @@ #include <sxcaitm.hxx> #include <svx/sxcecitm.hxx> #include <svx/sxcgitm.hxx> -#include <svx/sxciaitm.hxx> #include <sxcikitm.hxx> #include <svx/sxcllitm.hxx> #include <svx/sxctitm.hxx> @@ -91,7 +85,6 @@ #include <svx/sxmbritm.hxx> #include <sxmfsitm.hxx> #include <sxmkitm.hxx> -#include <svx/sxmlhitm.hxx> #include <sxmoitm.hxx> #include <sxmovitm.hxx> #include <sxmsitm.hxx> @@ -114,7 +107,6 @@ #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlineit0.hxx> -#include <svx/xtable.hxx> #include <libxml/xmlwriter.h> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index ea8aa3bda525..3d2230a8b6a9 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -20,19 +20,15 @@ #include <svx/svdcrtv.hxx> #include <svx/xlnclit.hxx> -#include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <svx/svdoedge.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> -#include <svx/svdetc.hxx> #include <svx/scene3d.hxx> #include <svx/view3d.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlineit0.hxx> -#include <sdr/contact/objectcontactofobjlistpainter.hxx> -#include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdouno.hxx> #include <svx/svdopath.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> @@ -42,7 +38,6 @@ #include <svx/svdocirc.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <vcl/ptrstyle.hxx> using namespace com::sun::star; diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 82bd19e4815a..14da888fdb40 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -20,18 +20,15 @@ #include "svddrgm1.hxx" #include <math.h> -#include <tools/bigint.hxx> #include <o3tl/numeric.hxx> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/ptrstyle.hxx> #include <svx/xpoly.hxx> -#include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> #include <svx/svdmark.hxx> -#include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> #include <svx/svddrgv.hxx> #include <svx/svdograf.hxx> @@ -42,16 +39,13 @@ #include <svx/sdtagitm.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> -#include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/contact/objectcontact.hxx> @@ -64,9 +58,6 @@ #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive2d/sdrdecompositiontools.hxx> -#include <svx/svdoole2.hxx> -#include <svx/svdovirt.hxx> -#include <svx/svdouno.hxx> #include <sdr/primitive2d/sdrprimitivetools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index e807b0a65610..7002f9447d0d 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -21,9 +21,6 @@ #include <tools/debug.hxx> #include <svx/svddrgv.hxx> #include <svx/svdview.hxx> -#include <svx/xpoly.hxx> -#include <svx/svdetc.hxx> -#include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> @@ -35,9 +32,6 @@ #include <svx/obj3d.hxx> #include <svx/svdoashp.hxx> #include <svx/sdrpaintwindow.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/polypolygoneditor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 6dfb249d911c..b0825c0b4a58 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/metaact.hxx> #include <svx/svdedtv.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> -#include <svx/svdopath.hxx> #include <svx/svdoole2.hxx> -#include <svx/svdopage.hxx> #include <svx/svdoedge.hxx> #include <svx/svdlayer.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 72d76d0a8beb..c30109596d7a 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -19,10 +19,8 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <math.h> -#include <svl/aeitem.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> #include <tools/bigint.hxx> @@ -38,14 +36,12 @@ #include <svx/e3dsceneupdater.hxx> #include <svx/obj3d.hxx> #include <svx/rectenum.hxx> -#include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdooitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdtagitm.hxx> #include <svx/svdedtv.hxx> #include <svx/svdetc.hxx> -#include <svx/svdlayer.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> @@ -64,7 +60,6 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> -#include <svx/svdview.hxx> #include <svx/xlnclit.hxx> #include <svx/xflclit.hxx> #include <svx/xlntrit.hxx> diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 8736da464544..6672f742d534 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -18,11 +18,9 @@ */ #include <svx/svdedtv.hxx> -#include <editeng/outliner.hxx> #include <svx/svdundo.hxx> #include <svx/svdogrp.hxx> #include <svx/svdoutl.hxx> -#include <svx/svdovirt.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> @@ -38,7 +36,6 @@ #include "svdfmtf.hxx" #include "svdpdf.hxx" #include <svx/svdetc.hxx> -#include <sfx2/basedlgs.hxx> #include <editeng/outlobj.hxx> #include <editeng/eeitem.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 91f7d2101139..d55d2964a46f 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -25,7 +25,6 @@ #include <editeng/outlobj.hxx> #include <editeng/unotext.hxx> #include <svl/itemiter.hxx> -#include <svl/solar.hrc> #include <svl/style.hxx> #include <svl/whiter.hxx> #include <svtools/accessibilityoptions.hxx> @@ -33,7 +32,6 @@ #include <svx/selectioncontroller.hxx> #include <svx/svdedxv.hxx> #include <svx/svdetc.hxx> -#include <svx/svditer.hxx> #include <svx/svdotable.hxx> #include <svx/svdotext.hxx> #include <svx/svdoutl.hxx> @@ -43,19 +41,15 @@ #include <vcl/canvastools.hxx> #include <vcl/commandevent.hxx> #include <vcl/cursor.hxx> -#include <vcl/hatch.hxx> #include <vcl/weld.hxx> #include <comphelper/lok.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> -#include <editeng/adjustitem.hxx> #include <editeng/outliner.hxx> #include <sal/log.hxx> #include <sdr/overlay/overlaytools.hxx> #include <sfx2/viewsh.hxx> -#include <svtools/colorcfg.hxx> #include <svx/dialmgr.hxx> -#include <svx/globl3d.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayselection.hxx> #include <svx/sdr/table/tablecontroller.hxx> @@ -63,7 +57,6 @@ #include <svx/sdrpaintwindow.hxx> #include <svx/sdrundomanager.hxx> #include <svx/strings.hrc> -#include <svx/svddrgv.hxx> #include <svx/svdviter.hxx> #include <textchain.hxx> #include <textchaincursor.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index eab680743eef..0d82f6632b35 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -19,24 +19,16 @@ #include <sal/config.h> -#include <editeng/forbiddencharacterstable.hxx> #include <officecfg/Office/Common.hxx> -#include <svx/dialmgr.hxx> +#include <svtools/colorcfg.hxx> #include <svx/svdetc.hxx> +#include <svx/svdedxv.hxx> #include <svx/svdmodel.hxx> -#include <svx/svdtrans.hxx> -#include <svx/strings.hrc> -#include <svx/svdviter.hxx> -#include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bitmapaccess.hxx> -#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/colritem.hxx> -#include <editeng/fhgtitem.hxx> #include <svx/xgrad.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> @@ -45,9 +37,9 @@ #include <svx/xflgrit.hxx> #include <svx/svdoole2.hxx> #include <svl/itempool.hxx> +#include <tools/debug.hxx> #include <unotools/configmgr.hxx> #include <unotools/localedatawrapper.hxx> -#include <i18nlangtag/lang.h> #include <unotools/syslocale.hxx> #include <svx/xflbckit.hxx> #include <svx/extrusionbar.hxx> @@ -62,8 +54,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/lang/Locale.hpp> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index f850e6fadf1f..4adefe0cb096 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -18,10 +18,7 @@ */ #include "svdfmtf.hxx" -#include <editeng/editdata.hxx> #include <math.h> -#include <svx/xpoly.hxx> -#include <vcl/svapp.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/wghtitem.hxx> @@ -38,7 +35,6 @@ #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> #include <editeng/fontitem.hxx> -#include <editeng/autokernitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> @@ -49,7 +45,6 @@ #include <svx/sdmetitm.hxx> #include <svx/sdtagitm.hxx> #include <svx/sdtaitm.hxx> -#include <svx/sdtakitm.hxx> #include <svx/sdtditm.hxx> #include <svx/sdtfsitm.hxx> #include <svx/svdmodel.hxx> @@ -71,7 +66,6 @@ #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <svx/xbtmpit.hxx> #include <svx/xfltrit.hxx> -#include <vcl/bitmapaccess.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> #include <svx/svdpntv.hxx> diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 6c1be3bb96c1..444517a97ca3 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -24,7 +24,6 @@ #include <svx/svdundo.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> -#include <svx/svdpagv.hxx> #include <svx/svdglue.hxx> #include <svx/svdtrans.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index d5895ffa5718..bba86e63805f 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -23,14 +23,10 @@ #include <svx/svdhdl.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdetc.hxx> #include <svx/svdmrkv.hxx> -#include <vcl/window.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <vcl/ptrstyle.hxx> -#include <tools/poly.hxx> -#include <vcl/bitmapaccess.hxx> #include <svx/sxekitm.hxx> #include <svx/strings.hrc> @@ -61,7 +57,6 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index dee11e58c95d..0d515191ed34 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -21,9 +21,6 @@ #include <svx/svdhlpln.hxx> #include <vcl/outdev.hxx> -#include <vcl/window.hxx> -#include <tools/poly.hxx> -#include <vcl/lineinfo.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 874f1caac9d4..629438ac9842 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -19,10 +19,8 @@ #include <svx/svditer.hxx> #include <svx/svdpage.hxx> -#include <svx/svdogrp.hxx> #include <svx/svdobj.hxx> #include <svx/svdmark.hxx> -#include <svx/scene3d.hxx> SdrObjListIter::SdrObjListIter(const SdrObjList* pObjList, SdrIterMode eMode, bool bReverse) : maObjList(), diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 04c868e8815b..d70b221ba626 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -21,8 +21,6 @@ #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> -#include <svx/dialmgr.hxx> -#include <svx/strings.hrc> bool SdrLayerIDSet::IsEmpty() const { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index cce452b5b702..3b5988974d18 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -21,14 +21,9 @@ #include <osl/time.h> #include <svx/svdmark.hxx> -#include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include <svx/svditer.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdopath.hxx> -#include <svx/svdogrp.hxx> -#include <svx/svdorect.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 839c290deec7..d0c7226dc020 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -20,8 +20,6 @@ #include <svx/svdmodel.hxx> #include <cassert> #include <math.h> -#include <osl/endian.h> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> @@ -30,7 +28,6 @@ #include <unotools/pathoptions.hxx> #include <svl/whiter.hxx> #include <svl/asiancfg.hxx> -#include <svx/xit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xlndsit.hxx> #include <svx/xlnedit.hxx> @@ -38,10 +35,8 @@ #include <svx/xflftrit.hxx> #include <svx/xflhtit.hxx> #include <svx/xlnstit.hxx> -#include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <svx/xtable.hxx> -#include <svx/svditer.hxx> #include <svx/svdtrans.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> @@ -52,35 +47,26 @@ #include <textchain.hxx> #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> -#include <svx/svdoole2.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <svdoutlinercache.hxx> -#include <svx/xflclit.hxx> -#include <svx/xlnclit.hxx> #include <svx/sdasitm.hxx> #include <officecfg/Office/Common.hxx> #include <editeng/fontitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fhgtitem.hxx> #include <svl/style.hxx> -#include <editeng/numitem.hxx> -#include <editeng/bulletitem.hxx> -#include <editeng/outlobj.hxx> #include <editeng/forbiddencharacterstable.hxx> -#include <svl/zforlist.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/storagehelper.hxx> -#include <tools/tenccvt.hxx> +#include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> -#include <svx/sdr/properties/properties.hxx> #include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <memory> #include <libxml/xmlwriter.h> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sfx2/viewsh.hxx> #include <o3tl/enumrange.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index edb1ee867792..9ec4d346ad51 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -19,20 +19,16 @@ #include <svx/svdmrkv.hxx> -#include <svx/svdetc.hxx> -#include <svx/svdoedge.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdotable.hxx> -#include "svddrgm1.hxx" #include <osl/thread.h> #include <svx/svdoole2.hxx> #include <svx/xgrad.hxx> #include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> -#include <svx/xlineit0.hxx> #include "gradtrns.hxx" #include <svx/xflftrit.hxx> #include <svx/dialmgr.hxx> @@ -42,18 +38,15 @@ #include <svx/scene3d.hxx> #include <svx/svdovirt.hxx> #include <sdr/overlay/overlayrollingrectangle.hxx> +#include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <svx/sdr/table/tablecontroller.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> -#include <svx/svdocapt.hxx> -#include <svx/svdograf.hxx> #include <vcl/uitest/logger.hxx> #include <vcl/uitest/eventdescription.hxx> -#include <editeng/editdata.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index e11d8a5ebb9b..0d0ae8dc2bfe 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -19,11 +19,7 @@ #include <svx/svdmrkv.hxx> -#include <svx/svdetc.hxx> -#include <svx/svdoedge.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdpage.hxx> -#include "svddrgm1.hxx" // Point Selection diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 2412213f2992..232b727f4497 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -19,11 +19,6 @@ #include <svx/svdoashp.hxx> #include <svx/unoapi.hxx> -#include <svx/unoshape.hxx> -#include <ucbhelper/content.hxx> -#include <unotools/datetime.hxx> -#include <sfx2/lnkbase.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XCustomShapeEngine.hpp> @@ -33,21 +28,15 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <svl/urihelper.hxx> #include <com/sun/star/uno/Sequence.h> -#include <svx/svdogrp.hxx> #include <tools/helpers.hxx> #include <svx/svddrag.hxx> -#include <svx/xpool.hxx> -#include <svx/xpoly.hxx> #include <svx/svddrgmt.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> -#include <svx/svdetc.hxx> -#include <svx/svdoedge.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <editeng/eeitem.hxx> @@ -68,8 +57,6 @@ #include <editeng/writingmodeitem.hxx> #include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> -#include <svx/svxids.hrc> -#include <svl/whiter.hxx> #include <sdr/properties/customshapeproperties.hxx> #include <sdr/contact/viewcontactofsdrobjcustomshape.hxx> #include <svx/xlntrit.hxx> @@ -79,7 +66,6 @@ #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/virdev.hxx> #include <svx/svdview.hxx> #include <svx/sdmetitm.hxx> @@ -95,6 +81,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drange.hxx> #include <svdobjplusdata.hxx> +#include <sal/log.hxx> #include "presetooxhandleadjustmentrelations.hxx" using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 249b3119af5f..2c7223fa563a 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -19,57 +19,14 @@ #include <svx/svdoattr.hxx> -#include <svx/xpool.hxx> #include <svx/svdmodel.hxx> -#include <svx/svdpage.hxx> -#include <svx/svdpool.hxx> -#include <svx/svdotext.hxx> -#include <svx/svdocapt.hxx> -#include <svx/svdograf.hxx> -#include <svx/svdoole2.hxx> -#include <svx/svdorect.hxx> -#include <svx/svdocirc.hxx> -#include <svx/svdomeas.hxx> #include <svl/hint.hxx> -#include <svl/itemiter.hxx> -#include <svx/xenum.hxx> +#include <svl/itemset.hxx> +#include <svx/xdef.hxx> #include <svx/xlineit0.hxx> -#include <svx/xlnstwit.hxx> -#include <svx/xlnedwit.hxx> #include <svx/xfillit0.hxx> -#include <svx/xflbmtit.hxx> -#include <svx/xtextit0.hxx> -#include <svx/xflbstit.hxx> -#include <svx/xflbtoxy.hxx> -#include <svx/xftshit.hxx> - -#include <editeng/editdata.hxx> -#include <editeng/colritem.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/fhgtitem.hxx> - -#include <svx/xlnstcit.hxx> #include <svx/xlnwtit.hxx> -#include <svl/style.hxx> -#include <svl/whiter.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xflclit.hxx> -#include <svx/xlntrit.hxx> -#include <svx/xfltrit.hxx> -#include <svx/xlnedcit.hxx> -#include <editeng/adjustitem.hxx> -#include <svx/xflbckit.hxx> -#include <svx/xtable.hxx> -#include <svx/xbtmpit.hxx> -#include <svx/xlndsit.hxx> -#include <svx/xlnedit.hxx> -#include <svx/xflgrit.hxx> -#include <svx/xflftrit.hxx> -#include <svx/xflhtit.hxx> -#include <svx/xlnstit.hxx> #include <sdr/properties/attributeproperties.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <svx/xlinjoit.hxx> using namespace com::sun::star; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index bf8650439aa3..b1e4a44ae12b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -36,35 +36,23 @@ #include <drawinglayer/processor2d/contourextractor2d.hxx> #include <drawinglayer/processor2d/linegeometryextractor2d.hxx> #include <editeng/editeng.hxx> -#include <editeng/eeitem.hxx> #include <editeng/outlobj.hxx> #include <o3tl/deleter.hxx> #include <math.h> -#include <sfx2/objface.hxx> -#include <sfx2/objsh.hxx> -#include <svl/whiter.hxx> #include <svl/grabbagitem.hxx> -#include <svtools/colorcfg.hxx> #include <tools/bigint.hxx> #include <tools/diagnose_ex.h> #include <tools/helpers.hxx> -#include <tools/line.hxx> #include <unotools/configmgr.hxx> #include <vcl/canvastools.hxx> -#include <vcl/graphictools.hxx> -#include <vcl/metaact.hxx> -#include <vcl/virdev.hxx> #include <vcl/ptrstyle.hxx> #include <vector> #include <svx/shapepropertynotifier.hxx> #include <svx/svdotable.hxx> -#include <svx/xlinjoit.hxx> -#include <svx/fmmodel.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <sdr/contact/objectcontactofobjlistpainter.hxx> -#include <sdr/contact/viewcontactofgraphic.hxx> #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <sdr/properties/emptyproperties.hxx> #include <svx/sdrhittesthelper.hxx> @@ -109,30 +97,17 @@ #include <sxtraitm.hxx> #include <svx/unopage.hxx> #include <svx/unoshape.hxx> -#include <svx/xbtmpit.hxx> -#include <svx/xenum.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> -#include <svx/xflftrit.hxx> -#include <svx/xflhtit.hxx> #include <svx/xfltrit.hxx> -#include <svx/xgrad.hxx> -#include <svx/xhatch.hxx> #include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> -#include <svx/xlndsit.hxx> -#include <svx/xlnedcit.hxx> -#include <svx/xlnedit.hxx> #include <svx/xlnedwit.hxx> -#include <svx/xlnstcit.hxx> -#include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlntrit.hxx> #include <svx/xlnwtit.hxx> -#include <svx/xpoly.hxx> #include <svx/svdglue.hxx> #include <svx/svdsob.hxx> -#include <rtl/strbuf.hxx> #include <svdobjplusdata.hxx> #include <svdobjuserdatalist.hxx> diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx index 07eafc707d8f..c7da1c80083a 100644 --- a/svx/source/svdraw/svdobjplusdata.cxx +++ b/svx/source/svdraw/svdobjplusdata.cxx @@ -12,7 +12,6 @@ #include <o3tl/deleter.hxx> #include <svx/svdglue.hxx> #include <svl/SfxBroadcaster.hxx> -#include <vcl/outdev.hxx> SdrObjPlusData::SdrObjPlusData() { diff --git a/svx/source/svdraw/svdobjuserdatalist.cxx b/svx/source/svdraw/svdobjuserdatalist.cxx index 582091c39829..cae5e8db68dc 100644 --- a/svx/source/svdraw/svdobjuserdatalist.cxx +++ b/svx/source/svdraw/svdobjuserdatalist.cxx @@ -9,7 +9,6 @@ #include <memory> #include <svdobjuserdatalist.hxx> -#include <vcl/outdev.hxx> SdrObjUserDataList::SdrObjUserDataList() {} SdrObjUserDataList::~SdrObjUserDataList() {} diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index e346ee7a94d9..cedb72282ef6 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -26,8 +26,6 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/tuple/b2dtuple.hxx> -#include <editeng/eeitem.hxx> -#include <svl/style.hxx> #include <tools/bigint.hxx> #include <tools/helpers.hxx> @@ -39,27 +37,18 @@ #include <svx/sdrhittesthelper.hxx> #include <svx/sdooitm.hxx> #include <svx/svddrag.hxx> -#include <svx/svdetc.hxx> #include <svx/svdhdl.hxx> #include <svx/svdmodel.hxx> #include <svx/svdocapt.hxx> #include <svx/svdopath.hxx> #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> -#include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> #include <svx/svdview.hxx> -#include <sxcaitm.hxx> #include <svx/sxcecitm.hxx> #include <svx/sxcgitm.hxx> #include <svx/sxcllitm.hxx> #include <svx/sxctitm.hxx> -#include <svx/xflclit.hxx> -#include <svx/xflhtit.hxx> -#include <svx/xfltrit.hxx> -#include <svx/xlnwtit.hxx> -#include <svx/xpoly.hxx> -#include <svx/xpool.hxx> #include <vcl/canvastools.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index efbc2803cb2f..658a67f290e6 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -22,9 +22,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <editeng/eeitem.hxx> #include <math.h> -#include <svl/style.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> @@ -32,12 +30,9 @@ #include <sdr/contact/viewcontactofsdrcircobj.hxx> #include <sdr/properties/circleproperties.hxx> #include <svx/svddrag.hxx> -#include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> #include <svx/svdocirc.hxx> #include <svx/svdopath.hxx> -#include <svx/svdpage.hxx> -#include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> #include <svx/svdview.hxx> #include <svx/sxciaitm.hxx> @@ -49,7 +44,6 @@ #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> -#include <svx/xpool.hxx> #include <vcl/canvastools.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 8b84492dd48f..8218f2659e95 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -17,37 +17,30 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "svddrgm1.hxx" #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <editeng/eeitem.hxx> #include <svl/hint.hxx> -#include <svl/style.hxx> #include <sdr/contact/viewcontactofsdredgeobj.hxx> #include <sdr/properties/connectorproperties.hxx> #include <svx/sdrhittesthelper.hxx> #include <svx/svddrag.hxx> -#include <svx/svddrgv.hxx> -#include <svx/svdetc.hxx> +#include <svx/svddrgmt.hxx> #include <svx/svdhdl.hxx> #include <svx/svdmodel.hxx> #include <svx/svdoedge.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> #include <svx/svdview.hxx> #include <svx/sxekitm.hxx> #include <svx/sxelditm.hxx> #include <svx/sxenditm.hxx> #include <svx/xpoly.hxx> -#include <svx/xpool.hxx> #include <vcl/ptrstyle.hxx> void SdrObjConnection::ResetVars() diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 127de6a0c6f5..37246e1c21fa 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -20,37 +20,24 @@ #include <unotools/streamwrap.hxx> #include <sfx2/lnkbase.hxx> -#include <math.h> #include <tools/helpers.hxx> +#include <tools/stream.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <sot/storage.hxx> -#include <unotools/ucbstreamhelper.hxx> -#include <unotools/localfilehelper.hxx> -#include <svl/style.hxx> -#include <svl/urihelper.hxx> -#include <vcl/graphicfilter.hxx> #include <vcl/GraphicObject.hxx> #include <vcl/svapp.hxx> #include <sfx2/linkmgr.hxx> -#include <sfx2/docfile.hxx> -#include <svx/svdetc.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <svx/svdpool.hxx> +#include <svx/svdhdl.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <svx/svdmrkv.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svdviter.hxx> -#include <svx/svdview.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <svx/xbtmpit.hxx> #include <svx/xfillit0.hxx> #include <svx/xflbmtit.hxx> -#include <svx/svdundo.hxx> #include "svdfmtf.hxx" #include <sdgcoitm.hxx> #include <svx/sdgcpitm.hxx> @@ -59,17 +46,12 @@ #include <svx/sdgluitm.hxx> #include <svx/sdgmoitm.hxx> #include <sdgtritm.hxx> -#include <editeng/eeitem.hxx> #include <sdr/properties/graphicproperties.hxx> #include <sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <osl/thread.hxx> #include <drawinglayer/processor2d/objectinfoextractor2d.hxx> #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> #include <memory> -#include <vcl/GraphicLoader.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 4121332d441c..1824546f5670 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -17,32 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/linkmgr.hxx> - -#include <unotools/datetime.hxx> - #include <svx/svdogrp.hxx> -#include <sfx2/lnkbase.hxx> - -#include <svl/urihelper.hxx> - -#include <svx/xpool.hxx> -#include <svx/xpoly.hxx> - #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> -#include <svx/svdetc.hxx> -#include <svx/svdoedge.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <svx/svxids.hrc> -#include <svl/whiter.hxx> -#include <svx/svdpool.hxx> #include <sdr/properties/groupproperties.hxx> #include <sdr/contact/viewcontactofgroup.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 18e964a01830..5a7c334b2132 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -30,7 +30,6 @@ #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> #include <editeng/measfld.hxx> -#include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <math.h> #include <svl/style.hxx> @@ -45,14 +44,10 @@ #include <svx/svdopath.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpage.hxx> -#include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> #include <svx/svdview.hxx> #include <svx/sxmbritm.hxx> -#include <sxmfsitm.hxx> -#include <sxmkitm.hxx> #include <svx/sxmlhitm.hxx> -#include <sxmoitm.hxx> #include <sxmsitm.hxx> #include <sxmtaitm.hxx> #include <svx/sxmtfitm.hxx> diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 2389504217f2..358ee9b2e4c8 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -22,12 +22,8 @@ #include <svx/svdomedia.hxx> #include <rtl/ustring.hxx> -#include <osl/file.hxx> #include <sal/log.hxx> -#include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/embed/XStorage.hpp> - #include <ucbhelper/content.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index fe137647b01b..8ff2f6a66aef 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -19,11 +19,10 @@ #include <svx/svdoole2.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/ObjectSaveVetoException.hpp> @@ -42,38 +41,28 @@ #include <cppuhelper/exc_hlp.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> -#include <vcl/graphicfilter.hxx> +#include <svtools/colorcfg.hxx> #include <svtools/embedhlp.hxx> #include <sfx2/objsh.hxx> #include <sfx2/ipclient.hxx> #include <sfx2/lnkbase.hxx> -#include <tools/stream.hxx> -#include <comphelper/anytostring.hxx> -#include <svx/svdpagv.hxx> #include <tools/debug.hxx> #include <tools/globname.hxx> #include <tools/diagnose_ex.h> -#include <vcl/jobset.hxx> #include <comphelper/classids.hxx> #include <sot/formats.hxx> -#include <vcl/transfer.hxx> #include <cppuhelper/implbase.hxx> -#include <svl/solar.hrc> -#include <svl/urihelper.hxx> #include <vcl/svapp.hxx> -#include <svx/charthelper.hxx> #include <svx/svdmodel.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <svx/svdetc.hxx> -#include <svx/svdview.hxx> #include <unomlstr.hxx> #include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdograf.hxx> @@ -90,7 +79,6 @@ #include <svx/svdpage.hxx> #include <rtl/ref.hxx> #include <bitmaps.hlst> -#include <sal/log.hxx> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 099a9455a7a4..a5fc10fb7e8d 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -21,14 +21,8 @@ #include <svx/svdopage.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <svx/svdtrans.hxx> -#include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svdoutl.hxx> -#include <svtools/colorcfg.hxx> -#include <svl/itemset.hxx> #include <sdr/properties/pageproperties.hxx> #include <sdr/contact/viewcontactofpageobj.hxx> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 320db90d0279..f179033b822f 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -21,24 +21,16 @@ #include <tools/helpers.hxx> #include <svx/svdopath.hxx> #include <math.h> -#include <svx/xpool.hxx> #include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> -#include <svx/svdetc.hxx> #include <svx/svddrag.hxx> #include <svx/svdmodel.hxx> -#include <svx/svdpage.hxx> #include <svx/svdhdl.hxx> #include <svx/svdview.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <svx/xlnwtit.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xflclit.hxx> -#include <svx/svdogrp.hxx> #include <svx/polypolygoneditor.hxx> -#include <svx/xlntrit.hxx> #include <sdr/contact/viewcontactofsdrpathobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index a451f49c14ca..3fdfeb035d39 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -18,30 +18,17 @@ */ #include <svx/svdorect.hxx> -#include <math.h> -#include <stdlib.h> -#include <svx/xpool.hxx> #include <svx/xpoly.hxx> -#include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> -#include <svx/svdetc.hxx> #include <svx/svddrag.hxx> #include <svx/svdmodel.hxx> -#include <svx/svdpage.hxx> -#include <svx/svdocapt.hxx> -#include <svx/svdpagv.hxx> #include <svx/svdview.hxx> -#include <svx/svdundo.hxx> #include <svx/svdopath.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <svx/xflclit.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xlnwtit.hxx> #include <sdr/properties/rectangleproperties.hxx> #include <sdr/contact/viewcontactofsdrrectobj.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> +#include <tools/debug.hxx> #include <vcl/ptrstyle.hxx> using namespace com::sun::star; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 3ef7839b9891..e43fdedae0cf 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -19,36 +19,23 @@ #include <comphelper/string.hxx> +#include <svl/stritem.hxx> #include <svx/svdotext.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svdview.hxx> #include <svx/svdpage.hxx> -#include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> -#include <svtools/colorcfg.hxx> #include <editeng/editdata.hxx> -#include <editeng/eeitem.hxx> #include <editeng/editstat.hxx> #include <editeng/outlobj.hxx> #include <editeng/editobj.hxx> #include <editeng/outliner.hxx> -#include <editeng/fhgtitem.hxx> #include <textchain.hxx> #include <textchainflow.hxx> -#include <svl/itempool.hxx> -#include <editeng/adjustitem.hxx> -#include <editeng/flditem.hxx> -#include <svx/xftouit.hxx> #include <tools/helpers.hxx> -#include <svx/xflgrit.hxx> -#include <svx/svdpool.hxx> -#include <svx/xflclit.hxx> -#include <svl/style.hxx> #include <svx/sderitm.hxx> #include <svx/sdooitm.hxx> #include <svx/sdshitm.hxx> @@ -56,15 +43,11 @@ #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> #include <svx/xtextit0.hxx> -#include <editeng/editeng.hxx> -#include <svl/itemiter.hxx> #include <sdr/properties/textproperties.hxx> -#include <vcl/metaact.hxx> #include <sdr/contact/viewcontactoftextobj.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <drawinglayer/geometry/viewinformation2d.hxx> +#include <vcl/gdimtf.hxx> #include <vcl/virdev.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <sal/log.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 9744d4a524c7..9f56c2730eb3 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -38,10 +38,7 @@ #include <editeng/eeitem.hxx> #include <editeng/editstat.hxx> #include <tools/helpers.hxx> -#include <svx/sdtfchim.hxx> #include <svl/itemset.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/animation/animationtiming.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/svapp.hxx> @@ -50,7 +47,6 @@ #include <editeng/flditem.hxx> #include <editeng/adjustitem.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> -#include <vcl/metaact.hxx> #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> @@ -58,8 +54,6 @@ #include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <editeng/outlobj.hxx> -#include <editeng/editobj.hxx> -#include <editeng/overflowingtxt.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <sal/log.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 7f04d0b6bfc9..a607d05c7800 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -24,19 +24,13 @@ #include <svx/svdoutl.hxx> #include <basegfx/vector/b2dvector.hxx> #include <sdr/primitive2d/sdrtextprimitive2d.hxx> -#include <basegfx/range/b2drange.hxx> -#include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <algorithm> -#include <xftshtit.hxx> -#include <vcl/virdev.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/BreakIterator.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#include <editeng/unolingu.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -44,16 +38,9 @@ // primitive decomposition helpers -#include <basegfx/polygon/b2dlinegeometry.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xlntrit.hxx> -#include <svx/xlnwtit.hxx> -#include <svx/xlinjoit.hxx> -#include <svx/xlndsit.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -#include <editeng/editstat.hxx> #include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <sdr/attribute/sdrformtextoutlineattribute.hxx> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 04b8de638f65..6f4559fd33ca 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -24,30 +24,13 @@ #include <svx/svdoutl.hxx> #include <svx/svdorect.hxx> #include <svx/svdocapt.hxx> -#include <svx/svdetc.hxx> -#include <editeng/writingmodeitem.hxx> #include <editeng/editdata.hxx> -#include <editeng/editeng.hxx> -#include <editeng/eeitem.hxx> -#include <editeng/flditem.hxx> #include <svx/sdtfchim.hxx> -#include <editeng/editview.hxx> -#include <svl/whiter.hxx> #include <editeng/outlobj.hxx> #include <editeng/outliner.hxx> #include <editeng/editobj.hxx> -#include <editeng/fhgtitem.hxx> - -#include <editeng/charscaleitem.hxx> -#include <svl/itemiter.hxx> -#include <editeng/lrspitem.hxx> -#include <svl/itempool.hxx> -#include <editeng/numitem.hxx> -#include <editeng/postitem.hxx> - -#include <set> namespace { // The style family which is appended to the style names is padded to this many characters. diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index fc90be9125a2..d108d17743b5 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -24,7 +24,6 @@ #include <editeng/editdata.hxx> #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> -#include <editeng/overflowingtxt.hxx> #include <editeng/editstat.hxx> #include <svl/itemset.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 4992c6017677..e2c7c7515959 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <editeng/eeitem.hxx> -#include <editeng/measfld.hxx> #include <svx/svdotext.hxx> bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_uInt16 /*nPos*/, diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index ac16847fbc34..8af1d8647abe 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -31,7 +31,6 @@ #include <sfx2/lnkbase.hxx> #include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> -#include <svl/urihelper.hxx> #include <tools/debug.hxx> #include <tools/tenccvt.hxx> #include <memory> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index f3fe7dfe0a69..4478324b4d5c 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -22,16 +22,12 @@ #include <svx/svdtrans.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> -#include <svx/svdoutl.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include <editeng/editdata.hxx> -#include <editeng/outliner.hxx> #include <sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svl/itemset.hxx> -#include <svx/svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 111aa5ed0cd5..915a387bebe2 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -20,35 +20,21 @@ #include <sdr/contact/viewcontactofunocontrol.hxx> #include <sdr/contact/viewobjectcontactofunocontrol.hxx> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> -#include <vcl/pdfextoutdevdata.hxx> #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> #include <svx/svdviter.hxx> #include <rtl/ref.hxx> -#include <set> #include <svx/sdrpagewindow.hxx> -#include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> -#include <svx/svdograf.hxx> #include <tools/debug.hxx> #include <o3tl/sorted_vector.hxx> diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index d283af395772..62aa7622c825 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -21,8 +21,6 @@ #include <editeng/outliner.hxx> #include <svx/svdotext.hxx> #include <editeng/editstat.hxx> -#include <svx/svdmodel.hxx> -#include <editeng/eeitem.hxx> #include <svl/itempool.hxx> #include <editeng/editview.hxx> diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 202f4632c542..24b64ac02f70 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -19,12 +19,8 @@ #include <svx/svdovirt.hxx> -#include <svx/xpool.hxx> -#include <svx/svdtrans.hxx> -#include <svx/svdetc.hxx> #include <svx/svdhdl.hxx> #include <svx/sdr/contact/viewcontactofvirtobj.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdograf.hxx> #include <svx/svddrgv.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 5ffb31cf0d13..10f7f2f36761 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -19,38 +19,30 @@ #include <memory> #include <cassert> +#include <set> #include <unordered_set> #include <svx/svdpage.hxx> #include <o3tl/safeint.hxx> -#include <sot/storage.hxx> -#include <comphelper/classids.hxx> -#include <svx/svdview.hxx> #include <string.h> -#include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <tools/helpers.hxx> +#include <svtools/colorcfg.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdogrp.hxx> -#include <svx/svdograf.hxx> #include <svx/svdoedge.hxx> #include <svx/svdoole2.hxx> #include <svx/svditer.hxx> #include <svx/svdmodel.hxx> #include <svx/svdlayer.hxx> -#include <svx/svdotext.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdundo.hxx> -#include <svx/fmglob.hxx> #include <svx/xfillit0.hxx> #include <svx/fmdpage.hxx> -#include <sfx2/objsh.hxx> #include <sdr/contact/viewcontactofsdrpage.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index ad8e3a94c295..215e37bc7c94 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -18,26 +18,14 @@ */ #include <svx/svdpagv.hxx> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <svx/svdoutl.hxx> -#include <svx/xpoly.hxx> -#include <svx/svdouno.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include <svx/svdedxv.hxx> -#include <editeng/outliner.hxx> -#include <svx/svdetc.hxx> #include <svx/svdobj.hxx> -#include <svx/svditer.hxx> #include <svx/svdogrp.hxx> #include <svx/svdtypes.hxx> -#include <svx/svdoole2.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/viewobjectcontactredirector.hxx> -#include <svx/fmview.hxx> #include <algorithm> diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index d9d2bde7c476..333b832190d6 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -24,16 +24,11 @@ #if HAVE_FEATURE_PDFIUM #include <fpdfview.h> #include <fpdf_edit.h> -#include <fpdf_save.h> #include <fpdf_text.h> -#include <vcl/bitmapaccess.hxx> #include <vcl/graph.hxx> -#include <editeng/editdata.hxx> #include <math.h> -#include <svx/xpoly.hxx> -#include <vcl/svapp.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/wghtitem.hxx> @@ -45,16 +40,12 @@ #include <svx/xlncapit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xflclit.hxx> -#include <svx/xgrad.hxx> -#include <svx/xflgrit.hxx> #include <editeng/fontitem.hxx> -#include <editeng/autokernitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> #include <vcl/metric.hxx> #include <editeng/charscaleitem.hxx> -#include <svx/xflhtit.hxx> #include <svx/sdtditm.hxx> #include <svx/sdtagitm.hxx> #include <svx/sdtfsitm.hxx> @@ -63,7 +54,6 @@ #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> -#include <svx/svdocirc.hxx> #include <svx/svdograf.hxx> #include <svx/svdopath.hxx> #include <svx/svdetc.hxx> @@ -77,17 +67,13 @@ #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <svx/xbtmpit.hxx> #include <svx/xfillit0.hxx> -#include <svx/xfltrit.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> #include <svx/xlineit0.hxx> -#include <svx/svdpntv.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> -#include <vcl/BitmapTools.hxx> #include <vcl/dibtools.hxx> -#include <com/sun/star/geometry/Matrix2D.hpp> #include <sal/log.hxx> namespace diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 181a2bfe1fdb..808d6a2a865a 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -18,10 +18,8 @@ */ #include <memory> -#include <com/sun/star/awt/XWindow.hpp> #include <svx/svdpntv.hxx> #include <vcl/weld.hxx> -#include <vcl/GraphicObject.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdmodel.hxx> @@ -29,18 +27,9 @@ #include <svx/svdpagv.hxx> #include <svl/hint.hxx> -#include <editeng/editdata.hxx> -#include <svx/svdmrkv.hxx> -#include <svx/svdundo.hxx> #include <svx/svdview.hxx> #include <svx/svdglue.hxx> #include <svx/svdobj.hxx> -#include <svx/svdograf.hxx> -#include <svx/svditer.hxx> -#include <svx/svdouno.hxx> -#include <svx/sdr/overlay/overlayobjectlist.hxx> -#include <sdr/overlay/overlayrollingrectangle.hxx> -#include <svx/sdr/overlay/overlaymanager.hxx> #include <sxlayitm.hxx> #include <svl/itemiter.hxx> #include <editeng/eeitem.hxx> @@ -48,18 +37,13 @@ #include <svl/style.hxx> #include <svx/sdrpagewindow.hxx> #include <vcl/svapp.hxx> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/XControl.hpp> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/animation/objectanimator.hxx> -#include <svx/sdr/contact/viewcontact.hxx> #include <drawinglayer/primitive2d/metafileprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <comphelper/lok.hxx> #include <svx/svdviter.hxx> -#include <sfx2/lokhelper.hxx> - using namespace ::com::sun::star; // interface to SdrPaintWindow diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 3994a06ad11c..804832e8bd3b 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -21,7 +21,6 @@ #include <svx/svdsnpv.hxx> #include <math.h> -#include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -30,7 +29,6 @@ #include <sdr/overlay/overlaycrosshair.hxx> #include <sdr/overlay/overlayhelpline.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdrpaintwindow.hxx> #include <tools/debug.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 231bfa69a161..1d5b3be5b240 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -22,8 +22,6 @@ #include <editeng/outlobj.hxx> #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> -#include <editeng/fhgtitem.hxx> -#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <libxml/xmlwriter.h> #include <memory> diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index a29142a4a734..980dbc970874 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -19,8 +19,6 @@ #include <com/sun/star/drawing/FillStyle.hpp> -#include <svl/lstner.hxx> - #include <svx/svdundo.hxx> #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> @@ -32,7 +30,6 @@ #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/scene3d.hxx> -#include <editeng/editdata.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> #include <sdr/properties/itemsettools.hxx> @@ -41,8 +38,6 @@ #include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> #include <svx/svdviter.hxx> -#include <svx/svdograf.hxx> -#include <sdr/contact/viewcontactofgraphic.hxx> #include <svx/svdotable.hxx> // #i124389# #include <vcl/svapp.hxx> #include <sfx2/viewsh.hxx> diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c85b3555b674..33cf89ab82c8 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <editeng/eeitem.hxx> #include <editeng/outlobj.hxx> #include <svx/strings.hrc> @@ -33,20 +32,16 @@ #include <svx/svdoutl.hxx> #include <svx/svdview.hxx> -#include <editeng/editview.hxx> #include <editeng/flditem.hxx> #include <svx/obj3d.hxx> #include <svx/svddrgmt.hxx> #include <svx/svdotable.hxx> #include <tools/debug.hxx> -#include <tools/tenccvt.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> -#include <svx/sdr/contact/viewcontact.hxx> -#include <drawinglayer/processor2d/contourextractor2d.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <sal/log.hxx> diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index dfc7f7d41531..8c4c2c970607 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -25,7 +25,6 @@ #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdsob.hxx> -#include <svx/sdrpaintwindow.hxx> void SdrViewIter::ImpInitVars() diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index f55e964a6223..1c5664a2602e 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -20,37 +20,27 @@ #include <vector> #include <unordered_set> #include <editeng/editdata.hxx> -#include <editeng/editeng.hxx> #include <rtl/strbuf.hxx> #include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> #include <svx/xlineit0.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> -#include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdorect.hxx> -#include <svx/svdoedge.hxx> #include <svx/svdopage.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> #include <svx/svdtrans.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> -#include <svx/xoutbmp.hxx> -#include <vcl/metaact.hxx> -#include <svl/poolitem.hxx> -#include <svl/itempool.hxx> #include <tools/bigint.hxx> -#include <sot/formats.hxx> #include <clonelist.hxx> #include <vcl/virdev.hxx> #include <svl/style.hxx> #include <fmobj.hxx> #include <vcl/vectorgraphicdata.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx index ce4e23902a68..32c1f9b4e373 100644 --- a/svx/source/svdraw/textchain.cxx +++ b/svx/source/svdraw/textchain.cxx @@ -19,7 +19,6 @@ #include <textchain.hxx> #include <svx/svdotext.hxx> -#include <svx/svdpage.hxx> /* * Definition of Properties Interface |