diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-05-01 22:12:48 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-05-10 09:14:59 +0200 |
commit | 4709cd82c7fa31eac7bbc9f1991968891080c5f8 (patch) | |
tree | 390750d73ef70bb51bfbc56331c8b1e24340a67a | |
parent | e16641769df8cb2631808acf43e0ee8bd31cb0f7 (diff) |
tdf#62699 Drop pass-through header file include/svx/svdattr.hxx
Change-Id: I04289589196ac69b31f75989d9252c79d03c890f
Reviewed-on: https://gerrit.libreoffice.org/71633
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
217 files changed, 374 insertions, 87 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 9ce77774b9c5..4c72d261dc3e 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -405,7 +405,6 @@ #include <svx/sdynitm.hxx> #include <svx/selectioncontroller.hxx> #include <svx/shapeproperty.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> #include <svx/svddrgv.hxx> diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 3cd6f788d309..357ea872b932 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> +#include <tools/debug.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <toolkit/awt/vclxfont.hxx> diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index b4258194464a..cd2501caa255 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/util/NumberFormatsSupplier.hpp> #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> +#include <tools/debug.hxx> #include <sfx2/viewfrm.hxx> #include <svl/itempool.hxx> #include <svx/sdrpaintwindow.hxx> diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 45a642fa116c..e53075bb1801 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -46,6 +46,7 @@ #include <o3tl/functional.hxx> #include <unotools/sharedunocomponent.hxx> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> namespace basctl { diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 955b87783d8c..ae4eacb5e821 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -35,6 +35,7 @@ #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/component_context.hxx> +#include <tools/debug.hxx> #include <svx/svditer.hxx> #include <svx/svdview.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index f1ab1084ed89..5a1f6c25ce43 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -27,6 +27,8 @@ #include <boost/optional.hpp> +#include <map> + namespace basctl { diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index a7b7ec2d9a0c..cb8f79c0d638 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -383,7 +383,6 @@ #include <svx/sdynitm.hxx> #include <svx/selectioncontroller.hxx> #include <svx/shapeproperty.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> #include <svx/svdedtv.hxx> diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index b92d9bb7e265..b3ddd8cb4635 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -66,6 +66,7 @@ #include <com/sun/star/chart2/XDataProviderAccess.hpp> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <svx/sidebar/SelectionChangeHandler.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 05b2eee17d32..6fc9eeb948a6 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -35,6 +35,7 @@ #include <svx/svxids.hrc> #include <svx/rectenum.hxx> #include <svl/aeitem.hxx> +#include <svl/intitem.hxx> #include <svx/svxdlg.hxx> #include <vcl/svapp.hxx> #include <memory> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index f22a24f66cbf..c55d0a004134 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -69,6 +69,7 @@ #include <svx/unoapi.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <memory> diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 592b1f952cb5..7a6a07b1ae41 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -41,6 +41,7 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xtable.hxx> +#include <svx/sdtagitm.hxx> #include <basegfx/polygon/b2dpolygon.hxx> using namespace ::com::sun::star; diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index d8865c43ce97..bbf746b49c6a 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -332,7 +332,6 @@ #include <svx/sdtmfitm.hxx> #include <svx/sdynitm.hxx> #include <svx/shapeproperty.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svdhlpln.hxx> #include <svx/svdoattr.hxx> diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 68f5913c1a2b..f6e5de27d0a5 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -20,6 +20,7 @@ #include <srchxtra.hxx> #include <sal/log.hxx> #include <svl/cjkoptions.hxx> +#include <svl/intitem.hxx> #include <svl/whiter.hxx> #include <sfx2/objsh.hxx> #include <svx/svxitems.hrc> @@ -29,6 +30,7 @@ #include <paragrph.hxx> #include <backgrnd.hxx> #include <svx/dialogs.hrc> +#include <tools/debug.hxx> #include <tools/resary.hxx> #include <rtl/strbuf.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 2b2bc55763e9..4a7339d4ee8b 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -20,7 +20,8 @@ #define INCLUDED_CUI_SOURCE_INC_TEXTANIM_HXX #include <sfx2/tabdlg.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdtakitm.hxx> +#include <svx/sdtaditm.hxx> #include <vcl/weld.hxx> class SdrView; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 6b8dac450be5..ef6f45014818 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -88,6 +88,7 @@ #include <sfx2/tplpitem.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> +#include <svl/intitem.hxx> #include <svl/languageoptions.hxx> #include <svtools/helpopt.hxx> #include <svtools/miscopt.hxx> diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index c4f77b1e9aa5..d21d046da82c 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -21,6 +21,7 @@ #include <border.hxx> #include <backgrnd.hxx> #include <svx/svxids.hrc> +#include <svl/intitem.hxx> #include <cuitabarea.hxx> SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent, diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index a55224f908cf..a20a38011869 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -28,7 +28,7 @@ #include <svx/svxids.hrc> #include <svx/dlgutil.hxx> #include <svx/ofaitem.hxx> -#include <svx/svdattr.hxx> + #include <svx/svdoedge.hxx> #include <svx/svdview.hxx> #include <svx/sxekitm.hxx> diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index bbc1513882fe..1fba56ea73d9 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -30,7 +30,6 @@ #include <svx/measctrl.hxx> #include <svx/ofaitem.hxx> #include <svx/strarray.hxx> -#include <svx/svdattr.hxx> #include <svx/svdomeas.hxx> #include <svx/svdview.hxx> #include <svx/sxekitm.hxx> diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index ab8644c3399d..bedbecfa9fa9 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -23,6 +23,7 @@ #include <svx/dlgutil.hxx> #include <svx/anchorid.hxx> #include <svl/aeitem.hxx> +#include <svl/intitem.hxx> #include <svx/swframevalidation.hxx> #include <sfx2/htmlmode.hxx> #include <svx/svdview.hxx> diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e802f1fede65..56f20d859fb4 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -27,6 +27,10 @@ #include <svx/dlgutil.hxx> #include <svx/svdmark.hxx> #include <svx/svdview.hxx> +#include <svx/sdtaaitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/sdtayitm.hxx> #include <svtools/unitconv.hxx> const sal_uInt16 SvxTextAnimationPage::pRanges[] = diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index ec2590fdc705..08c7b044a62f 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -20,6 +20,7 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <svx/svddef.hxx> +#include <svx/sdasitm.hxx> #include <svx/sdtditm.hxx> #include <svx/sdtagitm.hxx> #include <svx/sdtaitm.hxx> diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 975279eede8d..f3ff007461cf 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -27,7 +27,6 @@ #include <svx/xpool.hxx> #include <svx/xflbckit.hxx> -#include <svx/svdattr.hxx> #include <svx/xtable.hxx> #include <svx/xlineit0.hxx> #include <svx/drawitem.hxx> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 6f894004b297..f291b1bdf48a 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -28,7 +28,6 @@ #include <svx/xpool.hxx> #include <strings.hrc> #include <svx/xflbckit.hxx> -#include <svx/svdattr.hxx> #include <svx/xtable.hxx> #include <svx/xlineit0.hxx> #include <svx/drawitem.hxx> diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index a35b0cd04aae..8b637cd5cea7 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -29,7 +29,13 @@ #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xpool.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdooitm.hxx> +#include <svx/sdprcitm.hxx> +#include <svx/sdshcitm.hxx> +#include <svx/sdshitm.hxx> +#include <svx/sdshtitm.hxx> +#include <svx/sdsxyitm.hxx> #include <svx/drawitem.hxx> #include <svx/xfltrit.hxx> #include <cuitabarea.hxx> diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index f73890384e06..f31484ad4009 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -32,7 +32,7 @@ #include <svx/xbtmpit.hxx> #include <svx/xpool.hxx> #include <svx/xflbckit.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdshtitm.hxx> #include <svx/xtable.hxx> #include <svx/xlineit0.hxx> #include <svx/drawitem.hxx> diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index a34a47cf1847..9fcefe8caf11 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -29,6 +29,7 @@ #include <svx/svdoashp.hxx> #include <svx/svdoole2.hxx> #include <svx/svdmodel.hxx> +#include <svx/sdtfsitm.hxx> #include <editeng/outlobj.hxx> #include <vcl/gradient.hxx> #include <vcl/graph.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 0d2f2b1fb99a..a5af9d164d1d 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -132,6 +132,18 @@ #include <svx/xlnedit.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnedcit.hxx> +#include <svx/sdasitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdshcitm.hxx> +#include <svx/sdshcitm.hxx> +#include <svx/sdshitm.hxx> +#include <svx/sdshtitm.hxx> +#include <svx/sdsxyitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtcfitm.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtfsitm.hxx> +#include <svx/sdtmfitm.hxx> #include <filter/msfilter/classids.hxx> #include <filter/msfilter/msdffimp.hxx> #include <editeng/outliner.hxx> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index aae8b9edc140..1d2f3695e9ce 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -59,7 +59,12 @@ #include <svx/xfltrit.hxx> #include <editeng/outlobj.hxx> #include <editeng/numdef.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdasitm.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtfsitm.hxx> +#include <svx/sdtmfitm.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/svdetc.hxx> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 46e8ce4cd1d4..66ece98b9e8b 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -47,6 +47,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <i18nlangtag/lang.h> #include <svl/zforlist.hxx> +#include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 183e3eb94ef4..e0bab819e85b 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -49,6 +49,7 @@ #include <unotools/mediadescriptor.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> +#include <tools/debug.hxx> #include <tools/zcodec.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> diff --git a/include/svx/svdattr.hxx b/include/svx/svdattr.hxx deleted file mode 100644 index 85ab6711f9f8..000000000000 --- a/include/svx/svdattr.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SVX_SVDATTR_HXX -#define INCLUDED_SVX_SVDATTR_HXX - -#include <svl/solar.hrc> -#include <svx/sdangitm.hxx> -#include <svx/sderitm.hxx> -#include <svx/sdmetitm.hxx> -#include <svx/sdooitm.hxx> -#include <svx/sdprcitm.hxx> -#include <svx/sdshcitm.hxx> -#include <svx/sdshitm.hxx> -#include <svx/sdshtitm.hxx> -#include <svx/sdsxyitm.hxx> -#include <svx/sdtaaitm.hxx> -#include <svx/sdtacitm.hxx> -#include <svx/sdtaditm.hxx> -#include <svx/sdtagitm.hxx> -#include <svx/sdtaiitm.hxx> -#include <svx/sdtaitm.hxx> -#include <svx/sdtakitm.hxx> -#include <svx/sdtayitm.hxx> -#include <svx/sdtcfitm.hxx> -#include <svx/sdtditm.hxx> -#include <svx/sdtfsitm.hxx> -#include <svx/sdtmfitm.hxx> -#include <svx/sdynitm.hxx> -#include <svx/sdgluitm.hxx> -#include <svx/sdginitm.hxx> -#include <svx/sdgtritm.hxx> -#include <svx/sdgcoitm.hxx> -#include <svx/sdggaitm.hxx> -#include <svx/sdasitm.hxx> -#include <svx/sdgmoitm.hxx> -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index ae05a2d3c28c..0378eb392e10 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -136,6 +136,7 @@ class SdrTransformRef2XItem; class SdrTransformRef2YItem; class SdrVertShearAllItem; class SdrVertShearOneItem; +class SdrYesNoItem; class SfxBoolItem; class SfxStringItem; class SfxVoidItem; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 325f91ca653e..a8e77e4ed285 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVX_SVDHDL_HXX #include <tools/gen.hxx> +#include <vcl/graph.hxx> #include <svl/solar.hrc> diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 29622d0a9e89..bfab6084fcc2 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -25,7 +25,6 @@ #include <svx/xlineit0.hxx> #include <svx/xlnasit.hxx> #include <svx/svdobj.hxx> -#include <svx/svdattr.hxx> #include <svx/svxdllapi.h> // Initial Declarations diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index c5dfdda2ea2b..9be379430316 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -28,6 +28,7 @@ class Graphic; namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } } +namespace com::sun::star::graphic { class XGraphic; } class SVX_DLLPUBLIC SdrMediaObj final : public SdrRectObj diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index c87444c5fe4a..218fe94e8185 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -23,6 +23,9 @@ #include <vcl/field.hxx> #include <svx/itextprovider.hxx> #include <svx/svdoattr.hxx> +#include <svx/sdtaitm.hxx> +#include <svx/sdtakitm.hxx> +#include <svx/sdtaditm.hxx> #include <svx/svdtrans.hxx> #include <tools/datetime.hxx> #include <svl/style.hxx> @@ -35,6 +38,7 @@ #include <memory> #include <vector> +#include <com/sun/star/drawing/TextFitToSizeType.hpp> // forward declarations diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 9eed6c69e261..0ffae0d5e236 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -34,6 +34,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <svx/svdotext.hxx> #include <svx/svdograf.hxx> +#include <svx/sdmetitm.hxx> #include <vcl/cvtgrf.hxx> #include <filter/msfilter/msdffimp.hxx> #include <filter/msfilter/util.hxx> diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index bc4e77818e18..c12b8b9025c5 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -72,6 +72,7 @@ #include <svx/EnhancedCustomShapeTypeNames.hxx> #include <svx/unoapi.hxx> #include <svx/svdoashp.hxx> +#include <svx/sdtagitm.hxx> #include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index f300b58a2dfb..fdaf799f7285 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -33,6 +33,8 @@ #include <svx/svdogrp.hxx> #include <svx/svdoashp.hxx> +#include <map> + namespace rptui { typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap; diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 72844185858e..bb8c625e1dad 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -424,7 +424,6 @@ #include <svx/sdynitm.hxx> #include <svx/selectioncontroller.hxx> #include <svx/shapeproperty.hxx> -#include <svx/svdattr.hxx> #include <svx/svdcrtv.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 6f409a769baa..c55bf8b5210f 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -38,6 +38,7 @@ #include <connectivity/dbtools.hxx> #include <svl/hint.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <dbaccess/dbsubcomponentcontroller.hxx> diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 909376cd21be..73de1d115c24 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -37,6 +37,7 @@ #include <svx/svxids.hrc> #include <svx/svditer.hxx> #include <svx/dbaexchange.hxx> +#include <svx/sdtagitm.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 3801ff99c443..26048f9ecb67 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -402,7 +402,6 @@ #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> #include <svx/sdynitm.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> #include <svx/svdedtv.hxx> diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index cc23c7a207f5..083319ba316d 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -25,6 +25,8 @@ #include <cppunit/AdditionalMessage.h> #include <sal/log.hxx> #include <sfx2/sfxsids.hrc> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <svl/gridprinter.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 326966e940af..4e0c99ad5f97 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -22,6 +22,7 @@ #include <osl/conditn.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <svl/stritem.hxx> #include <comphelper/lok.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 5e515c80abd9..a18b642b94dd 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -35,6 +35,7 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdundo.hxx> +#include <svx/sdsxyitm.hxx> #include <svx/svxids.hrc> #include <i18nlangtag/mslangid.hxx> #include <editeng/unolingu.hxx> diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 850ecafa46a3..d2142f84747c 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -37,6 +37,9 @@ #include <svx/xflclit.hxx> #include <svx/sdshitm.hxx> #include <svx/sdsxyitm.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtmfitm.hxx> #include <tools/gen.hxx> #include <document.hxx> diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 16cb31855212..9d52ba167d4c 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -43,6 +43,7 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xtable.hxx> +#include <svx/sdtagitm.hxx> #include <editeng/outliner.hxx> #include <editeng/editobj.hxx> #include <svx/sxcecitm.hxx> diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 635bad45ecce..43c6fb3aa788 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -75,6 +75,12 @@ #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> +#include <svx/sdasitm.hxx> +#include <svx/sdshcitm.hxx> +#include <svx/sdshitm.hxx> +#include <svx/sdsxyitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtditm.hxx> #include <editeng/eeitem.hxx> #include <svx/xflclit.hxx> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 549231097045..8d10df639169 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -38,6 +38,7 @@ using namespace ::com::sun::star; #include <basic/sberrors.hxx> #include <svtools/sfxecode.hxx> #include <svx/ofaitem.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index f735e56ef082..87777cf184a9 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -37,6 +37,7 @@ #include <editeng/ulspitem.hxx> #include <svx/hlnkitem.hxx> #include <svx/svdoutl.hxx> +#include <svx/sdooitm.hxx> #include <editeng/postitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/shdditem.hxx> @@ -50,6 +51,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/cliplistener.hxx> #include <vcl/transfer.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <svl/languageoptions.hxx> diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 3ed220a31352..2459720c251a 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -23,6 +23,7 @@ #include <sfx2/request.hxx> #include <svx/fmmodel.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> #include <editeng/eeitem.hxx> diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index f1a4afcd91c4..5405ca2c608a 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -23,6 +23,7 @@ #include <svx/sdtaaitm.hxx> #include <svx/sdtacitm.hxx> #include <svx/svdotext.hxx> +#include <svx/sdtagitm.hxx> #include <editeng/unolingu.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 9c1f1b0f2f5b..5cf59a1ed809 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -28,6 +28,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svl/whiter.hxx> +#include <svl/stritem.hxx> #include "imapwrap.hxx" #include <tabvwsh.hxx> diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 5de00a5f2a1f..7073b4a42d43 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -27,6 +27,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <basic/sbxcore.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index b632d401d122..9fbc5b49e886 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -21,6 +21,7 @@ #include <svx/svdocapt.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <svl/stritem.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <editeng/editview.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index f47173587ddb..1ee750c66cf6 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -313,7 +313,6 @@ #include <svx/sdtmfitm.hxx> #include <svx/sdynitm.hxx> #include <svx/shapeproperty.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svdhlpln.hxx> #include <svx/svdoattr.hxx> diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 84e42ad42ff7..fce330067d9f 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -22,6 +22,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/sfxdlg.hxx> #include <sfx2/sfxmodelfactory.hxx> +#include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/aeitem.hxx> #include <editeng/colritem.hxx> diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 25cd15c63131..9c7b6381e56d 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -36,6 +36,8 @@ #include <svx/svdomedia.hxx> #include <svx/svdoole2.hxx> #include <svx/xflclit.hxx> +#include <svx/sdooitm.hxx> +#include <svx/sdmetitm.hxx> #include <animations/animationnodehelper.hxx> #include <unotools/mediadescriptor.hxx> #include <rtl/ustring.hxx> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 566818755c5b..5423296ec30e 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -41,6 +41,9 @@ #include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> +#include <svx/sdasitm.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdooitm.hxx> #include <animations/animationnodehelper.hxx> #include <sax/tools/converter.hxx> diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 2c177c199675..a35fdc6bf785 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -33,6 +33,8 @@ #include <sfx2/viewfrm.hxx> #include <svl/srchitem.hxx> #include <svl/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <comphelper/lok.hxx> #include <svx/svdotable.hxx> #include <svx/svdoutl.hxx> diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 97199978cec1..2a633f17de8a 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/animations/AnimationFill.hpp> #include <com/sun/star/animations/XAnimate.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <tools/debug.hxx> #include <svx/unoshape.hxx> #include <svx/svdotext.hxx> #include <svx/svdopath.hxx> diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 8647f74846ad..d2d7d4c713c2 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -30,6 +30,7 @@ #include <svl/srchitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/scriptspaceitem.hxx> +#include <tools/debug.hxx> #include <unotools/configmgr.hxx> #include <unotools/useroptions.hxx> diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index ba420d20ab03..8638ec8a00b6 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -20,6 +20,7 @@ #include <vcl/settings.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <sfx2/printer.hxx> #include <sfx2/viewsh.hxx> #include <editeng/paperinf.hxx> diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 17ac70da7b2a..b6721acbc0e6 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -24,6 +24,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/app.hxx> #include <svl/itemset.hxx> +#include <tools/debug.hxx> #include <sfx2/fcontnr.hxx> #include <svl/style.hxx> diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 1018cf763f96..0a07572a7511 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -81,6 +81,11 @@ #include <svx/xlnclit.hxx> #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> +#include <svx/sdsxyitm.hxx> +#include <svx/sdshcitm.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtaitm.hxx> +#include <svx/sdynitm.hxx> #include <editeng/numitem.hxx> #include <editeng/unolingu.hxx> #include <svl/itempool.hxx> diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e37602afcf9e..1735104c4089 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -45,6 +45,9 @@ #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svditer.hxx> #include <svx/svdlayer.hxx> +#include <svx/sdtmfitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtcfitm.hxx> #include <com/sun/star/animations/XAnimationNode.hpp> #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 393160b81926..3ad8f1aa788d 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -42,6 +42,11 @@ #include <svx/unoshprp.hxx> #include <svx/unoshape.hxx> #include <svx/svdpool.hxx> +#include <svx/sdtaaitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtayitm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/xit.hxx> #include <tools/diagnose_ex.h> #include <stlsheet.hxx> #include <sdresid.hxx> diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index e4d93e580e4b..9af99eb5a7e8 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/debug.hxx> #include <undo/undoobjects.hxx> #include <sdpage.hxx> #include <CustomAnimationEffect.hxx> diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 301eca27213c..7b7bb2f9d1bb 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -60,6 +60,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <drawdoc.hxx> diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index ff513074f61a..1e1ba2722922 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -28,7 +28,11 @@ #include <sfx2/docfile.hxx> #include <svx/svdograf.hxx> #include <svx/svdlayer.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdtmfitm.hxx> +#include <svx/sdtagitm.hxx> #include <svl/style.hxx> +#include <svl/intitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> #include <svx/svdoutl.hxx> @@ -45,6 +49,7 @@ #include <stlpool.hxx> #include <anminfo.hxx> #include <svx/gallery.hxx> +#include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <svx/svdopage.hxx> #include <svx/svdomedia.hxx> diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index e4f0db29015d..ba1d4a725a51 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -54,6 +54,7 @@ #include <oox/ppt/pptfilterhelpers.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> +#include <tools/debug.hxx> #include <svx/svdotext.hxx> #include <editeng/outlobj.hxx> diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index ff99f940c8bf..ae783b311a29 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <sfx2/objsh.hxx> +#include <tools/debug.hxx> #include <cppuhelper/queryinterface.hxx> #include <svx/svdobj.hxx> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index ae7ae8d9d45e..a9d7ca12e4fd 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -32,6 +32,7 @@ #include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <svx/AccessibleShape.hxx> #include <svx/ChildrenManager.hxx> diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 6f0a3efbd62e..20248f664f5e 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -46,6 +46,7 @@ #include <svtools/ctrlbox.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/objsh.hxx> +#include <tools/debug.hxx> #include <editeng/flstitem.hxx> diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 9e34ada5d8d1..c5b0385b56f8 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -38,6 +38,7 @@ #include <comphelper/processfactory.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <tools/debug.hxx> #include "STLPropertySet.hxx" #include "CustomAnimationPane.hxx" #include "CustomAnimationDialog.hxx" diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index fe8ee55e3344..64de1149578e 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -34,6 +34,7 @@ #include <EventMultiplexer.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <svx/gallery.hxx> #include <vcl/layout.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 4a112b0d6c7f..ac07ef84594a 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -30,6 +30,7 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svddrgmt.hxx> +#include <tools/debug.hxx> #include <View.hxx> #include <sdresid.hxx> diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index c77e01990245..8dec8fc79e2d 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -22,6 +22,7 @@ #include <o3tl/any.hxx> #include <svx/svdmodel.hxx> #include <svx/svxids.hrc> +#include <tools/debug.hxx> #include <tools/helpers.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 20c60e5f87c4..2949cdad454d 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -18,6 +18,7 @@ */ #include <svl/lckbitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index fd57e3f4cc14..49f98e184bf3 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -19,6 +19,7 @@ #include <time.h> #include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 15e2f1933a35..7d747ba8675e 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -21,6 +21,7 @@ #include <svx/colorbox.hxx> #include <sfx2/module.hxx> #include <svx/xcolit.hxx> +#include <svl/intitem.hxx> #include <unotools/viewoptions.hxx> #include <svtools/unitconv.hxx> diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index a019f5da544f..f62057f8ce41 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -25,6 +25,7 @@ #include <editeng/numitem.hxx> +#include <tools/debug.hxx> #include <svx/dialogs.hrc> #include <svx/svdmark.hxx> #include <View.hxx> diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index a101c6973241..001db4635141 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -18,9 +18,11 @@ */ #include <svx/svxids.hrc> +#include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svl/aeitem.hxx> #include <svtools/unitconv.hxx> +#include <tools/debug.hxx> #include <sdattr.hrc> #include <View.hxx> diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b51ef75bb3c6..4e88df4262ff 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -25,6 +25,7 @@ #include <editeng/editeng.hxx> #include <editeng/outlobj.hxx> #include <sfx2/viewfrm.hxx> +#include <tools/debug.hxx> #include <vcl/button.hxx> #include <vcl/edit.hxx> diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 723c5dc70e8f..5edca44aa8a3 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -31,11 +31,13 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/strings.hrc> +#include <tools/debug.hxx> #include <vcl/waitobj.hxx> #include <sfx2/app.hxx> #include <unotools/pathoptions.hxx> #include <svx/svdograf.hxx> #include <svl/aeitem.hxx> +#include <svl/stritem.hxx> #include <svx/svdoole2.hxx> #include <sfx2/docfile.hxx> #include <svx/xtable.hxx> diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index fac60d97e850..92e1024158fd 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -36,6 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <rtl/character.hxx> +#include <tools/debug.hxx> namespace sd { diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 32f55f5a02b4..5cbb20d429ea 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -23,6 +23,7 @@ #include <svx/svxids.hrc> #include <svx/ofaitem.hxx> +#include <svl/stritem.hxx> #include <svl/srchitem.hxx> #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index b21dd27ab9d6..5b5ddfdce17e 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -39,6 +39,7 @@ #include <sfx2/dispatch.hxx> #include <svl/whiter.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <svtools/ctrltool.hxx> #include <svtools/langtab.hxx> #include <comphelper/classids.hxx> diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index 11a0eaa3deb7..41c3f73406ea 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -19,6 +19,7 @@ #include <Client.hxx> #include <svx/svdoole2.hxx> +#include <tools/debug.hxx> #include <ViewShell.hxx> #include <View.hxx> diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 1f2e1c9877ff..3711d87c0ec9 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -36,6 +36,8 @@ #include <sfx2/request.hxx> #include <svl/ctloptions.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> +#include <tools/debug.hxx> #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 5c5a0a7f0203..a406b5819d82 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -35,6 +35,7 @@ #include <ToolBarManager.hxx> #include <svx/gallery.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <View.hxx> #include <Window.hxx> diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 6cf702a5d4c9..0963f9e5de47 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -45,6 +45,8 @@ #include <svx/xtable.hxx> #include <svx/xfltrit.hxx> #include <svx/xflclit.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtditm.hxx> #include <svx/svdocapt.hxx> diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index d5ab09812688..e4eb8b3eda5f 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -25,6 +25,7 @@ #include <svx/xfillit0.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <tools/debug.hxx> #include <app.hrc> #include <strings.hrc> diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 69298c352a86..32b682e01db0 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -19,6 +19,7 @@ #include <fucopy.hxx> #include <sfx2/progress.hxx> +#include <svl/intitem.hxx> #include <sdattr.hrc> #include <sdresid.hxx> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index d0093616d858..3ce7708cb4f9 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <svl/stritem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/msg.hxx> diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index a105c95275f6..7f8b9302f23e 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -27,7 +27,9 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/sfxdlg.hxx> #include <svl/aeitem.hxx> +#include <svl/stritem.hxx> #include <svx/svdopath.hxx> +#include <tools/debug.hxx> #include <strings.hrc> #include <drawdoc.hxx> diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 6680ebfc4761..7c1322b7673f 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -19,6 +19,7 @@ #include <fuolbull.hxx> #include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <editeng/outliner.hxx> #include <editeng/eeitem.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 9131de20c4d8..2364f2c14d51 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -25,6 +25,8 @@ #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> +#include <tools/debug.hxx> +#include <svl/stritem.hxx> #include <svx/svxids.hrc> #include <app.hrc> diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 06480b5bf6a3..6a455f5d1e87 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -27,6 +27,7 @@ #include <editeng/editdata.hxx> #include <editeng/lrspitem.hxx> #include <svx/svdoutl.hxx> +#include <svl/intitem.hxx> #include <View.hxx> #include <ViewShell.hxx> diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index f1c7154d45d1..da06f2add357 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -27,6 +27,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> +#include <svl/stritem.hxx> #include <app.hrc> #include <fusel.hxx> diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index a0a7e399fd68..08b608717e63 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -22,6 +22,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> +#include <svl/stritem.hxx> #include <sdattr.hrc> #include <drawdoc.hxx> diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 03eb1d8462b5..cabd3cff40fc 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -19,9 +19,11 @@ #include <fuprobjs.hxx> +#include <svl/stritem.hxx> #include <svl/style.hxx> #include <editeng/outliner.hxx> #include <svl/hint.hxx> +#include <tools/debug.hxx> #include <app.hrc> diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index ea8d0bc035d5..5e11089d84ff 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -19,6 +19,7 @@ #include <fusnapln.hxx> #include <svl/aeitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svx/svxids.hrc> diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 5d918ddbd193..ad6651453c9a 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -35,6 +35,7 @@ #include <editeng/brushitem.hxx> #include <svx/svditer.hxx> #include <svx/sdr/properties/properties.hxx> +#include <svl/intitem.hxx> #include <sfx2/viewfrm.hxx> #include <svx/xlndsit.hxx> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 0650d033290e..e4582497a8d3 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -21,14 +21,19 @@ #include <editeng/eeitem.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> +#include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> #include <editeng/fhgtitem.hxx> #include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <svx/svdotext.hxx> #include <editeng/flditem.hxx> #include <svl/style.hxx> #include <svx/svdpagv.hxx> +#include <svx/sdtmfitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtfsitm.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 75926c3c46b1..e30ac5e2ea5e 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -23,6 +23,7 @@ #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> #include <editeng/eeitem.hxx> +#include <tools/debug.hxx> #include <svx/svxerr.hxx> #include <svx/dialmgr.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index f7d648108d77..072f95a4ddc7 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -49,6 +49,8 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svl/languageoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <vcl/commandevent.hxx> #include <vcl/image.hxx> #include <vcl/floatwin.hxx> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 5fec836f5090..93a07f9ed637 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -30,6 +30,7 @@ #include <vcl/wrkwin.hxx> #include <svx/svdpool.hxx> #include <svl/itemprop.hxx> +#include <tools/debug.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index e7562b170e53..c8ec19cdaecd 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/presentation/SlideShow.hpp> #include <com/sun/star/media/XPlayer.hpp> #include <svl/aeitem.hxx> +#include <svl/stritem.hxx> #include <svl/urihelper.hxx> #include <unotools/saveopt.hxx> #include <basic/sbstar.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 2ca2e62d46c7..604b4e609b01 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/frame/FrameActionEvent.hpp> #include <com/sun/star/frame/FrameAction.hpp> #include <sfx2/viewfrm.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star::accessibility; diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 145313679a1a..327acbb0e16e 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -37,6 +37,7 @@ #include <ViewShellBase.hxx> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <tools/debug.hxx> #include <memory> using namespace ::com::sun::star; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 5009238fb57e..8ab8161f09cf 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -34,6 +34,7 @@ #include <ViewShellManager.hxx> #include <Window.hxx> +#include <tools/debug.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index d764c4299900..5b7faa4f1e74 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -31,7 +31,9 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> +#include <tools/debug.hxx> #include <svl/style.hxx> +#include <svl/stritem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 339f2cc76e41..4d15f465510a 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -43,6 +43,9 @@ #include <svx/svxdlg.hxx> #include <svl/itempool.hxx> +#include <svl/intitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index d3b6aed2da73..2b14ed74fcf3 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -28,6 +28,7 @@ #include <vcl/EnumContext.hxx> #include <svl/whiter.hxx> #include <svl/itempool.hxx> +#include <svl/intitem.hxx> #include <svx/svdomedia.hxx> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <svx/svxdlg.hxx> diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 8e44502e341a..23f8e8ac1767 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -26,6 +26,7 @@ #include <SlideSorterViewShell.hxx> #include <framework/FrameworkHelper.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 91590534edf3..10941c629d07 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -127,6 +127,7 @@ #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx> #include <sfx2/lokcharthelper.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #define TWIPS_PER_PIXEL 15 diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 71a9c0130085..4ee7abb1e749 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -59,6 +59,7 @@ #include <svx/svdogrp.hxx> #include <o3tl/typed_flags_set.hxx> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <anminfo.hxx> #include "unoobj.hxx" diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 7be7281816bf..7417a781e369 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -27,6 +27,7 @@ #include <svx/svdpool.hxx> #include <svx/unoprov.hxx> #include <editeng/unotext.hxx> +#include <tools/debug.hxx> #include <unoprnms.hxx> #include <unosrch.hxx> diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index b161e0c8b335..a98ad3cd0065 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -24,6 +24,7 @@ #include <vcl/svapp.hxx> #include <svl/srchitem.hxx> +#include <svl/intitem.hxx> #include <editeng/colritem.hxx> #include <editeng/eeitem.hxx> #include <editeng/editstat.hxx> @@ -48,6 +49,7 @@ #include <vcl/metric.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/langtab.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <strings.hrc> diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index f4a8cb06460d..63e4288b7009 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -22,6 +22,7 @@ #include <svx/svditer.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <tools/debug.hxx> #include <Outliner.hxx> #include <drawdoc.hxx> diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 0ce566462a5b..5010323ee51f 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -43,6 +43,7 @@ #include <svx/svxids.hrc> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> +#include <tools/debug.hxx> #include <tools/link.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index ee999b73926b..b6d4369cfc91 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -48,6 +48,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svl/aeitem.hxx> +#include <svl/intitem.hxx> #include <svx/imapdlg.hxx> #include <basic/sbstar.hxx> #include <basic/sberrors.hxx> diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 629cecbecfd3..fb89f6290d6f 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -34,6 +34,7 @@ #include <sfx2/app.hxx> #include <svl/whiter.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <svl/style.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 1ac63a5029a9..e72080fe00fd 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -45,6 +45,7 @@ #include <svx/fmglob.hxx> #include <editeng/outliner.hxx> #include <svx/dialogs.hrc> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <view/viewoverlaymanager.hxx> diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 7eaf561e3eb9..391bff60b99b 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -91,6 +91,7 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> +#include <svx/sdtfsitm.hxx> #include <tools/diagnose_ex.h> diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 30495a1e3b5a..b478b6d93658 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -50,6 +50,7 @@ #include <svx/fmshell.hxx> #include <svx/f3dchild.hxx> #include <svx/float3d.hxx> +#include <svx/sdmetitm.hxx> #include <optsitem.hxx> #include <app.hrc> diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index fee45c5cedca..31bcd12d03b9 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -22,6 +22,9 @@ #include <DrawViewShell.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> + +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 8bcab029e914..8326b87438d9 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -37,6 +37,7 @@ #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> #include <avmedia/mediaplayer.hxx> +#include <svl/intitem.hxx> #include <app.hrc> #include <strings.hrc> diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 7d39044eaf97..e0a0e031f89f 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -29,6 +29,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/whiter.hxx> #include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index d43c40cd764f..7a5eeb2f4dfd 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -29,6 +29,7 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/sxelditm.hxx> +#include <svx/sdtfsitm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <svx/svdopath.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 85ab5688c609..0f8edde16318 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -47,6 +47,7 @@ #include <vcl/settings.hxx> #include <sal/log.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <editeng/editstat.hxx> #include <svl/itempool.hxx> diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 01b495295546..06840e6345c5 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -43,6 +43,7 @@ #include <uiobject.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index af7c753836c7..06272b0b8d9b 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -22,6 +22,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/svdviter.hxx> #include <svx/svdview.hxx> +#include <tools/debug.hxx> #include <strings.hrc> #include <strings.hxx> diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 09b321866f2e..8679f069b734 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -88,6 +88,7 @@ #include <editeng/eeitem.hxx> #include <editeng/editview.hxx> #include <editeng/editeng.hxx> +#include <svl/intitem.hxx> #include <svl/poolitem.hxx> #include <strings.hxx> #include <sdmod.hxx> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index fddf9d1fe280..05d5c2437b37 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7307,7 +7307,6 @@ include/svx/sphere3d.hxx include/svx/srchdlg.hxx include/svx/stddlg.hxx include/svx/strarray.hxx -include/svx/svdattr.hxx include/svx/svdcrtv.hxx include/svx/svddef.hxx include/svx/svddrag.hxx diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index d2d6dd8cc6a7..ecbe9cfb7e6d 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -453,7 +453,6 @@ #include <svx/sdtfchim.hxx> #include <svx/selectioncontroller.hxx> #include <svx/sphere3d.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> #include <svx/svdedtv.hxx> diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 2a18c84d3d1e..e570bcb68bce 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -49,6 +49,7 @@ #include <svx/strings.hrc> #include <vcl/svapp.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <algorithm> using namespace ::accessibility; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 6641c3f78d0d..288d2c3c362f 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -69,6 +69,7 @@ #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 5d540525a550..9a8d1ef41975 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -45,6 +45,7 @@ #include <svx/xbtmpit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> +#include <svx/sdshitm.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 3310dcdd343f..e91751e0ed2c 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -38,6 +38,7 @@ #include <svx/EnhancedCustomShapeTypeNames.hxx> #include <svx/svdorect.hxx> #include <svx/svdoashp.hxx> +#include <svx/sdshitm.hxx> #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <editeng/editobj.hxx> diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 8fe40b56cc16..13b9c6143040 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -26,6 +26,7 @@ #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <svx/graphctl.hxx> #include <GraphCtlAccessibleContext.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index ccc7e2533e41..0ece8d22af00 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -39,6 +39,7 @@ #include <editeng/eeitem.hxx> #include <svl/style.hxx> #include <svx/dlgutil.hxx> +#include <svx/sdshitm.hxx> #include <svx/dialmgr.hxx> #include <svx/viewpt3d.hxx> diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 4ddce132a7fe..f743c58fd67b 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -22,7 +22,6 @@ #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/svdview.hxx> -#include <svx/svdattr.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 22e77a5f28fa..390a4a7eabc6 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -40,6 +40,7 @@ #include <comphelper/processfactory.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star::io; diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 8002617b9a29..f33b1e63ed57 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -40,6 +40,7 @@ #include <svx/fmglob.hxx> #include <svx/fmpage.hxx> #include <svx/fmmodel.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/stdtext.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 5d0408b1e74d..c99c84569cbf 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -42,6 +42,7 @@ #include <svl/whiter.hxx> #include <sfx2/app.hxx> #include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <svl/visitem.hxx> #include <unotools/moduleoptions.hxx> #include <sfx2/objface.hxx> diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index ee980860b830..397b5efc5f45 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -46,6 +46,7 @@ #include <svx/fmtools.hxx> #include <svl/macitem.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index fd632773be70..256aa005528b 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -58,6 +58,7 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/stdtext.hxx> #include <svx/fmglob.hxx> diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index bcb52c652096..99ae528c5282 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -77,6 +77,7 @@ #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <unotools/moduleoptions.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 61814a2cd586..f9f7db118822 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -21,7 +21,6 @@ #include <o3tl/any.hxx> #include <svx/sdasitm.hxx> -#include <svx/svdattr.hxx> using namespace ::std; using namespace com::sun::star; diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 80b575585db9..1f530dbb5683 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -20,8 +20,15 @@ #include <sdr/contact/viewcontactofgraphic.hxx> #include <sdr/contact/viewobjectcontactofgraphic.hxx> #include <svx/svdograf.hxx> +#include <svx/sdgtritm.hxx> +#include <svx/sdgluitm.hxx> +#include <svx/sdgcoitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdginitm.hxx> +#include <svx/sdgmoitm.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> +#include <tools/debug.hxx> #include <svx/sdgcpitm.hxx> #include <svx/sdr/contact/displayinfo.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 83aab2dfc687..98ee5996b343 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -32,6 +32,8 @@ #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfltrit.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdprcitm.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index ca8abd63a8b4..497a4c5a4a89 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -22,6 +22,7 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/svdobj.hxx> #include <svx/sdr/contact/displayinfo.hxx> +#include <tools/debug.hxx> #include <vcl/outdev.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index c4af096a0d13..8a1029138751 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -19,6 +19,7 @@ #include <sdr/contact/viewcontactofsdrobjcustomshape.hxx> #include <svx/svdoashp.hxx> +#include <svx/sdooitm.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index fdd64bee1243..7876c8e5a72a 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -30,6 +30,7 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <sdr/primitive2d/sdrolecontentprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 3214e22823cb..3688eed6e2a0 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -26,6 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> +#include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index 3e51de1ed3c7..91a64b02ae84 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -26,6 +26,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/svdmodel.hxx> #include <vcl/canvastools.hxx> +#include <svx/sdmetitm.hxx> namespace sdr { namespace contact { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index bd22d412cffc..9fcd285572e2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -52,6 +52,7 @@ #include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <tools/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/controlprimitive2d.hxx> diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 7693c54ef66f..38e2d15c6041 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -27,6 +27,12 @@ #include <svx/svdograf.hxx> #include <svx/sdgcpitm.hxx> #include <svx/svdmodel.hxx> +#include <svx/sdgluitm.hxx> +#include <svx/sdgcoitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdgtritm.hxx> +#include <svx/sdginitm.hxx> +#include <svx/sdgmoitm.hxx> namespace sdr { diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 95887ab7e311..0760008bc17d 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -29,6 +29,7 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnedit.hxx> #include <svx/xlnedwit.hxx> +#include <svx/sdynitm.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index b15e14e530ae..a71240110c88 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -27,6 +27,8 @@ #include <svx/svddef.hxx> #include <svx/svdotext.hxx> #include <svx/svdoutl.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdtditm.hxx> #include <editeng/writingmodeitem.hxx> #include <svx/svdmodel.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 37cd10ae1bce..2f4d63fb2079 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -42,6 +42,7 @@ #include <vcl/fixed.hxx> #include <vcl/toolbox.hxx> #include <svl/aeitem.hxx> +#include <svl/intitem.hxx> #include <svx/svdview.hxx> #include <svx/transfrmhelper.hxx> #include <comphelper/lok.hxx> diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 80369f6dbd66..573fd792284f 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -37,6 +37,7 @@ #include <svx/fmview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <sfx2/lokhelper.hxx> +#include <tools/debug.hxx> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 5223c72e6889..274a3541a2ec 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -53,7 +53,22 @@ #include <svx/dialmgr.hxx> #include <svx/sdgcpitm.hxx> #include <svx/sdtfchim.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdasitm.hxx> +#include <svx/sdgcoitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdginitm.hxx> +#include <svx/sdgluitm.hxx> +#include <svx/sdgmoitm.hxx> +#include <svx/sdgtritm.hxx> +#include <svx/sdprcitm.hxx> +#include <svx/sdtaaitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtaditm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/sdtaitm.hxx> +#include <svx/sdtakitm.hxx> +#include <svx/sdtayitm.hxx> +#include <svx/sdtfsitm.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 834547fc24ce..05d44ce6bf70 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -38,6 +38,8 @@ #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/sdgcpitm.hxx> +#include <svx/sdooitm.hxx> +#include <svx/sdtagitm.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index c6deecce28b6..b623579f8e3c 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -40,7 +40,9 @@ #include <svx/rectenum.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> -#include <svx/svdattr.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> diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 4f00a877ef35..5ca865a8522c 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -29,6 +29,8 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/dialmgr.hxx> +#include <svx/sdooitm.hxx> +#include <svx/sdshitm.hxx> #include "svdfmtf.hxx" #include "svdpdf.hxx" #include <svx/svdetc.hxx> @@ -42,6 +44,7 @@ #include <svx/svdoashp.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <memory> #include <vector> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 6d905b3ba63c..c67ae8fffad1 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -71,6 +71,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpagewindow.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <memory> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index fc7223d50ef9..329e5ac020ab 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -44,7 +44,12 @@ #include <vcl/metric.hxx> #include <editeng/charscaleitem.hxx> #include <svx/xflhtit.hxx> -#include <svx/svdattr.hxx> +#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> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index c794284484c8..7e557c05a13b 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -36,7 +36,12 @@ #include <sal/log.hxx> #include <svx/sdrpaintwindow.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdtaaitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/sdtayitm.hxx> +#include <svx/sdtfsitm.hxx> +#include <svx/xcolit.hxx> #include <svx/svdpool.hxx> #include <svx/svdview.hxx> #include <svx/sxcaitm.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d41df0885c57..7a1dc3286a8e 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -58,6 +58,7 @@ #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> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 0a1539c570b4..f9b0e58e0aba 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -79,6 +79,12 @@ #include <vcl/bitmapaccess.hxx> #include <vcl/virdev.hxx> #include <svx/svdview.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdprcitm.hxx> +#include <svx/sdshitm.hxx> +#include <svx/sdsxyitm.hxx> +#include <svx/sdtmfitm.hxx> +#include <svx/sdasitm.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 3f6601a874ee..249b3119af5f 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -22,7 +22,6 @@ #include <svx/xpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <svx/svdattr.hxx> #include <svx/svdpool.hxx> #include <svx/svdotext.hxx> #include <svx/svdocapt.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index c2637ff48e52..71130028ec48 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -31,7 +31,6 @@ #include <sdr/contact/viewcontactofsdrcircobj.hxx> #include <sdr/properties/circleproperties.hxx> -#include <svx/svdattr.hxx> #include <svx/svddrag.hxx> #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 73601570b4a8..d7fa90ba0bd3 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -51,7 +51,13 @@ #include <svx/xflbmtit.hxx> #include <svx/svdundo.hxx> #include "svdfmtf.hxx" +#include <svx/sdgcoitm.hxx> #include <svx/sdgcpitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdginitm.hxx> +#include <svx/sdgluitm.hxx> +#include <svx/sdgmoitm.hxx> +#include <svx/sdgtritm.hxx> #include <editeng/eeitem.hxx> #include <sdr/properties/graphicproperties.hxx> #include <sdr/contact/viewcontactofgraphic.hxx> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index cbead01909b5..4c3d0f2040b9 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -23,7 +23,6 @@ #include <math.h> #include <svx/xpool.hxx> #include <svx/xpoly.hxx> -#include <svx/svdattr.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svddrag.hxx> diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 03eae7fe59a6..eeebb3d7c8d3 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -22,7 +22,6 @@ #include <stdlib.h> #include <svx/xpool.hxx> #include <svx/xpoly.hxx> -#include <svx/svdattr.hxx> #include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 898d21bdbb68..999d7fbfc57b 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -49,6 +49,12 @@ #include <svx/svdpool.hxx> #include <svx/xflclit.hxx> #include <svl/style.hxx> +#include <svx/sderitm.hxx> +#include <svx/sdooitm.hxx> +#include <svx/sdshitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtfsitm.hxx> +#include <svx/sdtmfitm.hxx> #include <editeng/editeng.hxx> #include <svl/itemiter.hxx> #include <sdr/properties/textproperties.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index f6bb31c5b8fe..17ddb0f2689f 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -25,6 +25,10 @@ #include <svx/svdmodel.hxx> #include <svx/textchain.hxx> #include <svx/textchainflow.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtayitm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/sdtaaitm.hxx> #include <basegfx/vector/b2dvector.hxx> #include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index ea1d3e56dffb..ac16847fbc34 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -32,6 +32,7 @@ #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 1ae523c80f63..193709d8bfac 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -37,6 +37,7 @@ #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> +#include <svx/sdshitm.hxx> using namespace com::sun::star; diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 4a02dc64042b..410def6761cb 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -49,6 +49,7 @@ #include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> #include <svx/svdograf.hxx> +#include <tools/debug.hxx> using namespace ::com::sun::star; using namespace sdr::contact; diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 49c3355bac9c..db871b96110c 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -28,6 +28,7 @@ #include <string.h> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/helpers.hxx> diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index d027d1c0d3c2..a3666b5b7d5a 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -55,7 +55,9 @@ #include <vcl/metric.hxx> #include <editeng/charscaleitem.hxx> #include <svx/xflhtit.hxx> -#include <svx/svdattr.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtfsitm.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index f0b4f2bddfb0..117aa71f701b 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -29,6 +29,7 @@ #include <svx/svdtrans.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <tools/debug.hxx> #include <tools/helpers.hxx> #include <svx/polypolygoneditor.hxx> diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 3013ac4c9b2e..b513aee214dd 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -39,6 +39,7 @@ #include <svx/IAccessibleViewForwarder.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdotext.hxx> +#include <tools/debug.hxx> using namespace sdr::table; using namespace ::com::sun::star; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 62b211b8992a..96488136caaf 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -31,6 +31,7 @@ #include "accessiblecell.hxx" #include <algorithm> +#include <unordered_map> #include <cppuhelper/implbase.hxx> #include <svx/svdotable.hxx> diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index acbd9fabd305..10b5a9d073a3 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -42,7 +42,10 @@ #include <svx/svdoutl.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdmodel.hxx> - +#include <svx/sdooitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/xit.hxx> #include <getallcharpropids.hxx> #include "tableundo.hxx" #include <cell.hxx> diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index d77dbb3ffc59..bbf8f8810a70 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -27,6 +27,7 @@ #include <svx/svdmodel.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> +#include <tools/debug.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 57b3171d7a82..18e87bd48c24 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -36,6 +36,7 @@ #include <vcl/settings.hxx> #include <svl/whiter.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> @@ -63,6 +64,8 @@ #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/svdpage.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdtditm.hxx> #include "tableundo.hxx" #include "tablelayouter.hxx" #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 0b24df689188..e1a89ddce186 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/table/XMergeableCell.hpp> +#include <tools/debug.hxx> #include <tools/gen.hxx> #include <libxml/xmlwriter.h> diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 6887ccec3e34..23101debcb07 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <libxml/xmlwriter.h> +#include <tools/debug.hxx> #include <cell.hxx> #include "cellcursor.hxx" diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 4ca126056278..4df8a722dbb2 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -52,6 +52,11 @@ #include <svx/svdtrans.hxx> #include <svx/grafctrl.hxx> #include <svx/tbxcolor.hxx> +#include <svx/sdgcoitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdgluitm.hxx> +#include <svx/sdgmoitm.hxx> +#include <svx/sdgtritm.hxx> #include <bitmaps.hlst> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 5366297fe4d7..28ad299ad3e3 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -38,6 +38,8 @@ #include <svx/svdview.hxx> #include <editeng/colritem.hxx> #include <svx/chrtitem.hxx> +#include <svx/sdasitm.hxx> +#include <svl/intitem.hxx> #include <svx/extrusionbar.hxx> #include <extrusiondepthdialog.hxx> diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 920475fb1adf..419835f56a2c 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -33,7 +33,9 @@ #include <svx/gallery.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> +#include <svx/sdtfsitm.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <sfx2/bindings.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 2d9d8b61fc75..78a5585061b9 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/task/XInteractionContinuation.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <comphelper/interaction.hxx> #include <framework/interaction.hxx> diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index ebfde724a6b7..132f3b6c3fd7 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -29,6 +29,7 @@ #include <svtools/unoevent.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> +#include <tools/debug.hxx> #include <cppuhelper/implbase.hxx> #include <svx/unofill.hxx> diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 0bb5d1363d45..e720cbabac58 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -43,6 +43,10 @@ #include <strings.hxx> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> +#include <svx/sdtaaitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/sdtayitm.hxx> #include "shapeimpl.hxx" #include <unordered_map> diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index c05baca128cc..158b8f2e1cce 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -55,6 +55,7 @@ #include <vcl/wmf.hxx> #include <svtools/embedhlp.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <config_features.h> diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 9ea667c396f9..864d79756300 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -27,6 +27,7 @@ #include <editeng/unoedhlp.hxx> #include <svl/lstner.hxx> #include <rtl/ref.hxx> +#include <tools/debug.hxx> #include <svl/hint.hxx> #include <svl/style.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 5d8c7a4f622f..9d2348afe0d9 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -53,7 +53,7 @@ #include <svx/xlnstcit.hxx> #include <svx/xlnedcit.hxx> #include <svx/xpool.hxx> -#include <svx/svdattr.hxx> +#include <svx/svddef.hxx> #include <svx/svxids.hrc> #include <svl/itemset.hxx> #include <svx/xftadit.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 615d30bb7e84..edde4c089cd4 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -450,7 +450,6 @@ #include <svx/sdynitm.hxx> #include <svx/selectioncontroller.hxx> #include <svx/shapeproperty.hxx> -#include <svx/svdattr.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> #include <svx/svdedtv.hxx> diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 1b4148893bfe..973d751e83d3 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -25,6 +25,7 @@ #include <editeng/outliner.hxx> #include <svl/srchitem.hxx> #include <svl/slstitm.hxx> +#include <svl/stritem.hxx> #include <drawdoc.hxx> #include <ndtxt.hxx> #include <wrtsh.hxx> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 8dcd0c9390de..dca686eae993 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -36,6 +36,9 @@ #include <svx/xlnedit.hxx> #include <svx/xlnstit.hxx> #include <svx/svdomeas.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtaaitm.hxx> #include <sfx2/app.hxx> #include <editeng/boxitem.hxx> #include <editeng/opaqitem.hxx> diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 7dbabfafd73e..218ffa02a200 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -24,6 +24,12 @@ #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtayitm.hxx> +#include <svx/sdtaaitm.hxx> +#include <svx/sdtaiitm.hxx> +#include <svx/sdtmfitm.hxx> #include <editeng/eeitem.hxx> #include <editeng/outliner.hxx> #include <svx/xflclit.hxx> diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 7666f9f2ca17..585a2f8037a1 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -24,6 +24,9 @@ #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> +#include <svx/sdtacitm.hxx> +#include <svx/sdtayitm.hxx> +#include <svx/sdtaaitm.hxx> #include <editeng/eeitem.hxx> #include <editeng/outliner.hxx> #include <svx/xflclit.hxx> diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 7155136cec52..bf682a5880d5 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -30,6 +30,7 @@ #include <sot/storage.hxx> #include <vcl/graphicfilter.hxx> #include <svl/itemiter.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index f798db5f25cd..f64577ae64f9 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -40,6 +40,16 @@ #include <svx/svdmodel.hxx> #include <svx/svdocapt.hxx> #include <svx/sxctitm.hxx> +#include <svx/sdggaitm.hxx> +#include <svx/sdgluitm.hxx> +#include <svx/sdgmoitm.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/sdooitm.hxx> +#include <svx/sdshitm.hxx> +#include <svx/sdsxyitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtfsitm.hxx> #include <editeng/editeng.hxx> #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index cc200e3353e3..e323cd3eef3b 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -60,7 +60,11 @@ #include <filter/msfilter/mscodec.hxx> #include <svx/svdmodel.hxx> #include <svx/xflclit.hxx> - +#include <svx/sdasitm.hxx> +#include <svx/sdtagitm.hxx> +#include <svx/sdtcfitm.hxx> +#include <svx/sdtditm.hxx> +#include <svx/sdtmfitm.hxx> #include <unotools/fltrcfg.hxx> #include <fmtfld.hxx> #include <fmturl.hxx> diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 2830fa1a726c..ba63fb87d414 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -28,6 +28,7 @@ #include <svtools/restartdialog.hxx> #include <svl/whiter.hxx> #include <svl/isethint.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <sfx2/fcontnr.hxx> #include <svl/ctloptions.hxx> diff --git a/sw/source/uibase/ribbar/concustomshape.cxx b/sw/source/uibase/ribbar/concustomshape.cxx index d3a1b1aad5e0..2daf9ef61188 100644 --- a/sw/source/uibase/ribbar/concustomshape.cxx +++ b/sw/source/uibase/ribbar/concustomshape.cxx @@ -40,6 +40,7 @@ #include <sfx2/request.hxx> #include <svx/fmmodel.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> #include <editeng/adjustitem.hxx> diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 083d5d3a266f..61c694cc4c20 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -50,6 +50,7 @@ #include <svx/svdograf.hxx> #include <svx/svdundo.hxx> #include <svx/xbtmpit.hxx> +#include <svx/sdasitm.hxx> #include <swundo.hxx> #include <wrtsh.hxx> diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 82950e37743e..dedf6ca6a4d2 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -49,6 +49,7 @@ #include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> #include <sfx2/viewfrm.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 66aa26277bfa..5cacff40d2e3 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -21,6 +21,7 @@ #include <i18nlangtag/lang.h> #include <i18nutil/transliteration.hxx> #include <svl/slstitm.hxx> +#include <svl/stritem.hxx> #include <svl/cjkoptions.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> @@ -28,6 +29,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> #include <svx/svdotext.hxx> +#include <svx/sdooitm.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> #include <editeng/eeitem.hxx> diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 05ac5537e2cc..570b35eb16ee 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -20,6 +20,7 @@ #include <hintids.hxx> #include <svl/aeitem.hxx> #include <svl/itempool.hxx> +#include <svl/stritem.hxx> #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdpage.hxx> |