summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/IwyuFilter_sc.yaml6
-rw-r--r--sc/source/ui/view/auditsh.cxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx6
-rw-r--r--sc/source/ui/view/cellsh1.cxx13
-rw-r--r--sc/source/ui/view/cellsh2.cxx8
-rw-r--r--sc/source/ui/view/cellsh3.cxx3
-rw-r--r--sc/source/ui/view/cellsh4.cxx3
-rw-r--r--sc/source/ui/view/cliputil.cxx1
-rw-r--r--sc/source/ui/view/colrowba.cxx1
-rw-r--r--sc/source/ui/view/dbfunc.cxx3
-rw-r--r--sc/source/ui/view/dbfunc2.cxx3
-rw-r--r--sc/source/ui/view/dbfunc3.cxx12
-rw-r--r--sc/source/ui/view/drawvie3.cxx2
-rw-r--r--sc/source/ui/view/drawvie4.cxx4
-rw-r--r--sc/source/ui/view/drawview.cxx5
-rw-r--r--sc/source/ui/view/editsh.cxx5
-rw-r--r--sc/source/ui/view/formatsh.cxx7
-rw-r--r--sc/source/ui/view/gridwin.cxx18
-rw-r--r--sc/source/ui/view/gridwin2.cxx3
-rw-r--r--sc/source/ui/view/gridwin3.cxx10
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/gridwin5.cxx12
-rw-r--r--sc/source/ui/view/gridwin_dbgutil.cxx1
-rw-r--r--sc/source/ui/view/hdrcont.cxx2
-rw-r--r--sc/source/ui/view/hintwin.cxx10
-rw-r--r--sc/source/ui/view/imapwrap.cxx1
-rw-r--r--sc/source/ui/view/invmerge.cxx1
-rw-r--r--sc/source/ui/view/notemark.cxx3
-rw-r--r--sc/source/ui/view/olinewin.cxx1
-rw-r--r--sc/source/ui/view/output.cxx11
-rw-r--r--sc/source/ui/view/output2.cxx7
-rw-r--r--sc/source/ui/view/output3.cxx5
-rw-r--r--sc/source/ui/view/overlayobject.cxx3
-rw-r--r--sc/source/ui/view/pgbrksh.cxx6
-rw-r--r--sc/source/ui/view/pivotsh.cxx3
-rw-r--r--sc/source/ui/view/preview.cxx4
-rw-r--r--sc/source/ui/view/prevwsh.cxx9
-rw-r--r--sc/source/ui/view/prevwsh2.cxx1
-rw-r--r--sc/source/ui/view/printfun.cxx9
-rw-r--r--sc/source/ui/view/reffact.cxx1
-rw-r--r--sc/source/ui/view/select.cxx2
-rw-r--r--sc/source/ui/view/spelldialog.cxx2
-rw-r--r--sc/source/ui/view/spelleng.cxx3
-rw-r--r--sc/source/ui/view/tabsplit.cxx1
-rw-r--r--sc/source/ui/view/tabview.cxx5
-rw-r--r--sc/source/ui/view/tabview2.cxx8
-rw-r--r--sc/source/ui/view/tabview3.cxx10
-rw-r--r--sc/source/ui/view/tabview4.cxx3
-rw-r--r--sc/source/ui/view/tabview5.cxx5
-rw-r--r--sc/source/ui/view/tabvwsh.cxx8
-rw-r--r--sc/source/ui/view/tabvwsh2.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx17
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx21
-rw-r--r--sc/source/ui/view/tabvwsh5.cxx3
-rw-r--r--sc/source/ui/view/tabvwsh8.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh9.cxx3
-rw-r--r--sc/source/ui/view/tabvwsha.cxx4
-rw-r--r--sc/source/ui/view/tabvwshb.cxx9
-rw-r--r--sc/source/ui/view/tabvwshc.cxx10
-rw-r--r--sc/source/ui/view/tabvwshd.cxx5
-rw-r--r--sc/source/ui/view/tabvwshe.cxx2
-rw-r--r--sc/source/ui/view/tabvwshf.cxx3
-rw-r--r--sc/source/ui/view/tabvwshg.cxx1
-rw-r--r--sc/source/ui/view/tabvwshh.cxx3
-rw-r--r--sc/source/ui/view/viewdata.cxx6
-rw-r--r--sc/source/ui/view/viewfun2.cxx11
-rw-r--r--sc/source/ui/view/viewfun3.cxx14
-rw-r--r--sc/source/ui/view/viewfun4.cxx4
-rw-r--r--sc/source/ui/view/viewfun5.cxx5
-rw-r--r--sc/source/ui/view/viewfun6.cxx8
-rw-r--r--sc/source/ui/view/viewfun7.cxx5
-rw-r--r--sc/source/ui/view/viewfunc.cxx11
-rw-r--r--sc/source/ui/view/viewutil.cxx5
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx5
74 files changed, 20 insertions, 395 deletions
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 7914de9251cd..6708f69fec8b 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -900,3 +900,9 @@ blacklist:
sc/source/ui/unoobj/textuno.cxx:
# Needed for macro defines
- editeng/unoprnms.hxx
+ sc/source/ui/view/tabview.cxx:
+ # Needed for direct member access
+ - pagedata.hxx
+ sc/source/ui/view/viewfun4.cxx:
+ # Needed for direct member access
+ - refundo.hxx
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 876c6ac5407e..457cc4e00217 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
-#include <svl/srchitem.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 4f6bbb937ce4..6554b63c6e7f 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -23,12 +23,10 @@
#include <svl/slstitm.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
-#include <unotools/moduleoptions.hxx>
#include <svtools/cliplistener.hxx>
#include <svtools/insdlg.hxx>
#include <sot/formats.hxx>
#include <svx/hlnkitem.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/objface.hxx>
@@ -37,15 +35,12 @@
#include <vcl/EnumContext.hxx>
#include <vcl/svapp.hxx>
#include <svx/clipfmtitem.hxx>
-#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
-#include <editeng/langitem.hxx>
#include <cellsh.hxx>
#include <sc.hrc>
#include <docsh.hxx>
#include <attrib.hxx>
#include <tabvwsh.hxx>
-#include <impex.hxx>
#include <formulacell.hxx>
#include <scmod.hxx>
#include <globstr.hrc>
@@ -53,7 +48,6 @@
#include <transobj.hxx>
#include <drwtrans.hxx>
#include <scabstdlg.hxx>
-#include <dociter.hxx>
#include <postit.hxx>
#include <cliputil.hxx>
#include <clipparam.hxx>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 27d135a02b04..382d32236b67 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -30,7 +30,6 @@
#include <comphelper/lok.hxx>
#include <comphelper/propertysequence.hxx>
#include <svl/stritem.hxx>
-#include <svl/whiter.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <sfx2/dispatch.hxx>
@@ -42,12 +41,8 @@
#include <svx/postattr.hxx>
#include <editeng/fontitem.hxx>
#include <svx/clipfmtitem.hxx>
-#include <sfx2/passwd.hxx>
#include <svx/hlnkitem.hxx>
#include <basic/sbxcore.hxx>
-#include <unotools/useroptions.hxx>
-#include <vcl/waitobj.hxx>
-#include <unotools/localedatawrapper.hxx>
#include <editeng/editview.hxx>
#include <svtools/cliplistener.hxx>
@@ -58,8 +53,6 @@
#include <patattr.hxx>
#include <scmod.hxx>
#include <tabvwsh.hxx>
-#include <impex.hxx>
-#include <reffind.hxx>
#include <uiitems.hxx>
#include <reffact.hxx>
#include <inputhdl.hxx>
@@ -69,18 +62,14 @@
#include <editable.hxx>
#include <dpobject.hxx>
#include <dpsave.hxx>
-#include <dpgroup.hxx>
#include <spellparam.hxx>
#include <postit.hxx>
-#include <clipparam.hxx>
-#include <pivot.hxx>
#include <dpsdbtab.hxx>
#include <dpshttab.hxx>
#include <dbdata.hxx>
#include <docsh.hxx>
#include <cliputil.hxx>
#include <markdata.hxx>
-#include <docpool.hxx>
#include <colorscale.hxx>
#include <condformatdlg.hxx>
#include <attrib.hxx>
@@ -89,7 +78,6 @@
#include <globstr.hrc>
#include <scresid.hxx>
#include <scui_def.hxx>
-#include <svx/dialogs.hrc>
#include <scabstdlg.hxx>
#include <tokenstringcontext.hxx>
#include <cellvalue.hxx>
@@ -100,7 +88,6 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/bootstrap.hxx>
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 72f12d6d016d..5bcdcd0c4d94 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -23,7 +23,6 @@
#include <scitems.hxx>
#include <comphelper/lok.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxdlg.hxx>
#include <svl/aeitem.hxx>
@@ -36,24 +35,21 @@
#include <unotools/moduleoptions.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sheet/TableValidationVisibility.hpp>
#include <cellsh.hxx>
+#include <dbdata.hxx>
+#include <queryparam.hxx>
#include <tabvwsh.hxx>
#include <sc.hrc>
#include <globstr.hrc>
#include <scresid.hxx>
#include <global.hxx>
-#include <globalnames.hxx>
#include <scmod.hxx>
#include <docsh.hxx>
#include <document.hxx>
#include <uiitems.hxx>
-#include <dbfunc.hxx>
#include <dbdocfun.hxx>
-#include <filtdlg.hxx>
-#include <dbnamdlg.hxx>
#include <reffact.hxx>
#include <validat.hxx>
#include <validate.hxx>
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 621427d69eda..127d21416162 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -27,7 +27,6 @@
#include <svl/stritem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <sfx2/app.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <scmod.hxx>
@@ -35,11 +34,9 @@
#include <tabvwsh.hxx>
#include <document.hxx>
#include <sc.hrc>
-#include <docsh.hxx>
#include <reffact.hxx>
#include <uiitems.hxx>
#include <autoform.hxx>
-#include <autofmt.hxx>
#include <cellsh.hxx>
#include <inputhdl.hxx>
#include <editable.hxx>
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index b13197d3f0f3..18ec442bb437 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,9 +27,6 @@
#include <inputwin.hxx>
#include <document.hxx>
#include <sc.hrc>
-#include <scabstdlg.hxx>
-
-#include <vcl/svapp.hxx>
const VclPtr<vcl::Window>& ScCellShell::GetFrameWin()
{
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index ebcce7e0f76e..bdee23c43a2a 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -21,7 +21,6 @@
#include <markdata.hxx>
#include <gridwin.hxx>
-#include <vcl/waitobj.hxx>
#include <sfx2/classificationhelper.hxx>
namespace
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index be8c28c0e646..80ae03c1c1f5 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -24,7 +24,6 @@
#include <document.hxx>
#include <scmod.hxx>
#include <tabvwsh.hxx>
-#include <docsh.hxx>
#include <appoptio.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 790bf624f1ab..01f05560d45c 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -18,14 +18,11 @@
*/
#include <scitems.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <unotools/charclass.hxx>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-
#include <dbfunc.hxx>
#include <docsh.hxx>
#include <attrib.hxx>
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index 5bc6dffc7250..866611f4089f 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -18,10 +18,7 @@
*/
#include <dbfunc.hxx>
-#include <docsh.hxx>
-#include <global.hxx>
#include <document.hxx>
-#include <sc.hrc>
#include <globstr.hrc>
void ScDBFunc::UpdateCharts( bool bAllCharts )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 3079be6f43e5..476b1a322110 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -19,9 +19,7 @@
#include <dbfunc.hxx>
#include <scitems.hxx>
-#include <sfx2/bindings.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
#include <svl/zforlist.hxx>
#include <sfx2/app.hxx>
@@ -40,41 +38,31 @@
#include <global.hxx>
#include <scresid.hxx>
#include <globstr.hrc>
-#include <sc.hrc>
#include <undotab.hxx>
#include <undodat.hxx>
#include <dbdata.hxx>
#include <rangenam.hxx>
-#include <rangeutl.hxx>
#include <docsh.hxx>
#include <olinetab.hxx>
-#include <consoli.hxx>
#include <olinefun.hxx>
#include <dpobject.hxx>
#include <dpsave.hxx>
#include <dpdimsave.hxx>
#include <dbdocfun.hxx>
#include <dpoutput.hxx>
-#include <dptabsrc.hxx>
-#include <dpshttab.hxx>
-#include <dpsdbtab.hxx>
#include <editable.hxx>
#include <docpool.hxx>
#include <patattr.hxx>
#include <unonames.hxx>
-#include <formulacell.hxx>
#include <userlist.hxx>
#include <queryentry.hxx>
#include <markdata.hxx>
-#include <stringutil.hxx>
#include <tabvwsh.hxx>
#include <generalfunction.hxx>
#include <sortparam.hxx>
-#include <sfx2/lokhelper.hxx>
#include <comphelper/lok.hxx>
-#include <list>
#include <memory>
#include <unordered_set>
#include <unordered_map>
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 0753335864b7..5fc8cce39b9e 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -19,7 +19,6 @@
#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
#include <strings.hrc>
@@ -28,7 +27,6 @@
#include <drwlayer.hxx>
#include "imapwrap.hxx"
#include <viewdata.hxx>
-#include <dbfunc.hxx>
#include <document.hxx>
#include <userdat.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 063a4f28ddda..2af1ee854489 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -21,7 +21,6 @@
#include <svx/svdograf.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdoole2.hxx>
-#include <svx/svdpage.hxx>
#include <svx/svdundo.hxx>
#include <sfx2/docfile.hxx>
#include <tools/urlobj.hxx>
@@ -40,15 +39,12 @@
#include <scmod.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <chartarr.hxx>
#include <gridwin.hxx>
#include <userdat.hxx>
-#include <tabvwsh.hxx>
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XComponentSupplier.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index c2a4dfe58144..992e716e0657 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -17,12 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <svx/svditer.hxx>
#include <svx/svdograf.hxx>
-#include <svx/svdomedia.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdouno.hxx>
@@ -30,8 +28,6 @@
#include <svx/svdpagv.hxx>
#include <svx/svdundo.hxx>
#include <svx/svdocapt.hxx>
-#include <editeng/outlobj.hxx>
-#include <editeng/writingmodeitem.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
@@ -51,7 +47,6 @@
#include <viewdata.hxx>
#include <document.hxx>
#include <drawutil.hxx>
-#include <futext.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 3d8cf4c88312..932bc0d6fda6 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/linguistic2/XThesaurus.hpp>
#include <comphelper/string.hxx>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
@@ -27,7 +26,6 @@
#include <svx/svxdlg.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/outliner.hxx>
-#include <editeng/unolingu.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
@@ -40,10 +38,8 @@
#include <editeng/postitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <editeng/shdditem.hxx>
-#include <svl/srchitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
-#include <sfx2/basedlgs.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/msg.hxx>
@@ -51,7 +47,6 @@
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sot/exchange.hxx>
#include <svtools/cliplistener.hxx>
#include <svl/whiter.hxx>
#include <sot/formats.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index f718589e0768..0d31afcaccd9 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -23,9 +23,7 @@
#include <scitems.hxx>
#include <editeng/borderline.hxx>
-#include <editeng/eeitem.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/newstyle.hxx>
@@ -41,10 +39,8 @@
#include <editeng/langitem.hxx>
#include <svx/numinf.hxx>
#include <sfx2/dispatch.hxx>
-#include <sfx2/templdlg.hxx>
#include <sfx2/tplpitem.hxx>
#include <editeng/svxenum.hxx>
-#include <svx/algitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
@@ -53,7 +49,6 @@
#include <editeng/brushitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/scripttypeitem.hxx>
-#include <svtools/colorcfg.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/justifyitem.hxx>
#include <editeng/fhgtitem.hxx>
@@ -61,7 +56,6 @@
#include <formatsh.hxx>
#include <sc.hrc>
-#include <scres.hrc>
#include <globstr.hrc>
#include <scresid.hxx>
#include <docsh.hxx>
@@ -74,7 +68,6 @@
#include <tabvwsh.hxx>
#include <undostyl.hxx>
#include <markdata.hxx>
-#include <markarr.hxx>
#include <attrib.hxx>
#define ShellClass_ScFormatShell
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 059cf07ff5ff..815a5e14c59b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -22,7 +22,6 @@
#include <memory>
#include <editeng/adjustitem.hxx>
#include <sot/storage.hxx>
-#include <svx/algitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/editview.hxx>
#include <editeng/editstat.hxx>
@@ -31,38 +30,29 @@
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <editeng/misspellrange.hxx>
-#include <svx/svdetc.hxx>
#include <editeng/editobj.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/ipclient.hxx>
#include <svl/stritem.hxx>
-#include <svl/urlbmk.hxx>
#include <svl/sharedstringpool.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/cursor.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/hatch.hxx>
#include <vcl/inputctx.hxx>
#include <vcl/settings.hxx>
#include <sot/formats.hxx>
#include <comphelper/classids.hxx>
-#include <sal/macros.h>
#include <svx/svdview.hxx>
#include <editeng/outliner.hxx>
-#include <svx/svditer.hxx>
#include <svx/svdocapt.hxx>
#include <svx/svdpagv.hxx>
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
#include <com/sun/star/sheet/DataPilotTableHeaderData.hpp>
-#include <com/sun/star/sheet/DataPilotTableResultData.hpp>
-#include <com/sun/star/sheet/DataPilotTablePositionData.hpp>
-#include <com/sun/star/sheet/DataPilotTablePositionType.hpp>
#include <com/sun/star/sheet/MemberResultFlags.hpp>
#include <com/sun/star/sheet/TableValidationVisibility.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
@@ -92,18 +82,14 @@
#include <scresid.hxx>
#include <inputhdl.hxx>
#include <uiitems.hxx>
-#include <filtdlg.hxx>
-#include <impex.hxx>
#include <formulacell.hxx>
#include <patattr.hxx>
#include <notemark.hxx>
#include <rfindlst.hxx>
-#include <docpool.hxx>
#include <output.hxx>
#include <docfunc.hxx>
#include <dbdocfun.hxx>
#include <dpobject.hxx>
-#include <dpoutput.hxx>
#include <transobj.hxx>
#include <drwtrans.hxx>
#include <seltrans.hxx>
@@ -114,7 +100,7 @@
#include <compiler.hxx>
#include <editable.hxx>
#include <fillinfo.hxx>
-#include <userdat.hxx>
+#include <filterentries.hxx>
#include <drwlayer.hxx>
#include <validat.hxx>
#include <tabprotection.hxx>
@@ -122,7 +108,6 @@
#include <dpcontrol.hxx>
#include <checklistmenu.hxx>
#include <clipparam.hxx>
-#include <cellsh.hxx>
#include <overlayobject.hxx>
#include <cellsuno.hxx>
#include <drawview.hxx>
@@ -135,7 +120,6 @@
#include <hints.hxx>
#include <spellcheckcontext.hxx>
#include <uiobject.hxx>
-#include <scabstdlg.hxx>
#include <undoblk.hxx>
#include <datamapper.hxx>
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index aef8160eedc7..248d978f793d 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -28,20 +28,17 @@
#include <pivot.hxx>
#include <uiitems.hxx>
#include <scresid.hxx>
-#include <sc.hrc>
#include <globstr.hrc>
#include <strings.hrc>
#include <pagedata.hxx>
#include <dpobject.hxx>
#include <dpsave.hxx>
-#include <dpoutput.hxx>
#include <dpshttab.hxx>
#include <dbdocfun.hxx>
#include <checklistmenu.hxx>
#include <dpcontrol.hxx>
#include <userlist.hxx>
#include <scabstdlg.hxx>
-#include <spellcheckcontext.hxx>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 33bd694bcfef..1fbc48e0ae6f 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
-#include <svx/svdoutl.hxx>
-#include <svx/svdotext.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svxids.hrc>
#include <editeng/sizeitem.hxx>
@@ -38,11 +33,6 @@
#include <drawutil.hxx>
#include <document.hxx>
-#include <drwlayer.hxx>
-#include <vcl/svapp.hxx>
-#include <userdat.hxx>
-#include <unitconv.hxx>
-#include <svx/svdpage.hxx>
#include <comphelper/lok.hxx>
bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 8fc6391a665e..074318662ecd 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -25,7 +25,6 @@
#include <editeng/colritem.hxx>
#include <editeng/editview.hxx>
#include <editeng/fhgtitem.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/printer.hxx>
#include <vcl/cursor.hxx>
@@ -33,7 +32,6 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
-#include <comphelper/scopeguard.hxx>
#include <sfx2/lokhelper.hxx>
#include <svx/svdview.hxx>
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 44ae79acf321..9ea948a86b54 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -17,22 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editeng/eeitem.hxx>
-
#include <editeng/flditem.hxx>
-#include <editeng/editview.hxx>
+#include <svx/fmpage.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdpagv.hxx>
#include <vcl/imapobj.hxx>
-#include <vcl/cursor.hxx>
#include <vcl/help.hxx>
-#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
-#include <sfx2/viewfrm.hxx>
#include <sfx2/sfxhelp.hxx>
-#include <viewuno.hxx>
#include <AccessibleDocument.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -40,18 +34,14 @@
#include <viewdata.hxx>
#include <drawview.hxx>
#include <drwlayer.hxx>
-#include <drawpage.hxx>
#include <document.hxx>
#include <notemark.hxx>
#include <chgtrack.hxx>
#include <chgviset.hxx>
#include <dbfunc.hxx>
-#include <tabvwsh.hxx>
#include <userdat.hxx>
#include <postit.hxx>
#include <global.hxx>
-#include <globstr.hrc>
-#include <scresid.hxx>
bool ScGridWindow::ShowNoteMarker( SCCOL nPosX, SCROW nPosY, bool bKeyboard )
{
diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx b/sc/source/ui/view/gridwin_dbgutil.cxx
index f4ff902cf9ac..9f372381c25c 100644
--- a/sc/source/ui/view/gridwin_dbgutil.cxx
+++ b/sc/source/ui/view/gridwin_dbgutil.cxx
@@ -15,7 +15,6 @@
#include <viewdata.hxx>
#include <document.hxx>
#include <patattr.hxx>
-#include <svl/poolitem.hxx>
#include <userdat.hxx>
#include <dpobject.hxx>
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 11cbc50c2831..c6c450f6aa88 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -21,10 +21,8 @@
#include <vcl/commandevent.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
-#include <tools/poly.hxx>
#include <svtools/colorcfg.hxx>
-#include <sc.hrc>
#include <tabvwsh.hxx>
#include <hdrcont.hxx>
#include <scmod.hxx>
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index a7fb47a2a339..2a1a9570b0b7 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -17,24 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <global.hxx>
#include <overlayobject.hxx>
-#include <scmod.hxx>
-#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/fontattribute.hxx>
-#include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
-#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
-#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <tools/lineend.hxx>
-#include <svtools/colorcfg.hxx>
+#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <vcl/metric.hxx>
diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index d2aff3a1380c..72d137339336 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/imapdlg.hxx>
-#include <sfx2/viewfrm.hxx>
#include "imapwrap.hxx"
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index 8863bed7c24a..528092012ae7 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/window.hxx>
#include <osl/diagnose.h>
#include <invmerge.hxx>
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 642bf405a2e8..719c682d0bf4 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -21,15 +21,14 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdocapt.hxx>
-#include <sfx2/printer.hxx>
#include <svl/itempool.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/window.hxx>
#include <notemark.hxx>
#include <document.hxx>
#include <postit.hxx>
-#include <drawview.hxx>
#define SC_NOTEMARK_TIME 800
#define SC_NOTEMARK_SHORT 70
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 431c6259aef5..feaec576e295 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/svapp.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index bd3d0bafd60a..accad5cbe1ac 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -17,17 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/embed/EmbedMisc.hpp>
-
#include <scitems.hxx>
-#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
-#include <editeng/editdata.hxx>
#include <svtools/colorcfg.hxx>
#include <svx/rotmodit.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/svxfont.hxx>
-#include <svx/svdoole2.hxx>
#include <tools/poly.hxx>
#include <vcl/svapp.hxx>
#include <vcl/pdfextoutdevdata.hxx>
@@ -49,15 +44,12 @@
#include <formulacell.hxx>
#include <attrib.hxx>
#include <patattr.hxx>
-#include <docpool.hxx>
-#include <tabvwsh.hxx>
#include <progress.hxx>
#include <pagedata.hxx>
#include <chgtrack.hxx>
#include <chgviset.hxx>
#include <viewutil.hxx>
#include <gridmerg.hxx>
-#include <invmerge.hxx>
#include <fillinfo.hxx>
#include <scmod.hxx>
#include <appoptio.hxx>
@@ -66,10 +58,7 @@
#include <colorscale.hxx>
#include <math.h>
-#include <iostream>
-#include <map>
#include <memory>
-#include <utility>
using namespace com::sun::star;
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index a3cc7609e310..4b4c4334c328 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -33,12 +33,10 @@
#include <editeng/emphasismarkitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/forbiddenruleitem.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/justifyitem.hxx>
#include <svx/rotmodit.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/fontitem.hxx>
@@ -46,6 +44,7 @@
#include <editeng/shdditem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/wrlmitem.hxx>
+#include <formula/errorcodes.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <vcl/svapp.hxx>
@@ -66,10 +65,6 @@
#include <progress.hxx>
#include <scmod.hxx>
#include <fillinfo.hxx>
-#include <viewdata.hxx>
-#include <tabvwsh.hxx>
-#include <docsh.hxx>
-#include <markdata.hxx>
#include <stlsheet.hxx>
#include <spellcheckcontext.hxx>
#include <scopetools.hxx>
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 17f315ca14f9..5b8d7e3ff842 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -17,11 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editeng/eeitem.hxx>
-#include <svx/svdograf.hxx>
-#include <svx/svdoole2.hxx>
#include <svx/svdoutl.hxx>
-#include <svx/svdpage.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdview.hxx>
#include <vcl/svapp.hxx>
@@ -31,7 +27,6 @@
#include <drwlayer.hxx>
#include <document.hxx>
#include <tabvwsh.hxx>
-#include <fillinfo.hxx>
#include <svx/fmview.hxx>
diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx
index ad5f34d95846..06b8a9ba627e 100644
--- a/sc/source/ui/view/overlayobject.cxx
+++ b/sc/source/ui/view/overlayobject.cxx
@@ -18,9 +18,6 @@
*/
#include <overlayobject.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/lineinfo.hxx>
-#include <tools/fract.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index f4b01dfaa801..5e56feee127a 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -17,18 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <svl/whiter.hxx>
#include <pgbrksh.hxx>
#include <tabvwsh.hxx>
#include <document.hxx>
-#include <sc.hrc>
#define ShellClass_ScPageBreakShell
#include <scslots.hxx>
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index e71221797d95..34f2ffc60c50 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -18,8 +18,6 @@
*/
#include <scitems.hxx>
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
@@ -39,7 +37,6 @@
#define ShellClass_ScPivotShell
#include <scslots.hxx>
-#include <memory>
SFX_IMPL_INTERFACE(ScPivotShell, SfxShell)
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index bb64f05e03f9..175955cfbc5b 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -52,14 +52,10 @@
#include <sc.hrc>
#include <helpids.h>
#include <AccessibleDocumentPagePreview.hxx>
-#include <vcl/lineinfo.hxx>
-#include <svx/algitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <attrib.hxx>
-#include <pagepar.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <AccessibilityHints.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index a1a079b805f1..baedb225ecca 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -19,14 +19,10 @@
#include <sal/config.h>
-#include <cstdlib>
-
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <sfx2/app.hxx>
#include <editeng/sizeitem.hxx>
-#include <svl/srchitem.hxx>
#include <svx/zoomslideritem.hxx>
#include <svx/svdview.hxx>
#include <sfx2/dispatch.hxx>
@@ -48,7 +44,6 @@
#include <prevwsh.hxx>
#include <preview.hxx>
#include <printfun.hxx>
-#include <attrib.hxx>
#include <scmod.hxx>
#include <inputhdl.hxx>
#include <docsh.hxx>
@@ -59,11 +54,7 @@
#include <scresid.hxx>
#include <sc.hrc>
#include <ViewSettingsSequenceDefines.hxx>
-#include <tpprint.hxx>
-#include <printopt.hxx>
#include <viewuno.hxx>
-#include <sax/tools/converter.hxx>
-#include <rtl/ustrbuf.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 8a4e5212b512..7f736ed2640b 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -24,7 +24,6 @@
#include <docsh.hxx>
#include <preview.hxx>
#include <hints.hxx>
-#include <sc.hrc>
void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index b2ca243b63e5..125c60048e7e 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -22,7 +22,6 @@
#include <printfun.hxx>
-#include <svx/svxids.hrc>
#include <editeng/adjustitem.hxx>
#include <editeng/borderline.hxx>
#include <editeng/boxitem.hxx>
@@ -37,14 +36,11 @@
#include <editeng/shaditem.hxx>
#include <editeng/sizeitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <svx/svdpagv.hxx>
#include <editeng/ulspitem.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/printer.hxx>
#include <tools/multisel.hxx>
#include <sfx2/docfile.hxx>
#include <tools/urlobj.hxx>
-#include <svx/xoutbmp.hxx>
#include <editutil.hxx>
#include <docsh.hxx>
@@ -57,11 +53,8 @@
#include <patattr.hxx>
#include <docpool.hxx>
#include <dociter.hxx>
-#include <formulacell.hxx>
-#include <drawutil.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <sc.hrc>
#include <pagedata.hxx>
#include <printopt.hxx>
#include <prevloc.hxx>
@@ -70,8 +63,6 @@
#include <fillinfo.hxx>
#include <postit.hxx>
-#include <vcl/lineinfo.hxx>
-
#include <memory>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 2583a31e4eae..fc2c35bab2b8 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sfx2/app.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 0c4e171cd097..4402e7cb11ad 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -18,11 +18,9 @@
*/
#include <tools/urlobj.hxx>
-#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
#include <select.hxx>
-#include <sc.hrc>
#include <tabvwsh.hxx>
#include <scmod.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index dc1ce1d77e6f..5bc29c704f6b 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -19,9 +19,7 @@
#include <spelldialog.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
#include <svx/svxids.hrc>
#include <editeng/editstat.hxx>
#include <editeng/editview.hxx>
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index c3b3f16775ab..f0682b918e44 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/editobj.hxx>
@@ -36,9 +35,7 @@
#include <docsh.hxx>
#include <cellvalue.hxx>
#include <cellform.hxx>
-#include <formulacell.hxx>
#include <patattr.hxx>
-#include <waitoff.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <markdata.hxx>
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 59ca3922ce8a..797c2e0844c5 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -19,7 +19,6 @@
#include <tabsplit.hxx>
#include <viewdata.hxx>
-#include <dbfunc.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 510742b5a30a..a3e62ecce066 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/svapp.hxx>
-
#include <scitems.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
@@ -40,16 +38,13 @@
#include <tabcont.hxx>
#include <scmod.hxx>
#include <sc.hrc>
-#include <viewutil.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <drawview.hxx>
#include <docsh.hxx>
#include <viewuno.hxx>
-#include <AccessibilityHints.hxx>
#include <appoptio.hxx>
#include <attrib.hxx>
-#include <table.hxx>
#include <comphelper/lok.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <sfx2/lokhelper.hxx>
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 2c3399ea844b..c9462e7e2e3e 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -18,14 +18,9 @@
*/
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-#include <vcl/timer.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
-#include <sfx2/childwin.hxx>
#include <attrib.hxx>
#include <pagedata.hxx>
@@ -35,12 +30,9 @@
#include <stlpool.hxx>
#include <docsh.hxx>
#include <gridwin.hxx>
-#include <olinewin.hxx>
-#include <uiitems.hxx>
#include <sc.hrc>
#include <viewutil.hxx>
#include <colrowba.hxx>
-#include <waitoff.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <scmod.hxx>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index a40eb9374ee9..f9dbc14bbd76 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -19,9 +19,7 @@
#include <rangelst.hxx>
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/brushitem.hxx>
#include <editeng/editview.hxx>
#include <svx/fmshell.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
@@ -34,6 +32,7 @@
#include <vcl/uitest/eventdescription.hxx>
#include <sal/log.hxx>
+#include <IAnyRefDialog.hxx>
#include <tabview.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
@@ -43,7 +42,6 @@
#include <colrowba.hxx>
#include <tabcont.hxx>
#include <scmod.hxx>
-#include <uiitems.hxx>
#include <sc.hrc>
#include <viewutil.hxx>
#include <editutil.hxx>
@@ -54,17 +52,11 @@
#include <rfindlst.hxx>
#include <hiranges.hxx>
#include <viewuno.hxx>
-#include <chartarr.hxx>
-#include <anyrefdg.hxx>
#include <dpobject.hxx>
-#include <patattr.hxx>
-#include <dociter.hxx>
#include <seltrans.hxx>
#include <fillinfo.hxx>
-#include <AccessibilityHints.hxx>
#include <rangeutl.hxx>
#include <client.hxx>
-#include <simpref.hxx>
#include <tabprotection.hxx>
#include <markdata.hxx>
#include <formula/FormulaCompiler.hxx>
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index ba390881d6f6..653c368d5b3e 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -18,7 +18,6 @@
*/
#include <vcl/help.hxx>
-#include <vcl/svapp.hxx>
#include <tabview.hxx>
#include <tabvwsh.hxx>
@@ -28,8 +27,6 @@
#include <gridwin.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <formulacell.hxx>
-#include <dociter.hxx>
// --- Referenz-Eingabe / Fill-Cursor
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 7ab18e937d02..84afe610ff35 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
#include <svx/fmshell.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdocapt.hxx>
@@ -46,12 +43,10 @@
#include <fusel.hxx>
#include <seltrans.hxx>
#include <scmod.hxx>
-#include <AccessibilityHints.hxx>
#include <docsh.hxx>
#include <viewuno.hxx>
#include <postit.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <comphelper/lok.hxx>
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 8d7d6fdc5191..38a16b0f1c74 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -17,32 +17,24 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
#include <svx/imapdlg.hxx>
#include <svx/srchdlg.hxx>
-#include <svl/srchitem.hxx>
-#include <sfx2/templdlg.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/viewfac.hxx>
#include <cellvalue.hxx>
-#include <docoptio.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
#include <reffact.hxx>
-#include <dwfunctr.hxx>
#include <sc.hrc>
#include <spelldialog.hxx>
#include <formulacell.hxx>
#include <searchresults.hxx>
-#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
// type void(SfxShell*,SfxRequest&) defined in scslots.hxx
#define ShellClass_ScTabViewShell
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 13d4f4297411..117edd72493d 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -20,14 +20,12 @@
#include <comphelper/lok.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svl/aeitem.hxx>
#include <svl/whiter.hxx>
#include <unotools/moduleoptions.hxx>
#include <svl/languageoptions.hxx>
#include <sfx2/dispatch.hxx>
#include <tabvwsh.hxx>
-#include <drawsh.hxx>
#include <drawview.hxx>
#include <fupoor.hxx>
#include <fuconrec.hxx>
@@ -37,7 +35,6 @@
#include <fusel.hxx>
#include <futext.hxx>
#include <fuinsert.hxx>
-#include <global.hxx>
#include <sc.hrc>
#include <scmod.hxx>
#include <appoptio.hxx>
@@ -46,7 +43,6 @@
// Create default drawing objects via keyboard
#include <svx/svdpagv.hxx>
#include <svl/stritem.hxx>
-#include <svx/svdpage.hxx>
#include <fuconcustomshape.hxx>
SdrView* ScTabViewShell::GetDrawView() const
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index f55d280adaa1..87f0548b8cc5 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
-#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/passwd.hxx>
@@ -42,19 +38,9 @@
#include <helpids.h>
#include <inputwin.hxx>
#include <scresid.hxx>
-#include <printfun.hxx>
#include <docsh.hxx>
-#include <rangelst.hxx>
-#include <prevwsh.hxx>
#include <rangeutl.hxx>
#include <reffact.hxx>
-#include <uiitems.hxx>
-#include <formulacell.hxx>
-#include <inputhdl.hxx>
-#include <autoform.hxx>
-#include <autofmt.hxx>
-#include <dwfunctr.hxx>
-#include <shtabdlg.hxx>
#include <tabprotection.hxx>
#include <protectiondlg.hxx>
#include <markdata.hxx>
@@ -64,12 +50,9 @@
#include <svx/zoomslideritem.hxx>
#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
#include <comphelper/string.hxx>
#include <scabstdlg.hxx>
-#include <memory>
-
namespace
{
enum class DetectFlags
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 8a083d1be7b9..531e0f08ba18 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -19,39 +19,27 @@
#include <sal/config.h>
-#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
#include <sfx2/app.hxx>
#include <svx/dialogs.hrc>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
#include <editeng/borderline.hxx>
-#include <editeng/boxitem.hxx>
-#include <svx/fmpage.hxx>
#include <svx/fmshell.hxx>
-#include <editeng/sizeitem.hxx>
#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/ipclient.hxx>
-#include <svl/whiter.hxx>
-#include <unotools/moduleoptions.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
#include <tools/svborder.hxx>
+#include <IAnyRefDialog.hxx>
#include <tabvwsh.hxx>
#include <sc.hrc>
#include <globstr.hrc>
-#include <stlpool.hxx>
-#include <stlsheet.hxx>
#include <docsh.hxx>
#include <scmod.hxx>
#include <appoptio.hxx>
-#include <rangeutl.hxx>
-#include <printfun.hxx>
#include <drawsh.hxx>
#include <drformsh.hxx>
#include <editsh.hxx>
@@ -66,7 +54,6 @@
#include <reffact.hxx>
#include <viewuno.hxx>
#include <dispuno.hxx>
-#include <anyrefdg.hxx>
#include <chgtrack.hxx>
#include <cellsh.hxx>
#include <oleobjsh.hxx>
@@ -76,9 +63,7 @@
#include <pgbrksh.hxx>
#include <dpobject.hxx>
#include <prevwsh.hxx>
-#include <tpprint.hxx>
#include <scextopt.hxx>
-#include <printopt.hxx>
#include <drawview.hxx>
#include <fupoor.hxx>
#include <navsett.hxx>
@@ -92,10 +77,6 @@
#include <gridwin.hxx>
#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
-#include <com/sun/star/chart2/XChartTypeContainer.hpp>
-#include <com/sun/star/chart2/XChartType.hpp>
#include <sfx2/lokhelper.hxx>
#include <comphelper/flagguard.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 402b7cdf752f..f222d3aa075e 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
#include <svl/hint.hxx>
#include <comphelper/lok.hxx>
#include <svl/zforlist.hxx>
@@ -29,14 +28,12 @@
#include <sfx2/viewfrm.hxx>
#include <tabvwsh.hxx>
-#include <sc.hrc>
#include <global.hxx>
#include <docsh.hxx>
#include <document.hxx>
#include <formulacell.hxx>
#include <scmod.hxx>
#include <uiitems.hxx>
-#include <editsh.hxx>
#include <hints.hxx>
#include <cellvalue.hxx>
#include <svl/sharedstring.hxx>
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index 3bcca6865636..c0b8f1a5863b 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -17,9 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
#include <editeng/borderline.hxx>
-#include <editeng/boxitem.hxx>
#include <tabvwsh.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index abcb70e06a3f..6dbe86567bee 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -20,8 +20,6 @@
#include <svx/imapdlg.hxx>
#include <svx/svdmark.hxx>
#include <svx/svdview.hxx>
-#include <svx/gallery.hxx>
-#include <svx/hlnkitem.hxx>
#include <svx/svxids.hrc>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
@@ -34,7 +32,6 @@
#include "imapwrap.hxx"
#include <tabvwsh.hxx>
#include <viewdata.hxx>
-#include <tabview.hxx>
#include <drwlayer.hxx>
#include <userdat.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index fbd9ca9564fd..07f1084a43fc 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -24,7 +24,6 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <o3tl/temporary.hxx>
#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
#include <sfx2/lokhelper.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxdlg.hxx>
@@ -36,9 +35,7 @@
#include <svl/srchdefs.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
-#include <svl/zformat.hxx>
#include <svx/numinf.hxx>
-#include <svx/unobrushitemhelper.hxx>
#include <svx/zoomslideritem.hxx>
#include <global.hxx>
@@ -49,7 +46,6 @@
#include <compiler.hxx>
#include <docsh.hxx>
#include <document.hxx>
-#include <dwfunctr.hxx>
#include <formulacell.hxx>
#include <globstr.hrc>
#include <inputhdl.hxx>
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 8c7cc954f009..14e011e9d331 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -17,15 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/awt/XRequestCallback.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/embed/EmbedMisc.hpp>
-#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/drawing/QRCode.hpp>
#include <vcl/errinf.hxx>
#include <sfx2/app.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -43,15 +40,12 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sfx2/filedlghelper.hxx>
#include <svtools/soerr.hxx>
#include <svl/rectitem.hxx>
#include <svl/slstitm.hxx>
#include <svl/whiter.hxx>
#include <unotools/moduleoptions.hxx>
#include <sot/exchange.hxx>
-#include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
#include <tabvwsh.hxx>
#include <scmod.hxx>
@@ -60,13 +54,10 @@
#include <client.hxx>
#include <fuinsert.hxx>
#include <docsh.hxx>
-#include <chartarr.hxx>
#include <drawview.hxx>
#include <ChartRangeSelectionListener.hxx>
#include <gridwin.hxx>
-#include <tools/urlobj.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <comphelper/lok.hxx>
using namespace com::sun::star;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 8e4dc812c2a0..39ca331fcd63 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_mpl.h>
-
#include <scitems.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/dispatch.hxx>
@@ -30,26 +28,19 @@
#include <scres.hrc>
#include <global.hxx>
#include <scmod.hxx>
-#include <docsh.hxx>
#include <document.hxx>
#include <uiitems.hxx>
-#include <pivot.hxx>
#include <namedlg.hxx>
#include <namedefdlg.hxx>
#include <solvrdlg.hxx>
#include <optsolver.hxx>
#include <tabopdlg.hxx>
-#include <autoform.hxx>
-#include <autofmt.hxx>
#include <consdlg.hxx>
#include <filtdlg.hxx>
#include <dbnamdlg.hxx>
#include <areasdlg.hxx>
-#include <rangeutl.hxx>
#include <crnrdlg.hxx>
#include <formula.hxx>
-#include <formulacell.hxx>
-#include <acredlin.hxx>
#include <highred.hxx>
#include <simpref.hxx>
#include <funcdesc.hxx>
@@ -79,7 +70,6 @@
#include <comphelper/lok.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <sfx2/lokhelper.hxx>
void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew )
{
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index 45b2c10d7c7e..15f35672c641 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -18,16 +18,11 @@
*/
#include <sfx2/childwin.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
#include <tabvwsh.hxx>
-#include <global.hxx>
#include <scmod.hxx>
#include <docsh.hxx>
-#include <sc.hrc>
#include <gridwin.hxx>
//! parent window for dialogs
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index faeb5d05bdfb..61bdf4e285ae 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -20,7 +20,6 @@
#include <comphelper/string.hxx>
#include <editeng/eeitem.hxx>
-#include <scitems.hxx>
#include <editeng/editview.hxx>
#include <editeng/flditem.hxx>
#include <svx/hlnkitem.hxx>
@@ -28,7 +27,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/request.hxx>
-#include <sfx2/objface.hxx>
#include <svl/stritem.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 95796fc0930b..1926f0727a18 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -21,7 +21,6 @@
#include <memory>
-#include <scitems.hxx>
#include <sfx2/request.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
@@ -41,7 +40,6 @@
#include <helpids.h>
#include <docsh.hxx>
#include <document.hxx>
-#include <shtabdlg.hxx>
#include <scresid.hxx>
#include <globstr.hrc>
#include <strings.hrc>
@@ -53,7 +51,6 @@
#include <scabstdlg.hxx>
#include <tabbgcolor.hxx>
-#include <tabbgcolordlg.hxx>
#include <markdata.hxx>
#include <vector>
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index 4935ceba3e01..3b6f46250879 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -22,7 +22,6 @@
#include <tools/urlobj.hxx>
#include <svx/fmglob.hxx>
#include <svx/svdouno.hxx>
-#include <svx/svdpagv.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index 7073b4a42d43..ceb72764ea12 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -23,7 +23,6 @@
#include <svx/svdmark.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdview.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
#include <basic/sbxcore.hxx>
@@ -32,9 +31,7 @@
#include <vcl/svapp.hxx>
#include <tabvwsh.hxx>
-#include <client.hxx>
#include <document.hxx>
-#include <docsh.hxx>
#include <sc.hrc>
#include <drwlayer.hxx>
#include <retypepassdlg.hxx>
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 926b2d377616..aaaebd35b865 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -23,7 +23,6 @@
#include <sfx2/lokhelper.hxx>
#include <sfx2/viewfrm.hxx>
#include <editeng/adjustitem.hxx>
-#include <svx/algitem.hxx>
#include <editeng/brushitem.hxx>
#include <svtools/colorcfg.hxx>
#include <editeng/editview.hxx>
@@ -36,8 +35,6 @@
#include <rtl/math.hxx>
#include <sal/log.hxx>
-#include <sax/tools/converter.hxx>
-
#include <viewdata.hxx>
#include <docoptio.hxx>
#include <scmod.hxx>
@@ -48,7 +45,6 @@
#include <tabview.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
-#include <sc.hrc>
#include <patattr.hxx>
#include <editutil.hxx>
#include <scextopt.hxx>
@@ -57,10 +53,8 @@
#include <inputopt.hxx>
#include <viewutil.hxx>
#include <markdata.hxx>
-#include <stlalgorithm.hxx>
#include <ViewSettingsSequenceDefines.hxx>
#include <gridwin.hxx>
-#include <rtl/ustrbuf.hxx>
#include <comphelper/flagguard.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 72cd999780f7..9aa60dc58ec2 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -18,7 +18,6 @@
*/
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <sfx2/app.hxx>
#include <editeng/borderline.hxx>
@@ -41,9 +40,6 @@
#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
-#include <basic/sbstar.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-
#include <viewfunc.hxx>
#include <sc.hrc>
@@ -62,22 +58,15 @@
#include <global.hxx>
#include <patattr.hxx>
#include <printfun.hxx>
-#include <rangenam.hxx>
-#include <rangeutl.hxx>
#include <refundo.hxx>
#include <table.hxx>
#include <tablink.hxx>
#include <tabvwsh.hxx>
#include <uiitems.hxx>
#include <undoblk.hxx>
-#include <undocell.hxx>
#include <undotab.hxx>
#include <sizedev.hxx>
#include <editable.hxx>
-#include <scmod.hxx>
-#include <inputhdl.hxx>
-#include <inputwin.hxx>
-#include <funcdesc.hxx>
#include <docuno.hxx>
#include <charthelper.hxx>
#include <tabbgcolor.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 06ebd51f1d9a..db0391e3b69b 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -18,28 +18,18 @@
*/
#include <scitems.hxx>
-#include <svx/svdetc.hxx>
-#include <svx/svditer.hxx>
-#include <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
-#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
-#include <svl/stritem.hxx>
-#include <svl/ptitem.hxx>
-#include <svl/urlbmk.hxx>
#include <comphelper/classids.hxx>
#include <sot/formats.hxx>
#include <sot/storage.hxx>
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
#include <tools/urlobj.hxx>
#include <sot/exchange.hxx>
#include <memory>
-#include <sfx2/lokhelper.hxx>
-
#include <attrib.hxx>
#include <patattr.hxx>
#include <dociter.hxx>
@@ -54,13 +44,9 @@
#include <global.hxx>
#include <transobj.hxx>
#include <drwtrans.hxx>
-#include <rangenam.hxx>
-#include <dbdata.hxx>
-#include <impex.hxx>
#include <chgtrack.hxx>
#include <waitoff.hxx>
#include <scmod.hxx>
-#include <sc.hrc>
#include <inputopt.hxx>
#include <warnbox.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 8bb8eb9db4f5..61d2733b1a7b 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -18,7 +18,6 @@
*/
#include <memory>
-#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/editobj.hxx>
@@ -27,8 +26,6 @@
#include <editeng/flditem.hxx>
#include <sot/storage.hxx>
#include <svx/hlnkitem.hxx>
-#include <editeng/langitem.hxx>
-#include <svx/svxerr.hxx>
#include <editeng/unolingu.hxx>
#include <sfx2/bindings.hxx>
@@ -51,7 +48,6 @@
#include <viewfunc.hxx>
#include <docsh.hxx>
#include <document.hxx>
-#include <docpool.hxx>
#include <globstr.hrc>
#include <global.hxx>
#include <scresid.hxx>
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index c4a936bba2fc..5894acc7f71d 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -25,7 +25,6 @@
#include <unotools/streamwrap.hxx>
#include <svx/fmmodel.hxx>
-#include <svx/svdetc.hxx>
#include <svx/svditer.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdogrp.hxx>
@@ -38,7 +37,6 @@
#include <sot/formats.hxx>
#include <sot/filelist.hxx>
#include <sot/storage.hxx>
-#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
#include <vcl/transfer.hxx>
#include <vcl/graph.hxx>
@@ -54,7 +52,6 @@
#include <docsh.hxx>
#include <drawview.hxx>
#include <impex.hxx>
-#include <dbfunc.hxx>
#include <dbdata.hxx>
#include <sc.hrc>
#include <filter.hxx>
@@ -69,7 +66,7 @@
#include <scabstdlg.hxx>
#include <clipparam.hxx>
#include <markdata.hxx>
-#include <sfx2/viewfrm.hxx>
+#include <sfx2/frame.hxx>
#include <svx/dbaexchange.hxx>
#include <memory>
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 9fbc5b49e886..0374f4f14ff0 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/svdundo.hxx>
+#include <formula/token.hxx>
#include <svx/svdocapt.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
@@ -28,25 +28,21 @@
#include <sal/log.hxx>
#include <viewfunc.hxx>
-#include <detfunc.hxx>
-#include <detdata.hxx>
#include <viewdata.hxx>
#include <drwlayer.hxx>
#include <docsh.hxx>
-#include <undocell.hxx>
#include <futext.hxx>
#include <docfunc.hxx>
#include <sc.hrc>
#include <fusel.hxx>
#include <reftokenhelper.hxx>
#include <externalrefmgr.hxx>
-#include <formulacell.hxx>
#include <markdata.hxx>
#include <drawview.hxx>
-#include <globalnames.hxx>
#include <inputhdl.hxx>
#include <tabvwsh.hxx>
#include <scmod.hxx>
+#include <postit.hxx>
#include <vector>
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 21ccfc3848a9..86b6f0f2f155 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -27,11 +27,8 @@
#include <svx/svdpage.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdundo.hxx>
-#include <svx/xbtmpit.hxx>
-#include <svx/xoutbmp.hxx>
#include <svtools/embedhlp.hxx>
#include <sfx2/objsh.hxx>
-#include <sfx2/viewfrm.hxx>
#include <sfx2/ipclient.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/embed/Aspects.hpp>
@@ -45,10 +42,8 @@
#include <drwtrans.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <chartlis.hxx>
#include <docuno.hxx>
#include <docsh.hxx>
-#include <convuno.hxx>
#include <dragdata.hxx>
#include <gridwin.hxx>
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 40d3dd18b186..d58b2324332c 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -20,15 +20,12 @@
#include <config_features.h>
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <sfx2/app.hxx>
#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/editview.hxx>
#include <editeng/langitem.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/justifyitem.hxx>
#include <sfx2/bindings.hxx>
@@ -38,7 +35,6 @@
#include <vcl/weld.hxx>
#include <vcl/virdev.hxx>
#include <vcl/waitobj.hxx>
-#include <vcl/wrkwin.hxx>
#include <stdlib.h>
#include <unotools/charclass.hxx>
@@ -48,16 +44,12 @@
#include <attrib.hxx>
#include <patattr.hxx>
#include <docpool.hxx>
-#include <uiitems.hxx>
#include <sc.hrc>
#include <strings.hrc>
#include <undocell.hxx>
#include <undoblk.hxx>
-#include <undotab.hxx>
#include <refundo.hxx>
-#include <dbdata.hxx>
#include <olinetab.hxx>
-#include <rangeutl.hxx>
#include <rangenam.hxx>
#include <globstr.hrc>
#include <global.hxx>
@@ -71,7 +63,6 @@
#include <compiler.hxx>
#include <docfunc.hxx>
#include <appoptio.hxx>
-#include <dociter.hxx>
#include <sizedev.hxx>
#include <editable.hxx>
#include <scui_def.hxx>
@@ -80,8 +71,6 @@
#include <cellsuno.hxx>
#include <tokenarray.hxx>
#include <rowheightcontext.hxx>
-#include <docfuncutil.hxx>
-#include <sfx2/lokhelper.hxx>
#include <comphelper/lok.hxx>
#include <conditio.hxx>
#include <columnspanset.hxx>
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 299d5d8e3440..ee13c2628c8b 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -29,24 +29,19 @@
#include <svl/cjkoptions.hxx>
#include <svl/ctloptions.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
#include <vcl/settings.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <osl/diagnose.h>
#include <viewutil.hxx>
-#include <global.hxx>
#include <chgtrack.hxx>
#include <chgviset.hxx>
#include <markdata.hxx>
#include <document.hxx>
#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
#include <memory>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index e24367342713..95e80068f48d 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -8,7 +8,6 @@
*/
#include <xmlsourcedlg.hxx>
-#include <sc.hrc>
#include <bitmaps.hlst>
#include <document.hxx>
#include <orcusfilters.hxx>
@@ -20,10 +19,8 @@
#include <tools/urlobj.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/objsh.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>