[Libreoffice-commits] core.git: 2 commits - cui/source dbaccess/source include/IwyuFilter_include.yaml include/o3tl include/svl include/svx sc/qa sc/source sd/source svl/source svx/source sw/inc sw/qa sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 16 09:50:21 UTC 2019
cui/source/dialogs/cuigaldlg.cxx | 1
cui/source/inc/cuigaldlg.hxx | 1
dbaccess/source/ui/browser/brwctrlr.cxx | 1
include/IwyuFilter_include.yaml | 30 ++++++
include/o3tl/sorted_vector.hxx | 5 +
include/svl/listener.hxx | 4
include/svx/EnhancedCustomShape2d.hxx | 6 -
include/svx/EnhancedCustomShapeFunctionParser.hxx | 1
include/svx/e3ditem.hxx | 2
include/svx/e3dundo.hxx | 2
include/svx/extrusionbar.hxx | 1
include/svx/fillctrl.hxx | 1
include/svx/float3d.hxx | 6 -
include/svx/fmglob.hxx | 1
include/svx/fmgridcl.hxx | 6 -
include/svx/fmgridif.hxx | 9 +-
include/svx/fmmodel.hxx | 4
include/svx/fmobjfac.hxx | 1
include/svx/fmpage.hxx | 2
include/svx/fmsearch.hxx | 11 +-
include/svx/fmshell.hxx | 15 ++-
include/svx/fmsrcimp.hxx | 13 +--
include/svx/fmtools.hxx | 43 ++--------
include/svx/fmview.hxx | 1
include/svx/fontlb.hxx | 3
include/svx/fontwork.hxx | 8 -
include/svx/fontworkbar.hxx | 1
include/svx/fontworkgallery.hxx | 4
include/svx/framelink.hxx | 9 --
include/svx/framelinkarray.hxx | 7 -
include/svx/frmdirlbox.hxx | 2
include/svx/frmsel.hxx | 6 -
include/svx/galctrl.hxx | 8 -
include/svx/gallery.hxx | 7 -
include/svx/gallery1.hxx | 2
include/svx/galleryitem.hxx | 5 -
include/svx/galmisc.hxx | 9 --
include/svx/galtheme.hxx | 7 -
include/svx/grafctrl.hxx | 1
include/svx/graphctl.hxx | 1
include/svx/graphichelper.hxx | 5 -
include/svx/grfflt.hxx | 2
include/svx/gridctrl.hxx | 18 +---
sc/qa/unit/screenshots/screenshots.cxx | 1
sc/source/core/data/fillinfo.cxx | 1
sc/source/ui/docshell/docsh3.cxx | 1
sc/source/ui/drawfunc/fuconarc.cxx | 1
sc/source/ui/drawfunc/fuconpol.cxx | 1
sc/source/ui/drawfunc/fuconrec.cxx | 1
sc/source/ui/drawfunc/fuconstr.cxx | 1
sc/source/ui/drawfunc/fuconuno.cxx | 2
sc/source/ui/drawfunc/fuins1.cxx | 1
sc/source/ui/drawfunc/fupoor.cxx | 1
sc/source/ui/miscdlgs/autofmt.cxx | 2
sc/source/ui/view/gridwin3.cxx | 1
sc/source/ui/view/printfun.cxx | 1
sc/source/ui/view/tabvwsh9.cxx | 1
sd/source/ui/animations/CustomAnimationDialog.cxx | 1
sd/source/ui/view/drviews7.cxx | 1
sd/source/ui/view/drviewsa.cxx | 1
svl/source/notify/listener.cxx | 6 -
svx/source/customshapes/EnhancedCustomShape2d.cxx | 3
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 2
svx/source/dialog/frmsel.cxx | 1
svx/source/engine3d/float3d.cxx | 2
svx/source/engine3d/view3d1.cxx | 1
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 1
svx/source/fmcomp/gridcell.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/fmPropBrw.cxx | 1
svx/source/form/fmobj.cxx | 1
svx/source/form/fmpgeimp.cxx | 1
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmsrcimp.cxx | 8 +
svx/source/form/fmtools.cxx | 3
svx/source/form/fmvwimp.cxx | 1
svx/source/form/formcontrolling.cxx | 1
svx/source/form/tabwin.cxx | 1
svx/source/gallery2/gallery1.cxx | 1
svx/source/gallery2/galmisc.cxx | 1
svx/source/inc/frmselimpl.hxx | 1
svx/source/inc/gridcell.hxx | 1
svx/source/items/galleryitem.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 1
sw/inc/view.hxx | 2
sw/qa/extras/layout/layout.cxx | 1
sw/qa/extras/uiwriter/uiwriter.cxx | 1
sw/source/core/doc/DocumentDrawModelManager.cxx | 1
sw/source/core/inc/dview.hxx | 1
sw/source/core/layout/paintfrm.cxx | 1
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optpage.cxx | 1
sw/source/ui/dbui/dbinsdlg.cxx | 1
sw/source/ui/dialog/uiregionsw.cxx | 1
sw/source/ui/envelp/envfmt.cxx | 1
sw/source/ui/envelp/envlop1.cxx | 1
sw/source/ui/fldui/fldedt.cxx | 1
sw/source/ui/fldui/fldpage.cxx | 1
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 1
sw/source/ui/index/cnttab.cxx | 1
sw/source/ui/misc/bookmark.cxx | 1
sw/source/ui/misc/insfnote.cxx | 1
sw/source/ui/misc/pggrid.cxx | 1
sw/source/ui/table/autoformatpreview.cxx | 2
sw/source/uibase/app/apphdl.cxx | 4
sw/source/uibase/app/appopt.cxx | 1
sw/source/uibase/app/docsh.cxx | 1
sw/source/uibase/app/docshini.cxx | 1
sw/source/uibase/app/docst.cxx | 1
sw/source/uibase/app/swmodul1.cxx | 1
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/dbui/dbtree.cxx | 1
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 1
sw/source/uibase/dialog/regionsw.cxx | 1
sw/source/uibase/dochdl/swdtflvr.cxx | 1
sw/source/uibase/docvw/AnnotationWin.cxx | 1
sw/source/uibase/docvw/AnnotationWin2.cxx | 3
sw/source/uibase/docvw/HeaderFooterWin.cxx | 1
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/PostItMgr.cxx | 1
sw/source/uibase/docvw/edtwin.cxx | 1
sw/source/uibase/docvw/edtwin3.cxx | 1
sw/source/uibase/frmdlg/frmmgr.cxx | 1
sw/source/uibase/inc/instable.hxx | 1
sw/source/uibase/lingu/olmenu.cxx | 1
sw/source/uibase/misc/redlndlg.cxx | 1
sw/source/uibase/misc/swruler.cxx | 2
sw/source/uibase/ribbar/conarc.cxx | 2
sw/source/uibase/ribbar/conpoly.cxx | 1
sw/source/uibase/ribbar/conrect.cxx | 1
sw/source/uibase/ribbar/drawbase.cxx | 1
sw/source/uibase/ribbar/dselect.cxx | 1
sw/source/uibase/ribbar/inputwin.cxx | 1
sw/source/uibase/ribbar/workctrl.cxx | 2
sw/source/uibase/shells/beziersh.cxx | 1
sw/source/uibase/shells/drawsh.cxx | 1
sw/source/uibase/shells/drwbassh.cxx | 1
sw/source/uibase/shells/drwtxtex.cxx | 1
sw/source/uibase/shells/drwtxtsh.cxx | 1
sw/source/uibase/shells/frmsh.cxx | 1
sw/source/uibase/shells/grfsh.cxx | 3
sw/source/uibase/shells/langhelper.cxx | 1
sw/source/uibase/shells/listsh.cxx | 1
sw/source/uibase/shells/mediash.cxx | 1
sw/source/uibase/shells/tabsh.cxx | 1
sw/source/uibase/shells/textfld.cxx | 1
sw/source/uibase/shells/textidx.cxx | 1
sw/source/uibase/shells/textsh.cxx | 1
sw/source/uibase/shells/textsh1.cxx | 1
sw/source/uibase/shells/txtattr.cxx | 1
sw/source/uibase/shells/txtcrsr.cxx | 1
sw/source/uibase/shells/txtnum.cxx | 1
sw/source/uibase/table/chartins.cxx | 1
sw/source/uibase/uiview/uivwimp.cxx | 1
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view0.cxx | 1
sw/source/uibase/uiview/viewdlg2.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 1
sw/source/uibase/uiview/viewling.cxx | 1
sw/source/uibase/uiview/viewmdi.cxx | 2
sw/source/uibase/uiview/viewport.cxx | 1
sw/source/uibase/uiview/viewprt.cxx | 1
sw/source/uibase/uiview/viewsrch.cxx | 1
sw/source/uibase/uiview/viewstat.cxx | 1
sw/source/uibase/uiview/viewtab.cxx | 1
sw/source/uibase/utlui/glbltree.cxx | 1
sw/source/uibase/utlui/uitool.cxx | 1
sw/source/uibase/web/wfrmsh.cxx | 1
sw/source/uibase/web/wgrfsh.cxx | 1
sw/source/uibase/web/wview.cxx | 2
sw/source/uibase/wrtsh/select.cxx | 1
sw/source/uibase/wrtsh/wrtsh1.cxx | 1
sw/source/uibase/wrtsh/wrtsh2.cxx | 1
176 files changed, 290 insertions(+), 163 deletions(-)
New commits:
commit b27755b704fa4866025f1ed6d26c0d43aafa3407
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon May 13 16:28:14 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 16 11:49:25 2019 +0200
tdf#125254 Performance: A spreadsheet opens too slow, part1
This takes the opening time from 55s to 48s for me.
Change-Id: Ia60fff33e9948e0bd6906c82b48aa30f8b2551bb
Reviewed-on: https://gerrit.libreoffice.org/72394
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
index 8324e333198a..35882ab9afca 100644
--- a/include/o3tl/sorted_vector.hxx
+++ b/include/o3tl/sorted_vector.hxx
@@ -113,6 +113,11 @@ public:
m_vector.clear();
}
+ void swap(sorted_vector & other)
+ {
+ m_vector.swap(other.m_vector);
+ }
+
void reserve(size_type amount)
{
m_vector.reserve(amount);
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index 5ba14aea953e..38d72552618a 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -21,7 +21,7 @@
#include <svl/svldllapi.h>
-#include <unordered_set>
+#include <o3tl/sorted_vector.hxx>
class SvtBroadcaster;
class SfxHint;
@@ -29,7 +29,7 @@ class SfxHint;
class SVL_DLLPUBLIC SvtListener
{
friend class SvtBroadcaster;
- typedef std::unordered_set<SvtBroadcaster*> BroadcastersType;
+ typedef o3tl::sorted_vector<SvtBroadcaster*> BroadcastersType;
BroadcastersType maBroadcasters;
const SvtListener& operator=(const SvtListener &) = delete;
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 22d5508a3cef..38856a835d4f 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -43,7 +43,7 @@ SvtListener::~SvtListener() COVERITY_NOEXCEPT_FALSE
bool SvtListener::StartListening( SvtBroadcaster& rBroadcaster )
{
- std::pair<BroadcastersType::iterator, bool> r =
+ std::pair<BroadcastersType::const_iterator, bool> r =
maBroadcasters.insert(&rBroadcaster);
if (r.second)
{
@@ -55,7 +55,7 @@ bool SvtListener::StartListening( SvtBroadcaster& rBroadcaster )
bool SvtListener::EndListening( SvtBroadcaster& rBroadcaster )
{
- BroadcastersType::iterator it = maBroadcasters.find(&rBroadcaster);
+ BroadcastersType::const_iterator it = maBroadcasters.find(&rBroadcaster);
if (it == maBroadcasters.end())
// Not listening to this broadcaster.
return false;
@@ -69,7 +69,7 @@ bool SvtListener::EndListening( SvtBroadcaster& rBroadcaster )
// back into the broadcaster again
void SvtListener::BroadcasterDying( SvtBroadcaster& rBroadcaster )
{
- BroadcastersType::iterator it = maBroadcasters.find(&rBroadcaster);
+ BroadcastersType::const_iterator it = maBroadcasters.find(&rBroadcaster);
if (it != maBroadcasters.end())
maBroadcasters.erase(it);
}
commit 4b04eae81478d4aa19f3bdc3f2d6247063aeb6cd
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Mon May 13 07:52:14 2019 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu May 16 11:49:18 2019 +0200
tdf#42949 Fix IWYU warnings in include/svx/[e-g]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I861d3f0fa15ee3b7e0e830c4fac2e5794ea4071b
Reviewed-on: https://gerrit.libreoffice.org/72213
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d9ea30e9ff20..799440789bb2 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -39,6 +39,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 38f793298bb4..29ac048fca86 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -23,6 +23,7 @@
#include <sal/config.h>
#include <salhelper/thread.hxx>
+#include <tools/urlobj.hxx>
#include <vcl/graph.hxx>
#include <vcl/idle.hxx>
#include <svl/slstitm.hxx>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 182d38d61f4c..a387e04d0b8f 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/form/runtime/FormOperations.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 21c51ef2bb02..e654efeffae2 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -944,3 +944,33 @@ blacklist:
include/svx/dbaexchange.hxx:
# Needed for implicit dtor
- com/sun/star/beans/PropertyValue.hpp
+ include/svx/EnhancedCustomShape2d.hxx:
+ # Needed for implicit dtor
+ - com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp
+ - com/sun/star/drawing/EnhancedCustomShapeSegment.hpp
+ - com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp
+ include/svx/fmgridif.hxx:
+ # base class has to be a complete type
+ - com/sun/star/beans/XPropertyChangeListener.hpp
+ - com/sun/star/container/XContainer.hpp
+ - com/sun/star/container/XEnumerationAccess.hpp
+ - com/sun/star/form/XBoundComponent.hpp
+ - com/sun/star/form/XGridControl.hpp
+ - com/sun/star/form/XGridPeer.hpp
+ - com/sun/star/form/XLoadListener.hpp
+ - com/sun/star/form/XResetListener.hpp
+ - com/sun/star/frame/XDispatchProvider.hpp
+ - com/sun/star/frame/XDispatchProviderInterception.hpp
+ - com/sun/star/frame/XStatusListener.hpp
+ - com/sun/star/sdbc/XRowSetListener.hpp
+ - com/sun/star/sdb/XRowSetSupplier.hpp
+ - com/sun/star/util/XModeSelector.hpp
+ - com/sun/star/util/XModifyBroadcaster.hpp
+ - com/sun/star/view/XSelectionSupplier.hpp
+ - toolkit/awt/vclxwindow.hxx
+ include/svx/fmsrcimp.hxx:
+ # base class has to be a complete type
+ - com/sun/star/beans/XPropertyChangeListener.hpp
+ include/svx/fmtools.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XEventListener.hpp
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 7b3508313651..dfc67806cc05 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -24,14 +24,13 @@
#include <svx/sdasitm.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Size.hpp>
#include <svl/itemset.hxx>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+
#include <svx/EnhancedCustomShapeFunctionParser.hxx>
#include <tools/gen.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -40,6 +39,9 @@
#include <memory>
#include <vector>
+namespace com::sun::star::awt { struct Point; }
+namespace com::sun::star::awt { struct Size; }
+
class Color;
class SdrObject;
class SdrPathObj;
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index ff53f38c6bff..d284a1563e49 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
#include <memory>
#include <ostream>
#include <vector>
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 47e033d7b1a5..ed9f1759791d 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -24,8 +24,6 @@
#include <basegfx/vector/b3dvector.hxx>
#include <svx/svxdllapi.h>
-class SvStream;
-
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
{
basegfx::B3DVector aVal;
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 58457c4952fb..5247a86d1db0 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_E3DUNDO_HXX
#include <svx/svdundo.hxx>
-#include <svx/scene3d.hxx>
+#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
/************************************************************************\
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 5d8f515eb9a9..383b72dcd337 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_EXTRUSIONBAR_HXX
#include <sfx2/shell.hxx>
-#include <sfx2/module.hxx>
#include <svx/ifaceids.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index e643874d3260..4d4980992b85 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_FILLCTRL_HXX
#include <memory>
-#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 9f7345cd6b19..20cfd338642f 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -29,10 +29,7 @@
#include <vcl/layout.hxx>
#include <svx/svxdllapi.h>
-#include <svx/f3dchild.hxx>
#include <svx/dlgctl3d.hxx>
-#include <svx/dlgctrl.hxx>
-#include <svx/svdmodel.hxx>
enum class ViewType3D
@@ -45,9 +42,6 @@ enum class ViewType3D
};
class FmFormModel;
-class VirtualDevice;
-class E3dView;
-class SdrPageView;
class Svx3DCtrlItem;
class SvxConvertTo3DItem;
class SvxColorListBox;
diff --git a/include/svx/fmglob.hxx b/include/svx/fmglob.hxx
index cc8f51ce175c..35f3460f19a3 100644
--- a/include/svx/fmglob.hxx
+++ b/include/svx/fmglob.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_FMGLOB_HXX
#include <com/sun/star/form/FormComponentType.hpp>
-#include <svx/svdobj.hxx>
const sal_uInt16 OBJ_FM_CONTROL = css::form::FormComponentType::CONTROL;
// for form components
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 6eb98eb7916d..82c98efe28c0 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -19,14 +19,14 @@
#ifndef INCLUDED_SVX_FMGRIDCL_HXX
#define INCLUDED_SVX_FMGRIDCL_HXX
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-
#include <svx/gridctrl.hxx>
#include <vcl/transfer.hxx>
#include <svx/svxdllapi.h>
#include <memory>
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::container { class XIndexContainer; }
+namespace com::sun::star::container { class XNameAccess; }
// FmGridHeader
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 887943032594..873ad62ad43b 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -22,14 +22,13 @@
#include <svx/svxdllapi.h>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/sdbc/XRowSetListener.hpp>
#include <com/sun/star/sdb/XRowSetSupplier.hpp>
-#include <com/sun/star/form/XReset.hpp>
+#include <com/sun/star/form/XResetListener.hpp>
#include <com/sun/star/form/XBoundComponent.hpp>
#include <com/sun/star/form/XLoadListener.hpp>
#include <com/sun/star/form/XGridControl.hpp>
@@ -38,7 +37,6 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XModeSelector.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
@@ -51,6 +49,9 @@
#include <cppuhelper/implbase10.hxx>
#include <memory>
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { class XComponentContext; }
+
class DbGridColumn;
enum class DbGridControlNavigationBarState;
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 19e3fe9fba6e..98261b7d80d6 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -27,10 +27,6 @@
class SfxObjectShell;
class SfxItemPool;
class FmXUndoEnvironment;
-class SfxObjectShell;
-class SbxObject;
-class SbxArray;
-class SbxValue;
struct FmFormModelImplData;
class SVX_DLLPUBLIC FmFormModel :
diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx
index 50d81cc3f11c..1e3bd7f82827 100644
--- a/include/svx/fmobjfac.hxx
+++ b/include/svx/fmobjfac.hxx
@@ -23,7 +23,6 @@
#include <tools/link.hxx>
#include <svx/svxdllapi.h>
-class SdrObjFactory;
class SdrObject;
struct SdrObjCreatorParams;
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 478c2a2ce1a3..b2d659363757 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -23,9 +23,7 @@
#include <memory>
#include <svx/svdpage.hxx>
#include <svx/svxdllapi.h>
-#include <tools/contnr.hxx>
-class StarBASIC;
class FmFormModel;
class FmFormPageImpl; // contains a list of all forms
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 2ffd180e278c..c702f0106212 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -20,15 +20,14 @@
#ifndef INCLUDED_SVX_FMSEARCH_HXX
#define INCLUDED_SVX_FMSEARCH_HXX
-#include <com/sun/star/sdbc/XResultSet.hpp>
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
-namespace com { namespace sun { namespace star {
- namespace util {
- class XNumberFormatsSupplier;
- }
-}}}
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <vector>
+
+namespace com::sun::star::sdbc { class XResultSet; }
// Helper methods
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 4098bff2ebda..8a2db08b267e 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -24,24 +24,23 @@
// ***************************************************************************************************
#include <memory>
+#include <rtl/ref.hxx>
#include <sfx2/shell.hxx>
-#include <sfx2/module.hxx>
-#include <vcl/event.hxx>
+#include <vcl/outdev.hxx>
-#include <svx/svxids.hrc>
-#include <svx/fmview.hxx>
#include <svx/svxdllapi.h>
-
#include <svx/ifaceids.hxx>
+#include <svl/hint.hxx>
+#include <com/sun/star/uno/Reference.hxx>
class FmFormModel;
class FmFormPage;
class FmXFormShell;
class FmFormView;
class SdrView;
-class SdrPage;
class SdrUnoObj;
+class LinkParamNone;
namespace com { namespace sun { namespace star { namespace form {
class XForm;
@@ -50,6 +49,10 @@ namespace com { namespace sun { namespace star { namespace form {
}
} } } }
+namespace com::sun::star::awt { class XControl; }
+namespace com::sun::star::awt { class XControlModel; }
+template <typename Arg, typename Ret> class Link;
+
namespace svx
{
class ISdrObjectFilter;
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 4d246df20c99..194411ce174d 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -23,22 +23,23 @@
#include <svx/fmtools.hxx>
#include <svx/svxdllapi.h>
-#include <com/sun/star/awt/XCheckBox.hpp>
-#include <com/sun/star/awt/XListBox.hpp>
-#include <com/sun/star/awt/XTextComponent.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <unotools/charclass.hxx>
#include <unotools/collatorwrapper.hxx>
-#include <osl/thread.hxx>
+#include <tools/link.hxx>
#include <deque>
#include <memory>
#include <vector>
+namespace com::sun::star::awt { class XCheckBox; }
+namespace com::sun::star::awt { class XListBox; }
+namespace com::sun::star::awt { class XTextComponent; }
+namespace com::sun::star::sdb { class XColumn; }
+
enum class TransliterationFlags;
/**
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 6322cc3720d0..7a0bb1ca609b 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -21,47 +21,26 @@
#include <svx/svxdllapi.h>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdb/XColumn.hpp>
-#include <com/sun/star/sdb/XColumnUpdate.hpp>
-#include <com/sun/star/sdb/SQLErrorEvent.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbcx/XRowLocate.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/awt/FontStrikeout.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/io/XObjectInputStream.hpp>
-#include <com/sun/star/io/XObjectOutputStream.hpp>
-#include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
#include <rtl/ref.hxx>
-#include <tools/wintypes.hxx>
-#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase.hxx>
#include <set>
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::lang { class XComponent; }
+namespace com::sun::star::lang { class XServiceInfo; }
+namespace com::sun::star::sdbc { class SQLException; }
+namespace com::sun::star::sdbc { class XRowSet; }
+namespace com::sun::star::sdb { class SQLContext; }
+namespace com::sun::star::sdb { struct SQLErrorEvent; }
namespace vcl { class Window; }
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index cdba2883a4e5..e23d3a6efbe2 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star {
}}}
class OutputDevice;
-class FmFormModel;
class FmFormObj;
class FmFormPage;
class FmFormShell;
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index d998780ac03f..fe5bd8b583a4 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -20,10 +20,7 @@
#ifndef INCLUDED_SVX_FONTLB_HXX
#define INCLUDED_SVX_FONTLB_HXX
-#include <vcl/svtabbx.hxx>
#include <vcl/svlbitm.hxx>
-#include <vcl/virdev.hxx>
-#include <svx/svxdllapi.h>
/** A list box string item which stores its text and font. */
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 824b7104ed37..510a39c8fbd6 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -23,22 +23,16 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/idle.hxx>
-#include <svtools/valueset.hxx>
#include <sfx2/dockwin.hxx>
#include <sfx2/ctrlitem.hxx>
-#include <svx/xenum.hxx>
-#include <svx/dlgctrl.hxx>
#include <svx/svxdllapi.h>
-#include <svx/xtextit0.hxx>
-class SdrView;
-class SdrPageView;
-class SdrObject;
class SvxColorListBox;
class XFormTextAdjustItem;
class XFormTextDistanceItem;
class XFormTextStartItem;
+class XFormTextStyleItem;
class XFormTextMirrorItem;
class XFormTextHideFormItem;
class XFormTextOutlineItem;
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 678ae8903cb7..a30a49661aeb 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_FONTWORKBAR_HXX
#include <sfx2/shell.hxx>
-#include <sfx2/module.hxx>
#include <svx/ifaceids.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 0c04001cd8f7..0a6bac625e94 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -23,16 +23,12 @@
#include <svx/svxdllapi.h>
#include <svtools/valueset.hxx>
-#include <sfx2/tbxctrl.hxx>
#include <vcl/weld.hxx>
#include <vector>
-class FmFormModel;
class SdrView;
-class SdrTextObj;
class SdrObject;
class SdrModel;
-class SfxBindings;
namespace svx
{
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index fa629fc24ad2..fbcf1a5d1277 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -20,19 +20,12 @@
#ifndef INCLUDED_SVX_FRAMELINK_HXX
#define INCLUDED_SVX_FRAMELINK_HXX
-#include <algorithm>
#include <sal/types.h>
#include <tools/color.hxx>
#include <svx/svxdllapi.h>
-#include <vcl/outdev.hxx>
#include <editeng/borderline.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-class Point;
-namespace tools { class Rectangle; }
-class OutputDevice;
-namespace svx { namespace frame { class Cell; }}
+#include <memory>
namespace svx {
namespace frame {
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 9abac20cfc75..55938bde7ec6 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -20,17 +20,18 @@
#ifndef INCLUDED_SVX_FRAMELINKARRAY_HXX
#define INCLUDED_SVX_FRAMELINKARRAY_HXX
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <svx/framelink.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <svx/svxdllapi.h>
#include <svx/rotmodit.hxx>
#include <memory>
-#include <vector>
+
+class Color;
namespace svx {
namespace frame {
struct ArrayImpl;
+class Style;
/** Stores frame styles of an array of cells, supports merged ranges.
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index a44c6bf5c7c1..4a508eea55bd 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -24,8 +24,6 @@
#include <editeng/frmdir.hxx>
#include <svx/svxdllapi.h>
-class SvxFrameDirectionItem;
-
namespace svx {
/** This listbox contains entries to select horizontal text direction.
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 7e3bdcdf73dc..83245e1a65fc 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -21,9 +21,7 @@
#define INCLUDED_SVX_FRMSEL_HXX
#include <memory>
-#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
-#include <vcl/bitmap.hxx>
#include <editeng/borderline.hxx>
#include <svx/framebordertype.hxx>
#include <svx/svxdllapi.h>
@@ -31,10 +29,6 @@
class Color;
-namespace editeng {
- class SvxBorderLine;
-}
-
enum class FrameSelFlags
{
NONE = 0x0000,
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 3dba3d9a487d..a565cb087548 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -21,22 +21,16 @@
#define INCLUDED_SVX_GALCTRL_HXX
#include <vcl/graph.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/customweld.hxx>
-#include <svl/slstitm.hxx>
#include <vcl/transfer.hxx>
#include <svtools/valueset.hxx>
#include <svtools/brwbox.hxx>
#include <vcl/GraphicObject.hxx>
-#include <svx/galmisc.hxx>
#include <svx/svxdllapi.h>
class GalleryTheme;
class GalleryBrowser2;
+class INetURLObject;
class SVX_DLLPUBLIC GalleryPreview : public vcl::Window, public DropTargetHelper, public DragSourceHelper
{
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index a02c1f3fc9d4..717fbcf129bf 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_GALLERY_HXX
#include <svx/svxdllapi.h>
-#include <tools/urlobj.hxx>
+#include <rtl/ustring.hxx>
#include <vector>
// Defines for preinstalled themes
@@ -92,14 +92,9 @@
#define RID_GALLERY_THEME_FIRST RID_GALLERY_THEME_3D
#define RID_GALLERY_THEME_LAST RID_GALLERY_THEME_TXTSHAPES
-class Gallery;
-class VCDrawModel;
-class FmFormModel;
class SdrModel;
class Graphic;
-class FmFormModel;
class BitmapEx;
-class OutputDevice;
class SVX_DLLPUBLIC GalleryExplorer
{
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 7738e265d278..a5cd3c04b374 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -29,8 +29,6 @@
#include <memory>
#include <vector>
-class SvStream;
-
class GalleryThemeEntry
{
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 2af76e961509..881fd88917df 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -23,8 +23,9 @@
#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::lang { class XComponent; }
// property names map those from css::gallery::GalleryItem
// with exception of "AsLink" and "FilterName"
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index c77a9bd90cd0..8f9d6ad7ad17 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -20,19 +20,19 @@
#ifndef INCLUDED_SVX_GALMISC_HXX
#define INCLUDED_SVX_GALMISC_HXX
-#include <sot/formats.hxx>
-#include <tools/urlobj.hxx>
#include <vcl/imap.hxx>
#include <svl/hint.hxx>
#include <vcl/transfer.hxx>
#include <svx/svdobj.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/awt/XProgressMonitor.hpp>
#include <svx/svxdllapi.h>
#include <tools/date.hxx>
#include <tools/time.hxx>
#include <memory>
+namespace com::sun::star::awt { class XProgressBar; }
+
+class INetURLObject;
class GalleryTheme;
class SotStorageStream;
@@ -79,8 +79,6 @@ enum class GalleryGraphicImportRet
class SvStream;
class Graphic;
class FmFormModel;
-class ImageMap;
-class Gallery;
GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName );
bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
@@ -130,7 +128,6 @@ class SVX_DLLPUBLIC GalleryProgress
void Update( sal_Int32 nVal, sal_Int32 nMaxVal );
};
-class Gallery;
class GalleryTheme;
class GraphicObject;
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 28d73582a091..f5bb333135aa 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -25,15 +25,13 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/salctype.hxx>
-#include <vcl/weld.hxx>
#include <svl/SfxBroadcaster.hxx>
-#include <svl/lstner.hxx>
-#include <vcl/transfer.hxx>
-#include <svx/svdmodel.hxx>
#include <svx/galmisc.hxx>
#include <memory>
#include <vector>
+namespace weld { class ComboBox; }
+
class SotStorage;
class SotStorageStream;
@@ -58,7 +56,6 @@ class SgaObject;
class FmFormModel;
class Gallery;
-class GalleryProgress;
namespace unogallery
{
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index f2169ba9007c..a999a676a976 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_GRAFCTRL_HXX
#include <svl/lstner.hxx>
-#include <svl/intitem.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 4b61d407b7e2..7a2a7fd16da0 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -22,7 +22,6 @@
#include <vcl/ctrl.hxx>
#include <vcl/graph.hxx>
#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>
#include <svx/svdview.hxx>
diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx
index cf7babc26c65..8adfac1d4116 100644
--- a/include/svx/graphichelper.hxx
+++ b/include/svx/graphichelper.hxx
@@ -21,10 +21,11 @@
#define INCLUDED_SVX_GRAPHICHELPER_HXX
#include <vcl/graph.hxx>
-#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>
-#include <com/sun/star/drawing/XShape.hpp>
+namespace com::sun::star::drawing { class XShape; }
+namespace weld { class Widget; }
+namespace weld { class Window; }
class SVX_DLLPUBLIC GraphicHelper
{
diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index 2600ee999c8c..7c24bcd38c92 100644
--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_SVX_GRFFLT_HXX
#define INCLUDED_SVX_GRFFLT_HXX
-#include <vcl/GraphicObject.hxx>
#include <svx/svxdllapi.h>
enum class SvxGraphicFilterResult {
NONE, UnsupportedGraphicType, UnsupportedSlot
};
+class GraphicObject;
class SfxRequest;
class SfxItemSet;
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 60f39a39198c..6b79bf1e40e7 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -19,14 +19,7 @@
#ifndef INCLUDED_SVX_GRIDCTRL_HXX
#define INCLUDED_SVX_GRIDCTRL_HXX
-#include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbc/XRowSetListener.hpp>
-#include <com/sun/star/sdb/XRowsChangeListener.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
@@ -34,14 +27,19 @@
#include <tools/ref.hxx>
#include <svtools/editbrowsebox.hxx>
#include <osl/mutex.hxx>
-#include <comphelper/propmultiplex.hxx>
-#include <vcl/transfer.hxx>
#include <svx/svxdllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
#include <vector>
-class DbGridControl;
+namespace comphelper { class OPropertyChangeMultiplexer; }
+namespace com::sun::star::beans { struct PropertyChangeEvent; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::sdbc { class XRowSet; }
+namespace com::sun::star::sdb { class XRowsChangeListener; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatter; }
+
class CursorWrapper;
bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight);
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 96b2779860d2..c99d587522da 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -12,6 +12,7 @@
#include <sfx2/sfxdlg.hxx>
#include <svx/numinf.hxx>
+#include <svx/svxids.hrc>
#include <tabvwsh.hxx>
#include <docsh.hxx>
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 35c164dd4b82..63055bdb11b2 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -23,6 +23,7 @@
#include <editeng/lineitem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/brushitem.hxx>
+#include <svx/framelink.hxx>
#include <fillinfo.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 060dc50f36ad..38363688641e 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -31,6 +31,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
#include <svx/postattr.hxx>
+#include <svx/svxids.hrc>
#include <unotools/misccfg.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 4a05ea4470d5..8ae2002b0b49 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -23,6 +23,7 @@
// Create default drawing objects via keyboard
#include <svx/svdocirc.hxx>
+#include <svx/svxids.hrc>
#include <svx/sxciaitm.hxx>
FuConstArc::FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 138cf5da8f14..e622a3e84fb4 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -23,6 +23,7 @@
// Create default drawing objects via keyboard
#include <svx/svdopath.hxx>
+#include <svx/svxids.hrc>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index becebdb208f6..8743138ec405 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -25,6 +25,7 @@
// Create default drawing objects via keyboard
#include <svx/svdopath.hxx>
#include <svx/svdocapt.hxx>
+#include <svx/svxids.hrc>
#include <svx/strings.hrc>
#include <svx/xlnwtit.hxx>
#include <svx/xlnstwit.hxx>
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 4e5c54cd6b5b..28ce53300be9 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -20,6 +20,7 @@
#include <editeng/outlobj.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdouno.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/dispatch.hxx>
#include <fuconstr.hxx>
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 16c18d075b01..6614b93776ca 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -21,6 +21,8 @@
#include <tabvwsh.hxx>
#include <drawview.hxx>
+#include <svx/svxids.hrc>
+
FuConstUnoControl::FuConstUnoControl(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, const SfxRequest& rReq)
: FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq)
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index d14858c85192..dbd403fe0573 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -27,6 +27,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svdview.hxx>
#include <svx/linkwarn.hxx>
+#include <svx/svxids.hrc>
#include <vcl/graphicfilter.hxx>
#include <svl/stritem.hxx>
#include <svtools/miscopt.hxx>
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 37fcbe86be8b..2a6fa9cf29db 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -21,6 +21,7 @@
#include <svx/svditer.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdpagv.hxx>
+#include <svx/svxids.hrc>
#include <fupoor.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 0ce0e00b7528..bddb591f0391 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -30,11 +30,13 @@
#include <editeng/wghtitem.hxx>
#include <svl/zforlist.hxx>
#include <svtools/scriptedtext.hxx>
+#include <svx/framelink.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <comphelper/processfactory.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <strings.hrc>
#include <zforauto.hxx>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 73df69c7172c..33bd694bcfef 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -23,6 +23,7 @@
#include <svx/svdoutl.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdpagv.hxx>
+#include <svx/svxids.hrc>
#include <editeng/sizeitem.hxx>
#include <sfx2/bindings.hxx>
#include <svl/ptitem.hxx>
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 7806f87164ad..ff9e75fdc909 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -24,6 +24,7 @@
#include <svx/svxids.hrc>
#include <editeng/adjustitem.hxx>
+#include <editeng/borderline.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <svtools/colorcfg.hxx>
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 5cf59a1ed809..abcb70e06a3f 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -22,6 +22,7 @@
#include <svx/svdview.hxx>
#include <svx/gallery.hxx>
#include <svx/hlnkitem.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index f6107693d29f..124af14f6b52 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -47,6 +47,7 @@
#include <svtools/ctrltool.hxx>
#include <sfx2/objsh.hxx>
#include <tools/debug.hxx>
+#include <tools/urlobj.hxx>
#include <editeng/flstitem.hxx>
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 57596bc0cb49..e3b46108068a 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -45,6 +45,7 @@
#include <svx/fmshell.hxx>
#include <svl/eitem.hxx>
#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 8b917f2962ca..c4781e6612bb 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -37,6 +37,7 @@
#include <sdcommands.h>
#include <svx/dialogs.hrc>
#include <svx/extrusionbar.hxx>
+#include <svx/f3dchild.hxx>
#include <svx/fontworkbar.hxx>
#include <svx/clipfmtitem.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 9a8d1ef41975..fdeac2f6ddb2 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -49,6 +49,9 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index b3800b6dfef5..8326c78f4f5a 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -25,6 +25,8 @@
#include <osl/diagnose.h>
#include <tools/fract.hxx>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
+
// Makes parser a static resource,
// we're synchronized externally.
// But watch out, the parser might have
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index b219843b13e1..5c38179be07e 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -31,6 +31,7 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <bitmaps.hlst>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 0ece8d22af00..d5a389e7eaf4 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -23,9 +23,11 @@
#include <sfx2/module.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
#include <svtools/colrdlg.hxx>
#include <sfx2/viewsh.hxx>
#include <svx/colorbox.hxx>
+#include <svx/f3dchild.hxx>
#include <svx/xflclit.hxx>
#include <svx/svdmodel.hxx>
#include <svx/globl3d.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 729d146c742d..4a20e3821e9a 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -31,6 +31,7 @@
#include <svx/e3ditem.hxx>
#include <editeng/colritem.hxx>
#include <svx/lathe3d.hxx>
+#include <svx/scene3d.hxx>
#include <svx/sphere3d.hxx>
#include <svx/extrud3d.hxx>
#include <svx/e3dundo.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 4f5ddf20c38b..02e98c643ed7 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -42,7 +42,9 @@
#include <com/sun/star/sdb/RowChangeAction.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
+#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index a764497b189d..86946e76cdec 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/form/XFormComponent.hpp>
#include <com/sun/star/form/XLoadable.hpp>
+#include <com/sun/star/form/XReset.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b6dd17200d63..dd14bffef58c 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/awt/MouseWheelBehavior.hpp>
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/form/XBoundComponent.hpp>
@@ -41,9 +42,12 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/Date.hpp>
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index ef8b5d0e4cce..d621b0f0a622 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/sdb/RowChangeAction.hpp>
#include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/container/XChild.hpp>
@@ -41,6 +42,7 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <tools/diagnose_ex.h>
#include <tools/debug.hxx>
#include <tools/fract.hxx>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 5bcd6a4b8df3..08a975fca685 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -50,6 +51,7 @@
#include <vcl/settings.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/viewdataentry.hxx>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 29d19f5358dc..e03e9cb98d85 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -30,6 +30,7 @@
#include <svx/dialmgr.hxx>
#include <svx/fmpage.hxx>
#include <svx/fmshell.hxx>
+#include <svx/fmview.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svxids.hrc>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 390a4a7eabc6..62ca4bc61775 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/form/Forms.hpp>
#include <com/sun/star/io/XPersistObject.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index f33b1e63ed57..7011a4c3faef 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -31,6 +31,7 @@
#include <treevisitor.hxx>
#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/container/EnumerableMap.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
#include <com/sun/star/form/Forms.hpp>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 3fa7d45a4338..82e0873c669a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -39,6 +39,7 @@
#include <svx/fmmodel.hxx>
#include <svx/fmpage.hxx>
#include <svx/fmshell.hxx>
+#include <svx/fmview.hxx>
#include <svx/obj3d.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/svdpagv.hxx>
@@ -71,6 +72,7 @@
#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/util/XModeSelector.hpp>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index dd06a9a4b1db..f9eedbd65dbd 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -27,12 +27,20 @@
#include <tools/wldcrd.hxx>
#include <vcl/svapp.hxx>
#include <unotools/textsearch.hxx>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XCheckBox.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <com/sun/star/util/SearchResult.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <com/sun/star/sdb/XColumn.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index c51f08c893b9..0d13fda390b2 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XIntrospection.hpp>
#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/XFormComponent.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
@@ -41,6 +42,7 @@
#include <com/sun/star/sdb/ErrorCondition.hpp>
#include <com/sun/star/sdb/ErrorMessageDialog.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdb/SQLErrorEvent.hpp>
#include <com/sun/star/sdb/XCompletedConnection.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
@@ -68,6 +70,7 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <osl/diagnose.h>
#include <rtl/math.hxx>
#include <sfx2/bindings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 0de437d335b8..588c6757f55a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -67,6 +67,7 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/container/XContainer.hpp>
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 1cdd504da545..46aca133dbae 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/form/runtime/FormOperations.hpp>
#include <com/sun/star/form/runtime/FormFeature.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
#include <tools/diagnose_ex.h>
#include <comphelper/anytostring.hxx>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 0b26759311eb..5620c9ffdea5 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -50,6 +50,7 @@
#include <comphelper/property.hxx>
#include <sfx2/frame.hxx>
#include <svx/dataaccessdescriptor.hxx>
+#include <vcl/event.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 5e177241adcd..0356394449a6 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -44,6 +44,7 @@
#include <svx/galmisc.hxx>
#include <svx/galtheme.hxx>
#include <svx/gallery1.hxx>
+#include <vcl/weld.hxx>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <memory>
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 67ef117a24b1..372961573e08 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -46,6 +46,7 @@
#include <svx/gallery1.hxx>
#include <svx/galtheme.hxx>
#include <svx/galmisc.hxx>
+#include <com/sun/star/awt/XProgressMonitor.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 29791d7ee540..09cc61882504 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -23,6 +23,7 @@
#include <vcl/virdev.hxx>
#include <vcl/image.hxx>
#include <svx/frmsel.hxx>
+#include <svx/framelink.hxx>
#include <svx/framelinkarray.hxx>
#include <editeng/borderline.hxx>
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index d01c4e658f8a..752ef978055e 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -39,6 +39,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/form/XChangeBroadcaster.hpp>
#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <comphelper/propmultiplex.hxx>
#include <comphelper/interfacecontainer2.hxx>
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index e03cc9f3417a..57edacf907e1 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -19,6 +19,8 @@
#include <svx/galleryitem.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 2cbc608a9948..25c17e21f5a8 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -36,6 +36,7 @@
#include <vcl/settings.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <tools/urlobj.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index c1ed1d484b3a..1162c4a9f6ab 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -26,6 +26,8 @@
#include <sfx2/zoomitem.hxx>
#include <svx/ruler.hxx>
#include <svx/fmshell.hxx>
+#include <svx/svdobj.hxx>
+#include <svl/style.hxx>
#include "swdllapi.h"
#include "swtypes.hxx"
#include "shellid.hxx"
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index e06bfd84b3a3..69e9fc0da59b 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -16,6 +16,7 @@
#include <comphelper/scopeguard.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <vcl/event.hxx>
#include <vcl/scheduler.hxx>
#include <fmtanchr.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e3fb10cb9946..a5f874f8b964 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -50,6 +50,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdview.hxx>
#include <svl/itemiter.hxx>
+#include <svx/svxids.hrc>
#include <unotools/localfilehelper.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index 1f5f4bfa8f5a..f09b387ec920 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -44,6 +44,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdotext.hxx>
+#include <svx/svdview.hxx>
#include <svl/srchitem.hxx>
#include <tools/link.hxx>
#include <unotools/configmgr.hxx>
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 66b51fd4ade8..2251efa48a76 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -21,6 +21,7 @@
#include <svx/fmview.hxx>
+class FmFormModel;
class OutputDevice;
class SwViewShellImp;
class SwFrame;
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 559142577009..0b0ed99ff390 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -93,6 +93,7 @@
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <svx/unoapi.hxx>
#include <svx/framelinkarray.hxx>
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 1f49688d6249..b00d6ed073cb 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -40,6 +40,8 @@
#include <officecfg/Office/Compatibility.hxx>
#include <vcl/svlbitm.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 948cd77e4974..21b351ffd2f5 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -71,6 +71,7 @@
#include <svx/xtable.hxx>
#include <svx/dlgutil.hxx>
#include <svx/strarray.hxx>
+#include <svx/svxids.hrc>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 91f33643289b..3bb59af15849 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -56,6 +56,7 @@
#include <editeng/brushitem.hxx>
#include <editeng/boxitem.hxx>
#include <svx/rulritem.hxx>
+#include <svx/svxids.hrc>
#include <unotools/collatorwrapper.hxx>
#include <tabledlg.hxx>
#include <fmtclds.hxx>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index ded18b7fffea..6017ee04ee21 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -61,6 +61,7 @@
#include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx>
#include <svx/flagsdef.hxx>
+#include <svx/svxids.hrc>
#include <memory>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 061a778b8780..7659bf7d7997 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -24,6 +24,7 @@
#include <editeng/lrspitem.hxx>
#include <editeng/brushitem.hxx>
#include <svtools/unitconv.hxx>
+#include <svx/svxids.hrc>
#include <vcl/menu.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f3dcc575fcf8..e42662d3c65d 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -19,6 +19,7 @@
#include <dbmgr.hxx>
#include <sfx2/app.hxx>
+#include <tools/lineend.hxx>
#include <vcl/print.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index d4108ef3b7f0..2290a3b632fc 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -24,6 +24,7 @@
#include <sfx2/request.hxx>
#include <sfx2/app.hxx>
#include <svx/optgenrl.hxx>
+#include <svx/svxids.hrc>
#include <docufld.hxx>
#include <expfld.hxx>
#include <view.hxx>
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 33a03a11181b..e65a0a186a58 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -22,6 +22,7 @@
#include <sfx2/request.hxx>
#include <sfx2/htmlmode.hxx>
#include <sfx2/viewfrm.hxx>
+#include <svx/svxids.hrc>
#include <dbfld.hxx>
#include <flddat.hxx>
#include <fmtfld.hxx>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index b13c9c478457..9690c0b833c7 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -29,6 +29,7 @@
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
+#include <svx/svxids.hrc>
#include <editeng/borderline.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lrspitem.hxx>
@@ -37,6 +38,7 @@
#include <svl/ctloptions.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 1f9e5d3aea8f..4517fdf89392 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -64,6 +64,7 @@
#include <strings.hrc>
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/filedlghelper.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index dd037789b4e1..915133cc54b5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -34,6 +34,7 @@
#include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx>
#include <svx/flagsdef.hxx>
+#include <svx/svxids.hrc>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index bef5a4aebae1..dfa49f8bfe12 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -19,6 +19,7 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
+#include <svx/svxids.hrc>
#include <vcl/weld.hxx>
#include <vcl/headbar.hxx>
#include <com/sun/star/text/XBookmarksSupplier.hpp>
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 278559fc24ac..29d4c6482b24 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -20,6 +20,7 @@
#include <hintids.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/request.hxx>
#include <editeng/fontitem.hxx>
#include <fmtftn.hxx>
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 85686aace8bc..dbef0e81300b 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -25,6 +25,7 @@
#include <globals.hrc>
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
+#include <svx/svxids.hrc>
#include <uitool.hxx>
#include <editeng/sizeitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/ui/table/autoformatpreview.cxx b/sw/source/ui/table/autoformatpreview.cxx
index 80e430d2f17f..f0a20aa25181 100644
--- a/sw/source/ui/table/autoformatpreview.cxx
+++ b/sw/source/ui/table/autoformatpreview.cxx
@@ -21,6 +21,8 @@
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <comphelper/processfactory.hxx>
#include <svtools/scriptedtext.hxx>
+#include <svx/framelink.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
#include <strings.hrc>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index ba63fb87d414..98a53fa710f5 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -26,16 +26,20 @@
#include <sfx2/objitem.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <svtools/restartdialog.hxx>
+#include <svl/eitem.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>
+#include <svtools/colorcfg.hxx>
+#include <svtools/accessibilityoptions.hxx>
#include <unotools/useroptions.hxx>
#include <com/sun/star/document/UpdateDocMode.hpp>
#include <sfx2/docfile.hxx>
#include <sfx2/objface.hxx>
+#include <vcl/settings.hxx>
#include <view.hxx>
#include <pview.hxx>
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 3e9613639f44..b650846cedaa 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -35,6 +35,7 @@
#include <svx/optgrid.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <fontcfg.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1486916cd181..96c7634ea5c3 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -106,6 +106,7 @@
#include <sfx2/fcontnr.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
+#include <svx/svxids.hrc>
#define ShellClass_SwDocShell
#include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 7428887c51b6..537be6405bfd 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -43,6 +43,7 @@
#include <sfx2/docfilt.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
+#include <svx/svxids.hrc>
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/flstitem.hxx>
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index c2eea900368a..4336e37d10cf 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -54,6 +54,7 @@
#include <swundo.hxx>
#include <svx/svdmodel.hxx>
#include <svx/drawitem.hxx>
+#include <svx/svxids.hrc>
#include <view.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index fa849f7319ec..61a881b314a7 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <svx/colorwindow.hxx>
#include <svx/dataaccessdescriptor.hxx>
+#include <svx/svxids.hrc>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index c921a2431857..d6f9eccf4a20 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -24,6 +24,7 @@
#include <vcl/wrkwin.hxx>
#include <vcl/graph.hxx>
#include <svtools/ehdl.hxx>
+#include <svtools/accessibilityoptions.hxx>
#include <unotools/resmgr.hxx>
#include <unotools/useroptions.hxx>
#include <svl/ctloptions.hxx>
@@ -53,6 +54,7 @@
#include <svx/srchdlg.hxx>
#include <svx/hyperdlg.hxx>
#include <svx/modctrl.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/emojipopup.hxx>
#include <sfx2/charmappopup.hxx>
#include <com/sun/star/scanner/ScannerManager.hpp>
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 7c8695461db0..d8b35c8b2759 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -36,6 +36,7 @@
#include <view.hxx>
#include <wrtsh.hxx>
#include <dbtree.hxx>
+#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <bitmaps.hlst>
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index c5175c6b8585..f4e9cc49771f 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -22,6 +22,7 @@
#include <svtools/toolboxcontroller.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/button.hxx>
+#include <vcl/edit.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index e513cbed436d..63f574429d0c 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -30,6 +30,7 @@
#include <sfx2/request.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/linkmgr.hxx>
+#include <svx/svxids.hrc>
#include <editeng/sizeitem.hxx>
#include <svtools/htmlcfg.hxx>
#include <section.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 43bfac284e6e..6912152d8f56 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -55,6 +55,7 @@
#include <svx/xmlexchg.hxx>
#include <svx/dbaexchange.hxx>
#include <svx/clipfmtitem.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/mieclip.hxx>
#include <svx/svdetc.hxx>
#include <svx/xoutbmp.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 3d9cc3eb8606..3de3daf90eb9 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -25,6 +25,7 @@
#include <strings.hrc>
#include <cmdid.h>
+#include <vcl/edit.hxx>
#include <vcl/menu.hxx>
#include <vcl/scrbar.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 075c3c5c247a..4d1f73987f7b 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -52,10 +52,13 @@
#include <svl/undo.hxx>
#include <svl/stritem.hxx>
+#include <svx/svxids.hrc>
+
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
+#include <vcl/event.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/menubtn.hxx>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index c32a750ddaa6..e22530d780ea 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -43,6 +43,7 @@
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <svx/hdft.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 1556aafd7cba..e50dcbbb2da8 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -45,7 +45,9 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/stritem.hxx>
+#include <svx/svxids.hrc>
#include <vcl/canvastools.hxx>
+#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <memory>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index be3ae822967d..3f0e6a0c1dc6 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -70,6 +70,7 @@
#include <svl/hint.hxx>
#include <svx/svdview.hxx>
+#include <svx/svxids.hrc>
#include <editeng/eeitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/kernitem.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 374d0dca57ce..fa96b285c01b 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -57,6 +57,7 @@
#include <svx/svdview.hxx>
#include <svx/svdhdl.hxx>
#include <svx/svdoutl.hxx>
+#include <svx/svxids.hrc>
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
#include <editeng/svxacorr.hxx>
diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx
index ead5e2179d28..ab3cd3a26ded 100644
--- a/sw/source/uibase/docvw/edtwin3.cxx
+++ b/sw/source/uibase/docvw/edtwin3.cxx
@@ -18,6 +18,7 @@
*/
#include <hintids.hxx>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <svx/ruler.hxx>
#include <viewopt.hxx>
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 1debb81ca787..5dbca0fcfe59 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -29,6 +29,7 @@
#include <editeng/shaditem.hxx>
#include <svx/swframevalidation.hxx>
#include <svx/xdef.hxx>
+#include <svx/svxids.hrc>
#include <fmtclds.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index 5b40cb1afbfd..f71f17575179 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -23,6 +23,7 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <tools/link.hxx>
+#include <vcl/edit.hxx>
#include "wrtsh.hxx"
#include "autoformatpreview.hxx"
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 16a2920a6d77..7368b2dc301d 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -70,6 +70,7 @@
#include <svl/stritem.hxx>
#include <svtools/langtab.hxx>
#include <svx/dlgutil.hxx>
+#include <svx/svxids.hrc>
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include <vcl/layout.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index e101b3750f59..65a3db34f0f3 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -44,6 +44,7 @@
#include <vector>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
#include <bitmaps.hlst>
#include <unomid.h>
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index f9aeac807745..a15dde147442 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -20,7 +20,9 @@
#include <view.hxx>
#include <cmdid.h>
#include <sfx2/request.hxx>
+#include <svx/svxids.hrc>
#include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx
index e9c082806439..16625a4df026 100644
--- a/sw/source/uibase/ribbar/conarc.cxx
+++ b/sw/source/uibase/ribbar/conarc.cxx
@@ -18,6 +18,8 @@
*/
#include <svx/svdobj.hxx>
+#include <svx/svxids.hrc>
+#include <vcl/event.hxx>
#include <view.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/ribbar/conpoly.cxx b/sw/source/uibase/ribbar/conpoly.cxx
index a7ee32b2249f..39da4b60fba8 100644
--- a/sw/source/uibase/ribbar/conpoly.cxx
+++ b/sw/source/uibase/ribbar/conpoly.cxx
@@ -20,6 +20,7 @@
#include <svx/svdmark.hxx>
#include <svx/svdview.hxx>
#include <svx/svdopath.hxx>
+#include <svx/svxids.hrc>
#include <view.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx
index 736545703b56..bd4bec4d9832 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -28,6 +28,7 @@
#include <svx/sdtaaitm.hxx>
#include <svx/svdview.hxx>
#include <svx/svdocapt.hxx>
+#include <svx/svxids.hrc>
#include <editeng/outlobj.hxx>
#include <cmdid.h>
#include <view.hxx>
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 3038bb9e4f75..7f590817086c 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -22,6 +22,7 @@
#include <svx/svdview.hxx>
#include <svx/svdobj.hxx>
#include <svl/ptitem.hxx>
+#include <svx/svxids.hrc>
#include <editeng/sizeitem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx
index a70583fda5dc..c06b134c38bb 100644
--- a/sw/source/uibase/ribbar/dselect.cxx
+++ b/sw/source/uibase/ribbar/dselect.cxx
@@ -19,6 +19,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
+#include <svx/svxids.hrc>
#include <view.hxx>
#include <edtwin.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 1b4a146010a0..6391dabce175 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -29,6 +29,7 @@
#include <svx/ruler.hxx>
#include <svl/zforlist.hxx>
#include <svl/stritem.hxx>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 8a331f173687..70db047a84bd 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -40,12 +40,14 @@
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svl/imageitm.hxx>
+#include <vcl/event.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/settings.hxx>
#include <rtl/ustring.hxx>
#include <swabstdlg.hxx>
#include <sfx2/zoomitem.hxx>
+#include <vcl/field.hxx>
#include <vcl/svapp.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index d12b5f2de980..a0cd422c4cdd 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -23,6 +23,7 @@
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
#include <svx/svdopath.hxx>
+#include <svx/svxids.hrc>
#include <vcl/EnumContext.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 61c694cc4c20..d558c631d8a1 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -51,6 +51,7 @@
#include <svx/svdundo.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/sdasitm.hxx>
+#include <svx/svxids.hrc>
#include <swundo.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 894f1d404f4e..f3b49d1f64a2 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -50,6 +50,7 @@
#include <svx/svditer.hxx>
#define ShellClass_SwDrawBaseShell
#include <sfx2/msg.hxx>
+#include <svx/svxids.hrc>
#include <swslots.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index dedf6ca6a4d2..14586437c680 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -60,6 +60,7 @@
#include <svx/clipfmtitem.hxx>
#include <svx/hlnkitem.hxx>
#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/htmlmode.hxx>
#include <svl/slstitm.hxx>
#include <editeng/langitem.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 23ee52c53493..557fbc5dd267 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -30,6 +30,7 @@
#include <sfx2/objface.hxx>
#include <svx/svdotext.hxx>
#include <svx/sdooitm.hxx>
+#include <svx/svxids.hrc>
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index a1e18351d68b..ee9a830620c2 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -77,6 +77,7 @@
#include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
#include <docsh.hxx>
#include <svx/drawitem.hxx>
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 7f995768943a..7c64a7263506 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -39,6 +39,7 @@
#include <svx/sdgtritm.hxx>
#include <svx/sdginitm.hxx>
#include <svx/sdgmoitm.hxx>
+#include <svx/svdview.hxx>
#include <editeng/brushitem.hxx>
#include <svx/grfflt.hxx>
#include <svx/compressgraphicdialog.hxx>
@@ -66,7 +67,7 @@
#include <svx/graphichelper.hxx>
#include <doc.hxx>
#include <IDocumentDrawModelAccess.hxx>
-//#include <svx/svxids.hrc>
+#include <svx/svxids.hrc>
#include <svx/drawitem.hxx>
#define ShellClass_SwGrfShell
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 1245d83195a7..edca8bbf99de 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -42,6 +42,7 @@
#include <svtools/langtab.hxx>
#include <svl/slstitm.hxx>
#include <svl/stritem.hxx>
+#include <svx/svxids.hrc>
#include <ndtxt.hxx>
#include <pam.hxx>
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index d262aff12481..723a231ce0fd 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -31,6 +31,7 @@
#include <svl/whiter.hxx>
#include <svl/intitem.hxx>
#include <svl/srchitem.hxx>
+#include <svx/svxids.hrc>
#include <numrule.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index fba429fba732..87156c1e99ad 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -34,6 +34,7 @@
#include <svx/sdgtritm.hxx>
#include <svx/sdginitm.hxx>
#include <svx/sdgmoitm.hxx>
+#include <svx/svdview.hxx>
#include <editeng/brushitem.hxx>
#include <svx/grfflt.hxx>
#include <fmturl.hxx>
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index b9a424e0d2af..b36d1b65fb4c 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -38,6 +38,7 @@
#include <svx/numinf.hxx>
#include <svx/svddef.hxx>
#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
#include <svl/zformat.hxx>
#include <sfx2/bindings.hxx>
#include <vcl/weld.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index ec6d8b5f6449..0f02926035a5 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -38,6 +38,7 @@
#include <svx/postattr.hxx>
#include <svx/hlnkitem.hxx>
#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/linkmgr.hxx>
#include <unotools/localedatawrapper.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index 323bb365d26d..75858cb2c0aa 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -22,6 +22,7 @@
#include <sfx2/viewfrm.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
+#include <svx/svxids.hrc>
#include <editeng/sizeitem.hxx>
#include <fmtfsize.hxx>
#include <fldbas.hxx>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 84125a27d73d..0aeb4e807b4b 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -30,6 +30,7 @@
#include <vcl/errinf.hxx>
#include <svx/svdview.hxx>
+#include <svx/svxids.hrc>
#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 657bf72df900..92a62f64a55b 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -118,6 +118,7 @@
#include <SwRewriter.hxx>
#include <svx/svdmodel.hxx>
#include <svx/drawitem.hxx>
+#include <svx/svxids.hrc>
#include <numrule.hxx>
#include <memory>
#include <xmloff/odffields.hxx>
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index d70f87eb472d..7a532e91c45d 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -23,6 +23,7 @@
#include <svl/stritem.hxx>
#include <svl/itemiter.hxx>
#include <svl/ctloptions.hxx>
+#include <svx/svxids.hrc>
#include <swmodule.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx
index 43f0690ba609..2e4656162201 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -42,6 +42,7 @@
#include <svx/svdouno.hxx>
#include <svx/fmshell.hxx>
#include <svx/sdrobjectfilter.hxx>
+#include <svx/svxids.hrc>
#include <outline.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index b95a9dcf1a47..92b9a542aa7b 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -39,6 +39,7 @@
#include <sfx2/tabdlg.hxx>
#include <svx/nbdtmg.hxx>
#include <svx/nbdtmgfact.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <memory>
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 8d3ad82cf38f..c83cc1982986 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -48,6 +48,7 @@
#include <cppuhelper/component_context.hxx>
#include <comphelper/propertysequence.hxx>
#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 737839eedeb9..01a48a3cba35 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -33,6 +33,7 @@
#include <sfx2/docinsert.hxx>
#include <sfx2/request.hxx>
+#include <svx/svxids.hrc>
#include <uivwimp.hxx>
#include <wview.hxx>
#include <unotxvw.hxx>
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 6ba499250620..ac79afc31f01 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -44,6 +44,8 @@
#include <svx/fmshell.hxx>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
+#include <svx/fmview.hxx>
+#include <svx/svxids.hrc>
#include <unotxvw.hxx>
#include <cmdid.h>
#include <svl/hint.hxx>
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 043c9f79a2e9..20bf8c3927be 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -34,6 +34,7 @@
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
#include <svx/srchdlg.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/templdlg.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 8bef973e1cd1..5d2d756803b1 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -21,6 +21,8 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
#include <svx/svdograf.hxx>
+#include <svx/svdview.hxx>
+#include <svx/svxids.hrc>
#include <fldmgr.hxx>
#include <expfld.hxx>
#include <modcfg.hxx>
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 570b35eb16ee..5b129d13e201 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -29,6 +29,7 @@
#include <editeng/outliner.hxx>
#include <svx/fmview.hxx>
#include <svx/dataaccessdescriptor.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/viewfrm.hxx>
#include <doc.hxx>
#include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 6d627a74fbac..28618e673aeb 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -39,6 +39,7 @@
#include <sfx2/request.hxx>
#include <svx/dlgutil.hxx>
#include <svx/dialmgr.hxx>
+#include <svx/svxids.hrc>
#include <editeng/langitem.hxx>
#include <svx/svxerr.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 95f524e74d46..be347f901c84 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -53,6 +53,8 @@
#include <AnnotationWin.hxx>
#include <svx/srchdlg.hxx>
+#include <svx/svdview.hxx>
+#include <svx/svxids.hrc>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 8997372f3b89..2fa7e12f5afe 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -30,6 +30,7 @@
#include <editeng/lrspitem.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
+#include <svx/svxids.hrc>
#include <view.hxx>
#include <wrtsh.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index c86dfa40fb5d..42301529fe8a 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -34,6 +34,7 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svdview.hxx>
+#include <svx/svxids.hrc>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 44f3725d7b62..9db45fe9d4ba 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -42,6 +42,7 @@
#include <sfx2/request.hxx>
#include <svx/srchdlg.hxx>
#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
#include <vcl/layout.hxx>
#include <vcl/wrkwin.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index fe6c882e9db7..f43e511636ef 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -30,6 +30,7 @@
#include <sfx2/objitem.hxx>
#include <svl/imageitm.hxx>
#include <svl/languageoptions.hxx>
+#include <svx/svxids.hrc>
#include <editeng/protitem.hxx>
#include <sfx2/linkmgr.hxx>
#include <editeng/langitem.hxx>
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index fd19f78f47c5..bfc4594b3270 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -26,6 +26,7 @@
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xfillit0.hxx>
+#include <svx/svxids.hrc>
#include <editeng/tstpitem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 232501b05455..13ec358cd0f7 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -29,6 +29,7 @@
#include <sot/filelist.hxx>
#include <svl/eitem.hxx>
#include <svl/urlbmk.hxx>
+#include <svx/svxids.hrc>
#include <vcl/graphicfilter.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 17e1a92eac34..92fe3bf3bc3a 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -39,6 +39,7 @@
#include <editeng/sizeitem.hxx>
#include <editeng/brushitem.hxx>
#include <svx/pageitem.hxx>
+#include <svx/svxids.hrc>
#include <editeng/lrspitem.hxx>
#include <svl/style.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 916e9e278ef0..25fd36701838 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -21,6 +21,7 @@
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <svl/srchitem.hxx>
+#include <svx/svxids.hrc>
#include <swtypes.hxx>
#include <cmdid.h>
#include <view.hxx>
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index c4fe24f16da9..b112d7a1c4cf 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -20,6 +20,7 @@
#include <sfx2/msg.hxx>
#include <svl/srchitem.hxx>
#include <sfx2/app.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/objface.hxx>
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index ec88bd671bee..782f152cde2b 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -29,8 +29,10 @@
#include <basic/sbxobj.hxx>
#include <uivwimp.hxx>
#include <svx/fmshell.hxx>
+#include <svx/fmview.hxx>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
+#include <svx/svxids.hrc>
#include <vcl/inputctx.hxx>
#include <sfx2/objface.hxx>
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 88db0132900b..5534ac0c29a5 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -23,6 +23,7 @@
#include <sfx2/viewfrm.hxx>
#include <svl/eitem.hxx>
#include <svl/macitem.hxx>
+#include <svx/svxids.hrc>
#include <unotools/charclass.hxx>
#include <editeng/scripttypeitem.hxx>
#include <sfx2/event.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 73c553c11709..cf2074b93467 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
#include <math.h>
#include <hintids.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 9298ffb95494..8897fe213130 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -23,6 +23,7 @@
#include <svl/urihelper.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
+#include <svx/svxids.hrc>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/dispatch.hxx>
More information about the Libreoffice-commits
mailing list