tdf#42949 Fix IWYU warnings in sc/source/ui/[a-c]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I5e810ed15cc33900d106b64353584d21f081517f
Reviewed-on: https://gerrit.libreoffice.org/67992
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index f5ef18ec..aae990f 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -458,6 +458,13 @@ blacklist:
sc/source/ui/inc/anyrefdg.hxx:
# base struct has to be a complete type
- sfx2/basedlgs.hxx
sc/source/ui/inc/colorformat.hxx:
# Needed for VclPtr type
- svx/colorbox.hxx
- vcl/edit.hxx
sc/source/ui/inc/condformatdlg.hxx:
# Needed for typedef
- condformatdlgentry.hxx
sc/source/ui/inc/condformatuno.hxx:
# base struct has to be a complete type
- com/sun/star/beans/XPropertySet.hpp
@@ -470,6 +477,9 @@ blacklist:
sc/source/ui/inc/dataprovider.hxx:
# Don't replace with an implementation detail
- orcus/csv_parser.hpp
sc/source/ui/inc/dpcontrol.hxx:
# Needed for unique_ptr type
- vcl/outdev.hxx
sc/source/ui/inc/DrawModelBroadcaster.hxx:
# base class has to be a complete type
- com/sun/star/document/XEventBroadcaster.hpp
@@ -691,7 +701,7 @@ blacklist:
sc/source/filter/lotus/filter.cxx:
# Needed to avoid loplugin:unreffun error
- filter.hxx
sc/source/filter/lotus/memory.cxx
sc/source/filter/lotus/memory.cxx:
# Needed to avoid loplugin:unreffun error
- scmem.h
sc/source/filter/lotus/op.cxx:
@@ -723,3 +733,90 @@ blacklist:
sc/source/filter/xml/xmlsubti.cxx:
# Needed for direct member access
- com/sun/star/sheet/XSpreadsheet.hpp
sc/source/ui/attrdlg/scdlgfact.cxx:
# Complete type needed for unique_ptr & ScConditionalFormatList
- conditio.hxx
sc/source/ui/attrdlg/scdlgfact.hxx:
# Complete type needed for unique_ptr & ScLinkedAreaDlg
- linkarea.hxx
sc/source/ui/app/inputhdl.cxx:
# Complete type needed for unique_ptr
- docpool.hxx
sc/source/ui/app/scdll.cxx:
# Needed for linker visibility of ScResId
- scresid.hxx
sc/source/ui/app/scmod.cxx:
# Needed for direct member access
- ooo/vba/XSinkCaller.hpp
sc/source/ui/app/typemap.cxx:
# Needed for STATIC_LINKING to be there for scslots.hxx
- config_options.h
# Needed for MID* macros
- mid.h
- editeng/memberids.h
# Needed by scslots.hxx
- sfx2/msg.hxx
- svl/slstitm.hxx
- editeng/fontitem.hxx
- svx/hlnkitem.hxx
- svl/srchitem.hxx
- svx/postattr.hxx
- editeng/postitem.hxx
- sfx2/tplpitem.hxx
- sfx2/zoomitem.hxx
- editeng/brushitem.hxx
- editeng/wghtitem.hxx
- editeng/fhgtitem.hxx
- editeng/colritem.hxx
- editeng/boxitem.hxx
- editeng/lineitem.hxx
- svl/ptitem.hxx
- editeng/sizeitem.hxx
- svx/algitem.hxx
- svx/clipfmtitem.hxx
- editeng/udlnitem.hxx
- svx/xlnstit.hxx
- svx/xlnedit.hxx
- svx/xfillit0.hxx
- svx/xflclit.hxx
- svx/xflhtit.hxx
- svx/xbtmpit.hxx
- svx/xlineit0.hxx
- svx/xlndsit.hxx
- svx/xlnwtit.hxx
- svx/xlnclit.hxx
- svx/xtextit0.hxx
- svx/xftadit.hxx
- svx/xftdiit.hxx
- svx/xftstit.hxx
- svx/xftmrit.hxx
- svx/xftouit.hxx
- svx/xftshit.hxx
- svx/xftshcit.hxx
- svx/xftshxy.hxx
- editeng/langitem.hxx
- editeng/justifyitem.hxx
- editeng/shdditem.hxx
- editeng/shaditem.hxx
- editeng/contouritem.hxx
- editeng/crossedoutitem.hxx
- editeng/charreliefitem.hxx
- editeng/lrspitem.hxx
- editeng/lspcitem.hxx
- editeng/ulspitem.hxx
- editeng/kernitem.hxx
- svx/rotmodit.hxx
- svx/drawitem.hxx
- svl/ilstitem.hxx
- svl/globalnameitem.hxx
- svx/chrtitem.hxx
- svx/zoomslideritem.hxx
- svx/xflftrit.hxx
- svx/xlncapit.hxx
- svx/xlinjoit.hxx
- svx/galleryitem.hxx
- svx/sdooitm.hxx
- sfx2/frame.hxx
- attrib.hxx
- svx/sdprcitm.hxx
- svx/sdmetitm.hxx
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 6a87f34..7ea9c99 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -20,18 +20,14 @@
#include <memory>
#include <sal/config.h>
#include <utility>
#include <AccessibleCell.hxx>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <AccessibleText.hxx>
#include <AccessibleDocument.hxx>
#include <tabvwsh.hxx>
#include <document.hxx>
#include <attrib.hxx>
#include <miscuno.hxx>
#include <editsrc.hxx>
#include <dociter.hxx>
#include <markdata.hxx>
@@ -41,12 +37,10 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
#include <editeng/brushitem.hxx>
#include <float.h>
#include <vcl/svapp.hxx>
#include <AccessibleSpreadsheet.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 18ce2fc..2b26d3f 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -18,28 +18,21 @@
*/
#include <AccessibleCellBase.hxx>
#include <attrib.hxx>
#include <scitems.hxx>
#include <miscuno.hxx>
#include <document.hxx>
#include <docfunc.hxx>
#include <docsh.hxx>
#include <formulacell.hxx>
#include <strings.hxx>
#include <unonames.hxx>
#include <detfunc.hxx>
#include <chgtrack.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
#include <editeng/brushitem.hxx>
#include <comphelper/sequence.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 6a1a778..40fd9d9 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -18,14 +18,11 @@
*/
#include <AccessibleContextBase.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <svl/hint.hxx>
#include <comphelper/sequence.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 8ea9146..f4e8640 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <toolkit/helper/convert.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <comphelper/sequence.hxx>
@@ -50,7 +49,6 @@
#include <svtools/colorcfg.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <editutil.hxx>
using ::utl::AccessibleRelationSetHelper;
using ::utl::AccessibleStateSetHelper;
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index c54e624..0c7d06d 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -23,7 +23,6 @@
#include <AccessibilityHints.hxx>
#include <document.hxx>
#include <drwlayer.hxx>
#include <shapeuno.hxx>
#include <DrawModelBroadcaster.hxx>
#include <drawview.hxx>
#include <gridwin.hxx>
@@ -32,7 +31,6 @@
#include <scresid.hxx>
#include <strings.hrc>
#include <strings.hxx>
#include <table.hxx>
#include <markdata.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -68,11 +66,8 @@
#include <editeng/editeng.hxx>
#include <comphelper/processfactory.hxx>
#include <list>
#include <algorithm>
#include <AccessibleCell.hxx>
#include <svx/unoapi.hxx>
#include <scmod.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index fe4ae80..878bb48 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -30,18 +30,15 @@
#include <scresid.hxx>
#include <strings.hrc>
#include <strings.hxx>
#include <DrawModelBroadcaster.hxx>
#include <docsh.hxx>
#include <drawview.hxx>
#include <preview.hxx>
#include <postit.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <tools/gen.hxx>
#include <svx/fmview.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdobj.hxx>
#include <svx/AccessibleTextHelper.hxx>
@@ -50,12 +47,9 @@
#include <svx/IAccessibleViewForwarder.hxx>
#include <svx/ShapeTypeHandler.hxx>
#include <toolkit/helper/convert.hxx>
#include <svx/unoshape.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
#include <utility>
#include <vector>
#include <algorithm>
#include <memory>
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 17fdbbe..0a30c9c 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -23,8 +23,6 @@
#include <utility>
#include <AccessibleEditObject.hxx>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <AccessibleText.hxx>
#include <editsrc.hxx>
#include <scmod.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index e32f86d..da38e63 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -20,20 +20,11 @@
#include <AccessibleGlobal.hxx>
#include <AccessibleFilterMenu.hxx>
#include <AccessibleFilterMenuItem.hxx>
#include <global.hxx>
#include <docpool.hxx>
#include <tools/gen.hxx>
#include <editeng/unoedsrc.hxx>
#include <editeng/editdata.hxx>
#include <editeng/outliner.hxx>
#include <vcl/unohelp.hxx>
#include <checklistmenu.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index a42507b..d946500 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -21,13 +21,8 @@
#include <AccessibleFilterMenuItem.hxx>
#include <checklistmenu.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
using namespace ::com::sun::star;
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index ad2d739..55aa073 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -21,7 +21,6 @@
#include <AccessibleFilterMenu.hxx>
#include <checklistmenu.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
using namespace ::com::sun::star;
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index a821207..34ec6cc 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -19,9 +19,7 @@
#include <AccessiblePageHeader.hxx>
#include <AccessiblePageHeaderArea.hxx>
#include <AccessibilityHints.hxx>
#include <prevwsh.hxx>
#include <miscuno.hxx>
#include <prevloc.hxx>
#include <document.hxx>
#include <stlpool.hxx>
@@ -41,11 +39,7 @@
#include <vcl/svapp.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <svl/style.hxx>
#include <svl/itempool.hxx>
#include <editeng/editobj.hxx>
#include <toolkit/helper/convert.hxx>
#include <algorithm>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 42239fd..e42df0b 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -22,10 +22,8 @@
#include <tools/gen.hxx>
#include <AccessiblePageHeaderArea.hxx>
#include <AccessibleText.hxx>
#include <AccessibilityHints.hxx>
#include <editsrc.hxx>
#include <prevwsh.hxx>
#include <prevloc.hxx>
#include <scresid.hxx>
#include <strings.hrc>
#include <strings.hxx>
@@ -36,7 +34,6 @@
#include <editeng/editobj.hxx>
#include <svx/AccessibleTextHelper.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <rtl/ustrbuf.hxx>
#include <toolkit/helper/convert.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index f3cd32d..939dce5 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -20,12 +20,10 @@
#include <sal/config.h>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <tools/gen.hxx>
#include <AccessibleText.hxx>
#include <editsrc.hxx>
#include <AccessiblePreviewCell.hxx>
#include <AccessibilityHints.hxx>
#include <prevwsh.hxx>
#include <prevloc.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index bb24d58..dc3c794 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -19,16 +19,12 @@
#include <sal/config.h>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <tools/gen.hxx>
#include <AccessibleText.hxx>
#include <editsrc.hxx>
#include <svx/AccessibleTextHelper.hxx>
#include <AccessiblePreviewHeaderCell.hxx>
#include <AccessibilityHints.hxx>
#include <prevwsh.hxx>
#include <miscuno.hxx>
#include <prevloc.hxx>
#include <strings.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index ac13447..3a37254 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -21,9 +21,7 @@
#include <AccessiblePreviewTable.hxx>
#include <AccessiblePreviewCell.hxx>
#include <AccessiblePreviewHeaderCell.hxx>
#include <AccessibilityHints.hxx>
#include <prevwsh.hxx>
#include <miscuno.hxx>
#include <prevloc.hxx>
#include <attrib.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index e2d69a6f..0cd1d7a 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -18,7 +18,6 @@
*/
#include <AccessibleSpreadsheet.hxx>
#include <AccessibilityHints.hxx>
#include <AccessibleCell.hxx>
#include <AccessibleDocument.hxx>
#include <tabvwsh.hxx>
@@ -30,7 +29,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 6257e19..2f0ebf1 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -18,7 +18,6 @@
*/
#include <AccessibleTableBase.hxx>
#include <miscuno.hxx>
#include <document.hxx>
#include <scresid.hxx>
#include <strings.hrc>
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 54b254d..11b6bee 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -25,8 +25,6 @@
#include <AccessibleCell.hxx>
#include <tabvwsh.hxx>
#include <editutil.hxx>
#include <cellvalue.hxx>
#include <formulacell.hxx>
#include <document.hxx>
#include <scmod.hxx>
#include <prevwsh.hxx>
@@ -38,8 +36,6 @@
#include <editeng/editview.hxx>
#include <editeng/unoedhlp.hxx>
#include <editeng/fhgtitem.hxx>
#include <vcl/virdev.hxx>
#include <editeng/editobj.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/justifyitem.hxx>
#include <svx/svdmodel.hxx>
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 602ddc31..4d1b654 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -18,7 +18,6 @@
*/
#include <DrawModelBroadcaster.hxx>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <svx/svdmodel.hxx>
#include <svx/unomod.hxx>
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 42da11f..338be83 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -22,15 +22,11 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/svditer.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdview.hxx>
#include <svx/svdograf.hxx>
#include <svtools/embedhlp.hxx>
#include <client.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 163f155..178bd5c 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -35,14 +35,10 @@
#include <svtools/embedtransfer.hxx>
#include <sot/storage.hxx>
#include <vcl/virdev.hxx>
#include <svx/fmglob.hxx>
#include <svx/svditer.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdouno.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdxcgv.hxx>
#include <sfx2/docfile.hxx>
#include <svl/itempool.hxx>
#include <svl/urlbmk.hxx>
@@ -54,13 +50,8 @@
#include <drawview.hxx>
#include <viewdata.hxx>
#include <scmod.hxx>
#include <chartlis.hxx>
#include <rangeutl.hxx>
#include <formula/grammar.hxx>
#include <dragdata.hxx>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/fhgtitem.hxx>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 55aaf25..5e9e3ee 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -27,7 +27,6 @@
#include <sfx2/app.hxx>
#include <editeng/acorrcfg.hxx>
#include <formula/errorcodes.hxx>
#include <svx/algitem.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/brushitem.hxx>
#include <svtools/colorcfg.hxx>
@@ -35,8 +34,6 @@
#include <editeng/editobj.hxx>
#include <editeng/editstat.hxx>
#include <editeng/editview.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/langitem.hxx>
#include <editeng/svxacorr.hxx>
#include <editeng/unolingu.hxx>
@@ -45,7 +42,6 @@
#include <editeng/misspellrange.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
#include <svl/zforlist.hxx>
@@ -77,7 +73,6 @@
#include <appoptio.hxx>
#include <docoptio.hxx>
#include <validat.hxx>
#include <userlist.hxx>
#include <rfindlst.hxx>
#include <inputopt.hxx>
#include <simpleformulacalc.hxx>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a6c1096..5684ba5 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -20,14 +20,12 @@
#include <memory>
#include <algorithm>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <sfx2/app.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/editview.hxx>
#include <editeng/editstat.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/wghtitem.hxx>
@@ -37,9 +35,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/event.hxx>
#include <stdlib.h>
#include <editeng/scriptspaceitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <vcl/cursor.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
@@ -48,7 +44,6 @@
#include <inputwin.hxx>
#include <scmod.hxx>
#include <uiitems.hxx>
#include <global.hxx>
#include <scresid.hxx>
#include <strings.hrc>
@@ -62,21 +57,18 @@
#include <docsh.hxx>
#include <appoptio.hxx>
#include <rangenam.hxx>
#include <formula/compiler.hxx>
#include <dbdata.hxx>
#include <rangeutl.hxx>
#include <docfunc.hxx>
#include <funcdesc.hxx>
#include <markdata.hxx>
#include <editeng/fontitem.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <AccessibleEditObject.hxx>
#include <AccessibleText.hxx>
#include <svtools/miscopt.hxx>
#include <comphelper/string.hxx>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <helpids.h>
namespace com::sun::star::accessibility { class XAccessible; }
#define THESIZE 1000000 // Should be more than enough!
#define TBX_WINDOW_HEIGHT 22 // in pixel - TODO: The same on all systems?
#define MULTILINE_BUTTON_WIDTH 20 // Width of the button which opens the multiline dropdown
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index fb0dbbd..8a48a87 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -18,7 +18,6 @@
*/
#include <scitems.hxx>
#include <svx/dialogs.hrc>
#include <sc.hrc>
#include <docpool.hxx>
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 0959849..69bf6a3 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -19,30 +19,19 @@
#include <config_features.h>
#include <editeng/eeitem.hxx>
#include <svx/fmobjfac.hxx>
#include <svx/objfac3d.hxx>
#include <svx/tbxcolor.hxx>
#include <comphelper/classids.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/app.hxx>
#include <avmedia/mediaplayer.hxx>
#include <avmedia/mediatoolbox.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/TextCharacterSpacingPopup.hxx>
#include <svx/TextUnderlinePopup.hxx>
#include <NumberFormatControl.hxx>
#include <svtools/parhtml.hxx>
#include <unotools/resmgr.hxx>
#include <sot/formats.hxx>
#include <scitems.hxx>
#include <scmod.hxx>
#include <scresid.hxx>
#include <sc.hrc>
@@ -64,7 +53,6 @@
#include <pgbrksh.hxx>
#include <scdll.hxx>
#include <docpool.hxx>
#include <appoptio.hxx>
#include <searchresults.hxx>
@@ -77,7 +65,6 @@
#include <svx/selctrl.hxx>
#include <svx/insctrl.hxx>
#include <svx/zoomctrl.hxx>
#include <editeng/flditem.hxx>
#include <svx/modctrl.hxx>
#include <svx/pszctrl.hxx>
#include <svx/grafctrl.hxx>
@@ -101,10 +88,6 @@
#include <svx/hyperdlg.hxx>
#include <svx/imapdlg.hxx>
#include <editutil.hxx>
#include <dwfunctr.hxx>
#include <acredlin.hxx>
#include <filter.hxx>
#include <scabstdlg.hxx>
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 90641ca..6c18442 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -17,31 +17,24 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <scitems.hxx>
#include <sfx2/app.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
#include <editeng/outliner.hxx>
#include <basic/sbstar.hxx>
#include <sfx2/sfxdlg.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
#include <IAnyRefDialog.hxx>
#include <anyrefdg.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svl/ctloptions.hxx>
#include <unotools/useroptions.hxx>
#include <vcl/status.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/printer.hxx>
@@ -50,17 +43,10 @@
#include <svl/whiter.hxx>
#include <svx/dialogs.hrc>
#include <svx/selctrl.hxx>
#include <svx/insctrl.hxx>
#include <svx/zoomctrl.hxx>
#include <svx/modctrl.hxx>
#include <svx/pszctrl.hxx>
#include <svx/zoomsliderctrl.hxx>
#include <svl/inethist.hxx>
#include <vcl/waitobj.hxx>
#include <svx/svxerr.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/resmgr.hxx>
#include <editeng/unolingu.hxx>
#include <unotools/lingucfg.hxx>
@@ -68,8 +54,6 @@
#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/linguistic2/XThesaurus.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/datatransfer/XTransferable2.hpp>
#include <ooo/vba/XSinkCaller.hpp>
#include <scmod.hxx>
@@ -97,24 +81,17 @@
#include <inputhdl.hxx>
#include <inputwin.hxx>
#include <msgpool.hxx>
#include <dwfunctr.hxx>
#include <formdata.hxx>
#include <tpprint.hxx>
#include <tpdefaults.hxx>
#include <transobj.hxx>
#include <detfunc.hxx>
#include <preview.hxx>
#include <dragdata.hxx>
#include <markdata.hxx>
#include <svx/xmlsecctrl.hxx>
#define ShellClass_ScModule
#include <scslots.hxx>
#include <scabstdlg.hxx>
#include <formula/errorcodes.hxx>
#include <formulagroup.hxx>
#include <documentlinkmgr.hxx>
#define SC_IDLE_MIN 150
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 84a0e6b..79a0437 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -23,7 +23,6 @@
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
#include <svx/fmglob.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdouno.hxx>
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index e3a88e6..404fcb5 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -18,13 +18,10 @@
*/
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/justifyitem.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -35,10 +32,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <vcl/wrkwin.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
#include <transobj.hxx>
#include <patattr.hxx>
@@ -53,14 +47,10 @@
#include <docfunc.hxx>
#include <scmod.hxx>
#include <dragdata.hxx>
#include <clipparam.hxx>
#include <editeng/paperinf.hxx>
#include <editeng/sizeitem.hxx>
#include <formula/errorcodes.hxx>
#include <svx/algitem.hxx>
#include <svl/intitem.hxx>
#include <svl/zforlist.hxx>
#include <docsh.hxx>
#include <markdata.hxx>
#include <stlpool.hxx>
@@ -69,7 +59,6 @@
#include <cellsuno.hxx>
#include <stringutil.hxx>
#include <formulaiter.hxx>
#include <gridwin.hxx>
using namespace com::sun::star;
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index c4aaaa9..3a0f559 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -19,14 +19,10 @@
#include <config_options.h>
#include <svx/svxids.hrc>
#include <sc.hrc>
#include <mid.h>
#include <scitems.hxx>
#include <editeng/memberids.h>
#include <sfx2/msg.hxx>
#include <svl/stritem.hxx>
#include <svl/slstitm.hxx>
#include <editeng/fontitem.hxx>
#include <svx/hlnkitem.hxx>
@@ -50,8 +46,6 @@
#include <svx/xlnedit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xgrad.hxx>
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xlineit0.hxx>
@@ -69,12 +63,10 @@
#include <svx/xftshxy.hxx>
#include <editeng/langitem.hxx>
#include <editeng/justifyitem.hxx>
#include <svx/grafctrl.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/formatbreakitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/lspcitem.hxx>
@@ -89,10 +81,8 @@
#include <svx/xflftrit.hxx>
#include <svx/xlncapit.hxx>
#include <svx/xlinjoit.hxx>
#include <svx/AffineMatrixItem.hxx>
#include <svx/galleryitem.hxx>
#include <svx/sdshitm.hxx>
#include <svl/aeitem.hxx>
#include <svx/sdooitm.hxx>
#include <avmedia/mediaitem.hxx>
#include <sfx2/frame.hxx>
#include <attrib.hxx>
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 7a0006c..3ebc301 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -19,19 +19,15 @@
#undef SC_DLLIMPLEMENTATION
#include <scitems.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/sfxdlg.hxx>
#include <svl/cjkoptions.hxx>
#include <tabpages.hxx>
#include <attrdlg.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <svx/flagsdef.hxx>
#include <editeng/flstitem.hxx>
#include <sfx2/app.hxx>
#include <osl/diagnose.h>
ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs)
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index b99de9b..dcf8de1 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -21,11 +21,9 @@
#include "scdlgfact.hxx"
#include <sc.hrc>
#include <scuiasciiopt.hxx>
#include <scuiautofmt.hxx>
#include <corodlg.hxx>
#include <crdlg.hxx>
#include <dapidata.hxx>
#include <dapitype.hxx>
#include <delcldlg.hxx>
@@ -41,7 +39,6 @@
#include <mvtabdlg.hxx>
#include <namecrea.hxx>
#include <namepast.hxx>
#include <namedefdlg.hxx>
#include <pfiltdlg.hxx>
#include <pvfundlg.hxx>
#include <dpgroupdlg.hxx>
@@ -67,11 +64,7 @@
#include <datafdlg.hxx>
#include <tpcompatibility.hxx>
#include <tpdefaults.hxx>
#include <colorformat.hxx>
#include <condformatdlg.hxx>
#include <condformatmgr.hxx>
#include <xmlsourcedlg.hxx>
#include <editutil.hxx>
#include <scres.hrc>
#include <svx/dialogs.hrc>
#include <sfx2/sfxdlg.hxx>
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index ce82fa0..1c277e4 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -22,40 +22,36 @@
#include <scabstdlg.hxx>
#include <sfx2/sfxdlg.hxx>
class ScImportAsciiDlg;
class ScAutoFormatDlg;
class ScColRowLabelDlg;
class ScDataPilotDatabaseDlg;
class ScDataPilotSourceTypeDlg;
class ScDataPilotServiceDlg;
class ScDeleteCellDlg;
class ScDataFormDlg;
class ScDeleteContentsDlg;
class ScFillSeriesDlg;
class ScGroupDlg;
class ScInsertCellDlg;
class ScInsertContentsDlg;
class ScInsertTableDlg;
class ScSelEntryDlg;
class ScLinkedAreaDlg;
class ScMetricInputDlg;
class ScMoveTableDlg;
class ScNameCreateDlg;
class ScNamePasteDlg;
class ScPivotFilterDlg;
class ScDPFunctionDlg;
class ScDPSubtotalDlg;
class ScDPNumGroupDlg;
class ScDPDateGroupDlg;
class ScDPShowDetailDlg;
class ScSortWarningDlg;
class ScNewScenarioDlg;
class ScShowTabDlg;
class ScStringInputDlg;
class ScTabBgColorDlg;
class ScImportOptionsDlg;
class ScTextImportOptionsDlg;
class ScCondFormatManagerDlg;
#include <corodlg.hxx>
#include <condformatmgr.hxx>
#include <dapitype.hxx>
#include <dapidata.hxx>
#include <datafdlg.hxx>
#include <delcodlg.hxx>
#include <delcldlg.hxx>
#include <dpgroupdlg.hxx>
#include <filldlg.hxx>
#include <groupdlg.hxx>
#include <linkarea.hxx>
#include <lbseldlg.hxx>
#include <inscldlg.hxx>
#include <instbdlg.hxx>
#include <inscodlg.hxx>
#include <mtrindlg.hxx>
#include <mvtabdlg.hxx>
#include <namecrea.hxx>
#include <namepast.hxx>
#include <pfiltdlg.hxx>
#include <pvfundlg.hxx>
#include <shtabdlg.hxx>
#include <scendlg.hxx>
#include <scuiasciiopt.hxx>
#include <scuiautofmt.hxx>
#include <scuiimoptdlg.hxx>
#include <sortdlg.hxx>
#include <strindlg.hxx>
#include <tabbgcolordlg.hxx>
#include <textimportoptions.hxx>
#define DECL_ABSTDLG_BASE(Class,DialogClass) \
ScopedVclPtr<DialogClass> pDlg; \
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 6a04553..66665ae 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -20,38 +20,7 @@
#undef SC_DLLIMPLEMENTATION
#include "scdlgfact.hxx"
#include <corodlg.hxx>
#include <condformatmgr.hxx>
#include <dapitype.hxx>
#include <dapidata.hxx>
#include <datafdlg.hxx>
#include <delcodlg.hxx>
#include <delcldlg.hxx>
#include <dpgroupdlg.hxx>
#include <filldlg.hxx>
#include <groupdlg.hxx>
#include <linkarea.hxx>
#include <lbseldlg.hxx>
#include <inscldlg.hxx>
#include <instbdlg.hxx>
#include <inscodlg.hxx>
#include <mtrindlg.hxx>
#include <mvtabdlg.hxx>
#include <namecrea.hxx>
#include <namepast.hxx>
#include <pfiltdlg.hxx>
#include <pvfundlg.hxx>
#include <shtabdlg.hxx>
#include <scendlg.hxx>
#include <scuiasciiopt.hxx>
#include <scuiautofmt.hxx>
#include <scuiimoptdlg.hxx>
#include <sortdlg.hxx>
#include <strindlg.hxx>
#include <tabbgcolordlg.hxx>
#include <textimportoptions.hxx>
#include <sal/types.h>
#include <sfx2/sfxdlg.hxx>
namespace scui
{
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 4e82125..8e1bf75 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -19,8 +19,6 @@
#undef SC_DLLIMPLEMENTATION
#include <global.hxx>
#include <document.hxx>
#include <attrib.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx
index db9b81a..b555804 100644
--- a/sc/source/ui/cctrl/cbnumberformat.cxx
+++ b/sc/source/ui/cctrl/cbnumberformat.cxx
@@ -18,7 +18,6 @@
*/
#include <cbnumberformat.hxx>
#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index c4067be..eecb56e 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -19,7 +19,6 @@
#include <comphelper/lok.hxx>
#include <vcl/outdev.hxx>
#include <vcl/window.hxx>
#include <vcl/decoview.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 772dd2e..e735ad6 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <vcl/fmtfield.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index be2bbd6..2ca4130 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -21,7 +21,6 @@
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <global.hxx>
#include <scitems.hxx>
#include <document.hxx>
#include <docpool.hxx>
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 0f69edc..0e6b557 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -24,7 +24,7 @@
#include <comphelper/string.hxx>
#include <rtl/math.hxx>
#include <unotools/localedatawrapper.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/builder.hxx>
#include <global.hxx>
namespace {
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 89eb23e..e3ba0a8 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -17,21 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tbzoomsliderctrl.hxx>
#include <vcl/event.hxx>
#include <vcl/image.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/gradient.hxx>
#include <vcl/settings.hxx>
#include <svl/itemset.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objsh.hxx>
#include <svx/zoomslideritem.hxx>
#include <set>
#include <docsh.hxx>
#include <stlpool.hxx>
#include <scitems.hxx>
#include <printfun.hxx>
#include <bitmaps.hlst>
// class ScZoomSliderControl ---------------------------------------
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index bb2d7d3..e82e23f 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -11,11 +11,8 @@
#include <colorscale.hxx>
#include <document.hxx>
#include <sc.hrc>
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 68fb6c4..0059f55 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -9,25 +9,16 @@
#include <condformatdlg.hxx>
#include <vcl/vclevent.hxx>
#include <svl/style.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/lstbox.hxx>
#include <libxml/tree.h>
#include <anyrefdg.hxx>
#include <document.hxx>
#include <conditio.hxx>
#include <stlpool.hxx>
#include <tabvwsh.hxx>
#include <colorscale.hxx>
#include <colorformat.hxx>
#include <reffact.hxx>
#include <docsh.hxx>
#include <docfunc.hxx>
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index a5b119b..e059f7b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -17,21 +17,17 @@
#include <document.hxx>
#include <vcl/vclevent.hxx>
#include <svl/style.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
#include <vcl/settings.hxx>
#include <formula/token.hxx>
#include <formula/errorcodes.hxx>
#include <tokenarray.hxx>
#include <stlpool.hxx>
#include <tabvwsh.hxx>
#include <simpleformulacalc.hxx>
#include <unotools/charclass.hxx>
#include <colorformat.hxx>
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index a244c60..c7792c9 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -13,12 +13,12 @@
#include <vcl/weld.hxx>
#include <svx/colorbox.hxx>
#include <address.hxx>
#include <svx/colorbox.hxx>
#include <vcl/edit.hxx>
struct ScDataBarFormatData;
class ScDocument;
class SvxColorListBox;
class SvNumberFormatter;
class Edit;
class ScDataBarSettingsDlg : public weld::GenericDialogController
{
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 1ec992b..ed1ef66 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -16,6 +16,7 @@
#include <rangelst.hxx>
#include "condformatdlgitem.hxx"
#include "condformatdlgentry.hxx"
#include "anyrefdg.hxx"
@@ -26,7 +27,6 @@
class ScDocument;
class ScConditionalFormat;
class ScCondFrmtEntry;
class ScViewData;
class ScCondFormatDlg;
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index 27863fe6..1b8c380 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -24,8 +24,8 @@
#include <tools/gen.hxx>
#include <tools/fract.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/outdev.hxx>
class OutputDevice;
class StyleSettings;
class ScDocument;
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 4d75849..38ae8f8 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -28,7 +28,6 @@
class ScDrawView;
class ScTabViewShell;
class SdrModel;
class Dialog;
class CommandEvent;
class KeyEvent;
class MouseEvent;
