sw/IwyuFilter_sw.yaml | 12 +++++++ sw/source/uibase/app/appenv.cxx | 15 --------- sw/source/uibase/app/apphdl.cxx | 1 sw/source/uibase/app/applab.cxx | 15 --------- sw/source/uibase/app/appopt.cxx | 15 --------- sw/source/uibase/app/docsh.cxx | 29 ------------------- sw/source/uibase/app/docsh2.cxx | 22 -------------- sw/source/uibase/app/docshdrw.cxx | 6 --- sw/source/uibase/app/docshini.cxx | 23 +-------------- sw/source/uibase/app/docst.cxx | 14 --------- sw/source/uibase/app/docstyle.cxx | 6 --- sw/source/uibase/app/swdll.cxx | 2 - sw/source/uibase/app/swmodul1.cxx | 10 ------ sw/source/uibase/app/swmodule.cxx | 13 -------- sw/source/uibase/chrdlg/ccoll.cxx | 15 --------- sw/source/uibase/config/StoredChapterNumbering.cxx | 2 - sw/source/uibase/config/barcfg.cxx | 2 - sw/source/uibase/config/caption.cxx | 2 - sw/source/uibase/config/cfgitems.cxx | 7 ---- sw/source/uibase/config/dbconfig.cxx | 2 - sw/source/uibase/config/fontcfg.cxx | 3 - sw/source/uibase/config/modcfg.cxx | 9 ----- sw/source/uibase/config/prtopt.cxx | 2 - sw/source/uibase/config/uinums.cxx | 4 -- sw/source/uibase/config/usrpref.cxx | 8 ----- sw/source/uibase/config/viewopt.cxx | 5 --- sw/source/uibase/dbui/dbmgr.cxx | 29 ------------------- sw/source/uibase/dbui/dbtree.cxx | 8 ----- sw/source/uibase/dbui/dbui.cxx | 3 - sw/source/uibase/dbui/mailmergehelper.cxx | 2 - sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 1 sw/source/uibase/dbui/mmconfigitem.cxx | 2 - sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 9 ----- sw/source/uibase/dialog/regionsw.cxx | 23 --------------- sw/source/uibase/dialog/watermarkdialog.cxx | 1 sw/source/uibase/dialog/wordcountwrapper.cxx | 1 sw/source/uibase/dochdl/gloshdl.cxx | 16 ---------- sw/source/uibase/dochdl/swdtflvr.cxx | 16 ---------- sw/source/uibase/docvw/AnchorOverlayObject.cxx | 1 sw/source/uibase/docvw/AnnotationMenuButton.cxx | 2 - sw/source/uibase/docvw/AnnotationWin.cxx | 1 sw/source/uibase/docvw/AnnotationWin2.cxx | 17 ----------- sw/source/uibase/docvw/HeaderFooterWin.cxx | 9 ----- sw/source/uibase/docvw/PageBreakWin.cxx | 3 - sw/source/uibase/docvw/PostItMgr.cxx | 10 ------ sw/source/uibase/docvw/SidebarTxtControl.cxx | 3 - sw/source/uibase/docvw/UnfloatTableButton.cxx | 1 sw/source/uibase/docvw/edtdd.cxx | 3 - sw/source/uibase/docvw/edtwin.cxx | 25 ---------------- sw/source/uibase/docvw/edtwin2.cxx | 19 +----------- sw/source/uibase/docvw/edtwin3.cxx | 6 --- sw/source/uibase/docvw/romenu.cxx | 6 --- sw/source/uibase/docvw/srcedtw.cxx | 2 - sw/source/uibase/envelp/envimg.cxx | 3 - sw/source/uibase/envelp/labelcfg.cxx | 3 - sw/source/uibase/envelp/labimg.cxx | 4 -- sw/source/uibase/envelp/syncbtn.cxx | 1 sw/source/uibase/fldui/fldmgr.cxx | 13 -------- sw/source/uibase/fldui/fldwrap.cxx | 8 ----- sw/source/uibase/frmdlg/colex.cxx | 3 - sw/source/uibase/frmdlg/colmgr.cxx | 4 +- sw/source/uibase/frmdlg/frmmgr.cxx | 3 - sw/source/uibase/globdoc/globdoc.cxx | 5 --- 63 files changed, 32 insertions(+), 478 deletions(-)
New commits: commit c0867c0605fd5e41e41e932fcdf094b3dc77fd03 Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Tue Dec 24 21:48:40 2019 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Tue Jan 7 10:54:49 2020 +0100 tdf#42949 Fix IWYU warnings in sw/source/uibase/[a-g]*/*cxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I07178531d1c1edbfcd1ec1feed0dbe96ed2627a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85793 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 4402f28fc0c9..f20dd464f00c 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -596,3 +596,15 @@ blacklist: sw/source/filter/xml/xmlimp.cxx: # Actually used - com/sun/star/text/XTextRange.hpp + sw/source/uibase/app/docsh2.cxx: + # Needed for direct member access + - ooo/vba/word/XDocument.hpp + sw/source/uibase/dbui/mmconfigitem.cxx: + # Actually used + - com/sun/star/sdbc/XDataSource.hpp + sw/source/uibase/dochdl/gloshdl.cxx: + # Needed for direct member access + - docsh.hxx + sw/source/uibase/dochdl/swdtflvr.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index b99799d380ad..7cff9685aa93 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -17,29 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cstdarg> - #include <hintids.hxx> #include <comphelper/string.hxx> #include <sfx2/request.hxx> -#include <svx/svxids.hrc> -#include <vcl/svapp.hxx> -#include <sfx2/app.hxx> -#include <sfx2/docfac.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/pbinitem.hxx> #include <editeng/paperinf.hxx> -#include <editeng/formatbreakitem.hxx> #include <fmthdft.hxx> #include <swwait.hxx> -#include <paratr.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> #include <view.hxx> @@ -48,7 +40,6 @@ #include <fldbas.hxx> #include <swundo.hxx> #include <IDocumentDeviceAccess.hxx> -#include <dbmgr.hxx> #include <dialoghelp.hxx> #include <fmtcol.hxx> #include <frmmgr.hxx> @@ -60,15 +51,11 @@ #include <fmtpdsc.hxx> #include <cmdid.h> -#include <globals.hrc> -#include <app.hrc> #include <strings.hrc> #include <swabstdlg.hxx> #include <envimg.hxx> #include "appenv.hxx" -#include <memory> - #define ENV_NEWDOC RET_OK #define ENV_INSERT RET_USER diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index a2a2ff35b455..5f13b7c034c8 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <sal/log.hxx> #include <comphelper/propertysequence.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/event.hxx> diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index d8bae1facda4..c562f3450f1d 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -19,14 +19,10 @@ #include <config_features.h> -#include <cstdarg> - #include <hintids.hxx> #include <comphelper/string.hxx> #include <o3tl/deleter.hxx> -#include <vcl/svapp.hxx> -#include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> #include <sfx2/request.hxx> @@ -35,9 +31,6 @@ #include <editeng/pbinitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/boxitem.hxx> -#include <editeng/paperinf.hxx> -#include <editeng/protitem.hxx> #include <com/sun/star/frame/XModel.hpp> #include <fmthdft.hxx> #include <fmtanchr.hxx> @@ -45,27 +38,19 @@ #include <fmtornt.hxx> #include <swwait.hxx> #include <gloshdl.hxx> -#include <mdiexp.hxx> -#include <frmatr.hxx> -#include <paratr.hxx> #include <swmodule.hxx> #include <view.hxx> #include <docsh.hxx> #include <fldbas.hxx> -#include <swundo.hxx> #include <wrtsh.hxx> #include <cmdid.h> #include <dbmgr.hxx> -#include <fmtcol.hxx> -#include <expfld.hxx> #include <fldmgr.hxx> -#include <label.hxx> #include <labimg.hxx> #include <section.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> -#include <app.hrc> #include <strings.hrc> #include <swabstdlg.hxx> diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 90c04f18ae59..20dd6c34f744 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -25,7 +25,6 @@ #include <sal/log.hxx> #include <hintids.hxx> #include <svl/eitem.hxx> -#include <sfx2/request.hxx> #include <sfx2/app.hxx> #include <sfx2/printer.hxx> #include <sfx2/htmlmode.hxx> @@ -33,15 +32,10 @@ #include <editeng/brushitem.hxx> #include <editeng/tstpitem.hxx> #include <svx/optgrid.hxx> -#include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -#include <svx/svxids.hrc> #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <fontcfg.hxx> -#include <optload.hxx> -#include <optcomp.hxx> -#include <edtwin.hxx> #include <swmodule.hxx> #include <view.hxx> #include <doc.hxx> @@ -49,27 +43,18 @@ #include <IDocumentDeviceAccess.hxx> #include <IDocumentSettingAccess.hxx> #include <uitool.hxx> -#include <initui.hxx> -#include <fldbas.hxx> #include <wview.hxx> #include <cfgitems.hxx> #include <prtopt.hxx> #include <pview.hxx> #include <usrpref.hxx> -#include <modcfg.hxx> -#include <glosdoc.hxx> #include <uiitems.hxx> #include <editeng/langitem.hxx> #include <unotools/lingucfg.hxx> -#include <editeng/unolingu.hxx> #include <globals.hrc> -#include <globals.h> -#include <svl/slstitm.hxx> #include <swabstdlg.hxx> #include <swwrtshitem.hxx> -#include <unomid.h> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 8ca4d4a07651..758419a2b899 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <hintids.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> @@ -29,41 +28,27 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/PasswordHelper.hxx> -#include <editeng/adjustitem.hxx> -#include <basic/sbx.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/misccfg.hxx> -#include <sfx2/request.hxx> -#include <sfx2/passwd.hxx> #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/evntconf.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/notebookbar/SfxNotebookBar.hxx> #include <sfx2/printer.hxx> #include <sfx2/linkmgr.hxx> -#include <svl/srchitem.hxx> #include <editeng/flstitem.hxx> -#include <sfx2/htmlmode.hxx> -#include <svtools/soerr.hxx> #include <comphelper/lok.hxx> #include <comphelper/classids.hxx> -#include <basic/basmgr.hxx> #include <basic/sbmod.hxx> -#include <swevent.hxx> -#include <fmtpdsc.hxx> -#include <fmtfsize.hxx> #include <fmtfld.hxx> #include <node.hxx> #include <swwait.hxx> #include <printdata.hxx> -#include <frmatr.hxx> #include <view.hxx> #include <edtwin.hxx> #include <PostItMgr.hxx> #include <wrtsh.hxx> #include <docsh.hxx> -#include <basesh.hxx> #include <viewopt.hxx> #include <wdocsh.hxx> #include <swmodule.hxx> @@ -73,7 +58,6 @@ #include <docstyle.hxx> #include <doc.hxx> #include <docfunc.hxx> -#include <drawdoc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentLinksAdministration.hxx> @@ -82,31 +66,22 @@ #include <IDocumentRedlineAccess.hxx> #include <IDocumentStatistics.hxx> #include <IDocumentState.hxx> -#include <docstat.hxx> -#include <pagedesc.hxx> #include <pview.hxx> -#include <mdiexp.hxx> -#include <swbaslnk.hxx> #include <srcview.hxx> #include <ndindex.hxx> #include <ndole.hxx> -#include <swcli.hxx> #include <txtftn.hxx> #include <ftnidx.hxx> #include <fldbas.hxx> #include <docary.hxx> #include <swerror.h> #include <cmdid.h> -#include <globals.hrc> #include <strings.hrc> -#include <app.hrc> #include <unotools/fltrcfg.hxx> #include <svtools/htmlcfg.hxx> -#include <sfx2/fcontnr.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> -#include <svx/svxids.hrc> #define ShellClass_SwDocShell #include <sfx2/msg.hxx> @@ -123,15 +98,11 @@ #include <com/sun/star/frame/XStorable.hpp> #include <ooo/vba/XSinkCaller.hpp> -#include <unomid.h> #include <unotextrange.hxx> -#include <sfx2/Metadatable.hxx> #include <dbmgr.hxx> #include <iodetect.hxx> -#include <sal/log.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index b892d2606f79..d20e923f2584 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -21,27 +21,23 @@ #include <com/sun/star/drawing/ModuleDispatcher.hpp> #include <com/sun/star/frame/DispatchHelper.hpp> -#include <ooo/vba/XSinkCaller.hpp> #include <ooo/vba/word/XDocument.hpp> #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> #include <edtwin.hxx> -#include <hintids.hxx> #include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> #include <unotools/configmgr.hxx> +#include <vcl/errinf.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <svl/lckbitem.hxx> #include <svl/eitem.hxx> #include <svl/macitem.hxx> #include <svl/zforlist.hxx> -#include <svl/zformat.hxx> #include <unotools/pathoptions.hxx> #include <vcl/transfer.hxx> -#include <sfx2/sfxsids.hrc> #include <sfx2/dinfdlg.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> @@ -50,15 +46,11 @@ #include <sfx2/filedlghelper.hxx> #include <sfx2/printer.hxx> #include <sfx2/evntconf.hxx> -#include <svtools/sfxecode.hxx> -#include <svtools/ehdl.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <svx/dialogs.hrc> -#include <svx/svxids.hrc> #include <svx/drawitem.hxx> #include <editeng/svxacorr.hxx> -#include <editeng/langitem.hxx> #include <svx/fmshell.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/classificationhelper.hxx> @@ -70,10 +62,8 @@ #include <sfx2/app.hxx> #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> -#include <sot/storage.hxx> #include <comphelper/classids.hxx> #include <fmtcol.hxx> -#include <swevent.hxx> #include <view.hxx> #include <docsh.hxx> #include <docary.hxx> @@ -83,7 +73,6 @@ #include <globdoc.hxx> #include <fldwrap.hxx> #include <redlndlg.hxx> -#include <docstyle.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentSettingAccess.hxx> @@ -93,12 +82,9 @@ #include <IDocumentStatistics.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentState.hxx> -#include <pagedesc.hxx> #include <shellio.hxx> #include <pview.hxx> #include <srcview.hxx> -#include <poolfmt.hxx> -#include <usrpref.hxx> #include <wdocsh.hxx> #include <unotxdoc.hxx> #include <acmplwrd.hxx> @@ -108,13 +94,9 @@ #include <swcli.hxx> #include <cmdid.h> -#include <globals.h> #include <helpids.h> -#include <app.hrc> #include <strings.hrc> -#include <globals.hrc> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp> @@ -123,8 +105,6 @@ #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/script/vba/VBAEventId.hpp> #include <editeng/acorrcfg.hxx> -#include <SwStyleNameMapper.hxx> -#include <o3tl/deleter.hxx> #include <officecfg/Office/Security.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sw/source/uibase/app/docshdrw.cxx b/sw/source/uibase/app/docshdrw.cxx index 432d27befc43..e9a8b2e3160d 100644 --- a/sw/source/uibase/app/docshdrw.cxx +++ b/sw/source/uibase/app/docshdrw.cxx @@ -17,18 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <svx/svxids.hrc> -#include <svl/stritem.hxx> #include <svx/drawitem.hxx> -#include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <svx/xtable.hxx> #include <unotools/configmgr.hxx> #include <docsh.hxx> -#include <doc.hxx> #include <drawdoc.hxx> -#include <IDocumentDrawModelAccess.hxx> +#include <swtypes.hxx> using namespace ::com::sun::star; diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 45103144355d..eb2452150cb3 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -19,30 +19,22 @@ #include <hintids.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> +#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> -#include <sot/storinfo.hxx> -#include <sot/storage.hxx> -#include <svl/zforlist.hxx> #include <svtools/ctrltool.hxx> #include <unotools/configmgr.hxx> #include <unotools/lingucfg.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxmodelfactory.hxx> #include <sfx2/printer.hxx> -#include <sfx2/bindings.hxx> #include <svl/asiancfg.hxx> -#include <editeng/unolingu.hxx> -#include <sfx2/request.hxx> #include <svl/intitem.hxx> #include <editeng/adjustitem.hxx> #include <editeng/autokernitem.hxx> -#include <linguistic/lngprops.hxx> #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <sfx2/docfilt.hxx> -#include <svx/xtable.hxx> -#include <svx/drawitem.hxx> #include <svx/svxids.hrc> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> @@ -53,10 +45,8 @@ #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/hyphenzoneitem.hxx> -#include <editeng/svxacorr.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <view.hxx> #include <prtopt.hxx> #include <fmtcol.hxx> #include <docsh.hxx> @@ -72,30 +62,21 @@ #include <docfac.hxx> #include <docstyle.hxx> #include <shellio.hxx> -#include <tox.hxx> #include <swdtflvr.hxx> -#include <dbmgr.hxx> #include <usrpref.hxx> #include <fontcfg.hxx> #include <poolfmt.hxx> -#include <modcfg.hxx> #include <globdoc.hxx> -#include <ndole.hxx> -#include <mdiexp.hxx> #include <unotxdoc.hxx> #include <linkenum.hxx> #include <swwait.hxx> -#include <wrtsh.hxx> #include <swerror.h> -#include <globals.hrc> #include <unochart.hxx> #include <drawdoc.hxx> #include <DocumentSettingManager.hxx> #include <svx/CommonStyleManager.hxx> -// text grid -#include <tgrditem.hxx> #include <memory> using namespace ::com::sun::star::i18n; diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 0af55eee0676..5c1d6af32462 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -27,24 +27,18 @@ #include <o3tl/any.hxx> #include <sal/log.hxx> #include <hintids.hxx> -#include <sfx2/app.hxx> #include <sfx2/styledlg.hxx> #include <svl/whiter.hxx> -#include <sfx2/templdlg.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/newstyle.hxx> #include <sfx2/printer.hxx> #include <sfx2/viewfrm.hxx> -#include <svl/macitem.hxx> #include <svl/stritem.hxx> #include <svl/languageoptions.hxx> -#include <editeng/eeitem.hxx> #include <sfx2/htmlmode.hxx> #include <swmodule.hxx> -#include <wdocsh.hxx> -#include <fmtfsize.hxx> #include <fchrfmt.hxx> #include <svtools/htmlcfg.hxx> #include <svx/xdef.hxx> @@ -52,15 +46,12 @@ #include <SwRewriter.hxx> #include <numrule.hxx> #include <swundo.hxx> -#include <svx/svdmodel.hxx> #include <svx/drawitem.hxx> -#include <svx/svxids.hrc> #include <view.hxx> #include <wrtsh.hxx> #include <docsh.hxx> #include <uitool.hxx> #include <cmdid.h> -#include <globals.hrc> #include <viewopt.hxx> #include <doc.hxx> #include <drawdoc.hxx> @@ -69,7 +60,6 @@ #include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <IDocumentFieldsAccess.hxx> -#include <IDocumentListsAccess.hxx> #include <IDocumentState.hxx> #include <frmfmt.hxx> #include <charfmt.hxx> @@ -78,13 +68,9 @@ #include <docstyle.hxx> #include <uiitems.hxx> #include <fmtcol.hxx> -#include <frmmgr.hxx> -#include <swevent.hxx> #include <edtwin.hxx> #include <unochart.hxx> -#include <app.hrc> #include <swabstdlg.hxx> -#include <list.hxx> #include <paratr.hxx> #include <tblafmt.hxx> #include <sfx2/watermarkitem.hxx> diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 61898b1f074c..ddfd2c4e6d12 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -33,7 +33,6 @@ #include <drawdoc.hxx> #include <fmtcol.hxx> #include <uitool.hxx> -#include <swmodule.hxx> #include <wrtsh.hxx> #include <docsh.hxx> #include <frmfmt.hxx> @@ -51,23 +50,18 @@ #include <IDocumentDrawModelAccess.hxx> #include <IDocumentState.hxx> #include <cmdid.h> -#include <app.hrc> #include <strings.hrc> #include <paratr.hxx> #include <SwStyleNameMapper.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> -#include <unotools/localedatawrapper.hxx> #include <unotools/intlwrapper.hxx> #include <numrule.hxx> -#include <fmthdft.hxx> -#include <svx/svxids.hrc> #include <svx/xdef.hxx> #include <SwRewriter.hxx> #include <hints.hxx> #include <svx/xfillit0.hxx> #include <svx/xflftrit.hxx> -#include <svx/svdmodel.hxx> #include <svx/drawitem.hxx> // The Format names in the list of all names have the diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 1504e6fa9c27..090480bc51da 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -26,7 +26,6 @@ #include <globdoc.hxx> #include <initui.hxx> #include <swmodule.hxx> -#include <swtypes.hxx> #include <init.hxx> #include <dobjfac.hxx> @@ -42,7 +41,6 @@ #include <editeng/acorrcfg.hxx> #include <swacorr.hxx> -#include <unomid.h> #include <swabstdlg.hxx> #include "swdllimpl.hxx" diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index cc225e872aeb..b6cfe847a59b 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -19,22 +19,18 @@ #include <sal/config.h> -#include <cstddef> #include <memory> #include <boost/property_tree/json_parser.hpp> #include <hintids.hxx> #include <sfx2/request.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/childwin.hxx> #include <unotools/useroptions.hxx> -#include <cppuhelper/weak.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <svx/colorwindow.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <svx/svxids.hrc> +#include <editeng/editids.hrc> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> @@ -52,17 +48,13 @@ #include <wview.hxx> #include <wrtsh.hxx> #include <docsh.hxx> -#include <dbmgr.hxx> #include <uinums.hxx> #include <prtopt.hxx> #include <navicfg.hxx> #include <doc.hxx> -#include <cmdid.h> -#include <app.hrc> #include <strings.hrc> #include <IDocumentLayoutAccess.hxx> -#include <unomid.h> #include <tools/color.hxx> #include <PostItMgr.hxx> diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 8da92e722fb5..91bda9aea631 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -20,8 +20,6 @@ #include <config_features.h> #include <hintids.hxx> -#include <swerror.h> -#include <vcl/graph.hxx> #include <svtools/ehdl.hxx> #include <svtools/accessibilityoptions.hxx> #include <unotools/resmgr.hxx> @@ -31,7 +29,6 @@ #include <svx/TextCharacterSpacingPopup.hxx> #include <svx/TextUnderlinePopup.hxx> #include <svx/ParaSpacingControl.hxx> -#include <svx/svdobj.hxx> #include <svx/pszctrl.hxx> #include <svx/insctrl.hxx> #include <svx/selctrl.hxx> @@ -46,14 +43,12 @@ #include <svx/fontwork.hxx> #include <SwSpellDialogChildWindow.hxx> #include <svx/grafctrl.hxx> -#include <svx/tbxcolor.hxx> #include <svx/clipboardctl.hxx> #include <svx/lboxctrl.hxx> #include <svx/imapdlg.hxx> #include <svx/srchdlg.hxx> #include <svx/hyperdlg.hxx> #include <svx/modctrl.hxx> -#include <svx/svxids.hrc> #include <sfx2/emojipopup.hxx> #include <sfx2/charmappopup.hxx> #include <com/sun/star/scanner/ScannerManager.hpp> @@ -63,14 +58,10 @@ #include <comphelper/processfactory.hxx> #include <docsh.hxx> #include <swmodule.hxx> -#include <swevent.hxx> #include <cmdid.h> -#include <dobjfac.hxx> -#include <init.hxx> #include <pview.hxx> #include <wview.hxx> #include <wdocsh.hxx> -#include <globdoc.hxx> #include <srcview.hxx> #include <glshell.hxx> #include <tabsh.hxx> @@ -90,7 +81,6 @@ #include <wlistsh.hxx> #include <wtabsh.hxx> #include <navipi.hxx> -#include <chartins.hxx> #include <inputwin.hxx> #include <usrpref.hxx> #include <uinums.hxx> @@ -108,7 +98,6 @@ #include <modcfg.hxx> #include <fontcfg.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> -#include <sfx2/evntconf.hxx> #include <swatrset.hxx> #include <idxmrk.hxx> #include <wordcountdialog.hxx> @@ -141,8 +130,6 @@ bool g_bNoInterrupt = false; #include <svx/svxerr.hxx> -#include <unomid.h> - #include "swdllimpl.hxx" #include <dbconfig.hxx> #include <navicfg.hxx> diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx index be2a72d1c558..1183c4542d7b 100644 --- a/sw/source/uibase/chrdlg/ccoll.cxx +++ b/sw/source/uibase/chrdlg/ccoll.cxx @@ -18,24 +18,9 @@ */ #include <cmdid.h> -#include <swmodule.hxx> -#include <view.hxx> -#include <wrtsh.hxx> -#include <globals.hrc> -#include <sfx2/styfitem.hxx> - -#include <uitool.hxx> #include <ccoll.hxx> #include <fmtcol.hxx> -#include <hintids.hxx> -#include <docsh.hxx> -#include <docstyle.hxx> -#include <hints.hxx> - -#include <vcl/svapp.hxx> - -#include <unomid.h> //!! order of entries has to be the same as in //!! CommandStruct SwCondCollItem::aCmds[] diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index da6ee493a414..67e5f06c47d0 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -13,7 +13,6 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/xml/sax/Writer.hpp> @@ -32,7 +31,6 @@ #include <xmloff/xmlnumi.hxx> #include <vcl/svapp.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <unosett.hxx> diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx index 20f99ce0aad6..f57a3b4dec2e 100644 --- a/sw/source/uibase/config/barcfg.cxx +++ b/sw/source/uibase/config/barcfg.cxx @@ -22,8 +22,6 @@ #include <wrtsh.hxx> #include <barcfg.hxx> -#include <unomid.h> - using namespace utl; using namespace com::sun::star::uno; diff --git a/sw/source/uibase/config/caption.cxx b/sw/source/uibase/config/caption.cxx index 505f9c80fa7b..d023bd836f82 100644 --- a/sw/source/uibase/config/caption.cxx +++ b/sw/source/uibase/config/caption.cxx @@ -18,7 +18,7 @@ */ -#include <numrule.hxx> +#include <editeng/svxenum.hxx> #include <caption.hxx> InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) : diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index 3c20fcce7b1e..688216d4130e 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -17,15 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <basic/sbxvar.hxx> - -#include <svx/svxids.hrc> -#include <editeng/svxenum.hxx> - #include <viewopt.hxx> -#include <swtypes.hxx> #include <cmdid.h> -#include <prtopt.hxx> #include <cfgitems.hxx> #include <crstate.hxx> diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx index 104b15192228..8df0a7d49d4a 100644 --- a/sw/source/uibase/config/dbconfig.cxx +++ b/sw/source/uibase/config/dbconfig.cxx @@ -22,8 +22,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <swdbdata.hxx> -#include <unomid.h> - using namespace utl; using namespace com::sun::star::uno; diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx index 1b7deba71109..d05aa75feea0 100644 --- a/sw/source/uibase/config/fontcfg.cxx +++ b/sw/source/uibase/config/fontcfg.cxx @@ -25,9 +25,6 @@ #include <unotools/lingucfg.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include <swtypes.hxx> - -#include <unomid.h> using namespace utl; using namespace com::sun::star::uno; diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 7aefbfcaf799..f11eba893f57 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -18,26 +18,19 @@ */ #include <memory> -#include <hintids.hxx> #include <comphelper/classids.hxx> #include <o3tl/any.hxx> -#include <tools/stream.hxx> #include <tools/fontenum.hxx> -#include <vcl/svapp.hxx> -#include <svx/svxids.hrc> #include <editeng/svxenum.hxx> +#include <editeng/editids.hrc> #include <osl/diagnose.h> #include <tools/mapunit.hxx> #include <tools/globname.hxx> -#include <swtypes.hxx> #include <itabenum.hxx> #include <modcfg.hxx> -#include <fldupde.hxx> #include <caption.hxx> -#include <unomid.h> - using namespace com::sun::star::uno; #define GLOB_NAME_CALC 0 diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx index ceba29eac7bf..8f39010a4719 100644 --- a/sw/source/uibase/config/prtopt.cxx +++ b/sw/source/uibase/config/prtopt.cxx @@ -23,8 +23,6 @@ #include <osl/diagnose.h> #include <com/sun/star/uno/Sequence.hxx> -#include <unomid.h> - using namespace utl; using namespace com::sun::star::uno; diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index f285855a176e..0ffee44376e2 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -20,8 +20,6 @@ #include <memory> #include <uinums.hxx> -#include <hintids.hxx> -#include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> #include <tools/stream.hxx> #include <sfx2/docfile.hxx> @@ -32,8 +30,6 @@ #include <poolfmt.hxx> #include <charfmt.hxx> -#include <unomid.h> - using namespace ::com::sun::star; #define CHAPTER_FILENAME "chapter.cfg" diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 0246b6f039d6..3a331e2d43e1 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -21,22 +21,14 @@ #include <osl/diagnose.h> #include <o3tl/any.hxx> -#include <tools/stream.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> -#include <swtypes.hxx> -#include <hintids.hxx> -#include <uitool.hxx> #include <usrpref.hxx> -#include <crstate.hxx> -#include <linguistic/lngprops.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <unotools/localedatawrapper.hxx> -#include <unomid.h> - using namespace utl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 6059ef5ec8c8..4ba9fc6689a8 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -20,15 +20,12 @@ #include <sfx2/htmlmode.hxx> #include <svtools/htmlcfg.hxx> -#include <svx/svxids.hrc> -#include <editeng/svxenum.hxx> +#include <editeng/editids.hrc> #include <editeng/svxacorr.hxx> #include <unotools/localedatawrapper.hxx> -#include <vcl/region.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> #include <swmodule.hxx> -#include <swtypes.hxx> #include <viewopt.hxx> #include <wdocsh.hxx> #include <swrect.hxx> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index c3b4ef6e7297..1365e32b5aae 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -20,11 +20,9 @@ #include <sal/config.h> #include <cassert> -#include <cstdarg> #include <unotxdoc.hxx> #include <sfx2/app.hxx> -#include <sfx2/printer.hxx> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -42,22 +40,17 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <vcl/errinf.hxx> +#include <vcl/print.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/viewfrm.hxx> #include <dbconfig.hxx> -#include <pagedesc.hxx> #include <unotools/tempfile.hxx> #include <unotools/pathoptions.hxx> -#include <svl/urihelper.hxx> #include <svl/zforlist.hxx> -#include <svl/zformat.hxx> #include <svl/stritem.hxx> -#include <svl/eitem.hxx> -#include <vcl/oldprintadaptor.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/progress.hxx> @@ -69,27 +62,16 @@ #include <edtwin.hxx> #include <wrtsh.hxx> #include <fldbas.hxx> -#include <initui.hxx> -#include <swundo.hxx> -#include <flddat.hxx> -#include <modcfg.hxx> -#include <shellio.hxx> #include <dbui.hxx> #include <dbmgr.hxx> #include <doc.hxx> -#include <IDocumentSettingAccess.hxx> #include <IDocumentLinksAdministration.hxx> -#include <IDocumentContentOperations.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentUndoRedo.hxx> #include <swwait.hxx> #include <swunohelper.hxx> -#include <dbui.hrc> -#include <globals.hrc> #include <strings.hrc> #include <mmconfigitem.hxx> -#include <sfx2/request.hxx> -#include <hintids.hxx> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -109,7 +91,6 @@ #include <svtools/htmlcfg.hxx> #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <editeng/langitem.hxx> #include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> @@ -124,19 +105,12 @@ #include <rtl/tencinfo.h> #include <cppuhelper/implbase.hxx> #include <ndindex.hxx> -#include <pam.hxx> -#include <swcrsr.hxx> #include <swevent.hxx> -#include <osl/file.hxx> #include <sal/log.hxx> #include <swabstdlg.hxx> -#include <fmthdft.hxx> #include <vector> -#include <unomid.h> #include <section.hxx> #include <rootfrm.hxx> -#include <fmtpdsc.hxx> -#include <ndtxt.hxx> #include <calc.hxx> #include <dbfld.hxx> #include <IDocumentState.hxx> @@ -146,7 +120,6 @@ #include <memory> #include <comphelper/propertysequence.hxx> -#include <officecfg/Office/Common.hxx> using namespace ::com::sun::star; using namespace sw; diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index eea90633e048..102342a0a18f 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/formats.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -27,13 +26,11 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/container/XContainer.hpp> #include <cppuhelper/implbase.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svx/dbaexchange.hxx> #include <dbmgr.hxx> -#include <swmodule.hxx> -#include <view.hxx> #include <wrtsh.hxx> #include <dbtree.hxx> #include <vcl/settings.hxx> @@ -41,8 +38,6 @@ #include <bitmaps.hlst> -#include <unomid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -51,7 +46,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::task; using namespace ::com::sun::star::beans; class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index a8df1532b8ac..ad3b1c69a83a 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <wrtsh.hxx> - -#include <dbui.hrc> #include <dbui.hxx> SaveMonitor::SaveMonitor(weld::Window *pParent) diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 56fd7acf29ac..ea3573dd8f5c 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -23,8 +23,6 @@ #include <docsh.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/app.hxx> -#include <sfx2/fcontnr.hxx> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/XColumn.hpp> diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 3132d88f7fb9..c9def241673e 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> -#include <dbui.hrc> #include <strings.hrc> #include <mmconfigitem.hxx> #include <swmodule.hxx> diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 1ca6be629095..617511c29929 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -34,7 +34,6 @@ #include <comphelper/types.hxx> #include <com/sun/star/sdb/CommandType.hpp> #include <comphelper/sequence.hxx> -#include <rtl/instance.hxx> #include <sal/log.hxx> #include <unotools/configitem.hxx> #include <tools/diagnose_ex.h> @@ -45,7 +44,6 @@ #include <unodispatch.hxx> #include <wrtsh.hxx> #include <dbui.hrc> -#include <unomid.h> using namespace utl; using namespace ::com::sun::star; diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 2429b09484f9..cd19c9a39492 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -23,29 +23,20 @@ #include <vcl/weld.hxx> #include <editeng/svxacorr.hxx> #include <editeng/acorrcfg.hxx> -#include <svx/svxids.hrc> -#include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <editeng/unolingu.hxx> -#include <editeng/editeng.hxx> -#include <editeng/editview.hxx> #include <wrtsh.hxx> #include <sfx2/printer.hxx> #include <svx/svdoutl.hxx> #include <svx/svdview.hxx> -#include <svx/svditer.hxx> -#include <svx/svdogrp.hxx> #include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> #include <doc.hxx> #include <IDocumentDeviceAccess.hxx> #include <IDocumentDrawModelAccess.hxx> #include <docsh.hxx> -#include <docary.hxx> #include <drawdoc.hxx> -#include <frmfmt.hxx> #include <dcontact.hxx> #include <edtwin.hxx> #include <pam.hxx> diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index 32d9e6e5f3c1..45cc86b4f9b7 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -18,41 +18,20 @@ */ #include <hintids.hxx> -#include <uitool.hxx> #include <comphelper/string.hxx> -#include <svl/urihelper.hxx> -#include <svl/PasswordHelper.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> -#include <sot/formats.hxx> -#include <sfx2/passwd.hxx> -#include <sfx2/docfilt.hxx> #include <sfx2/request.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/linkmgr.hxx> -#include <svx/svxids.hrc> #include <editeng/sizeitem.hxx> -#include <svtools/htmlcfg.hxx> #include <section.hxx> -#include <docary.hxx> -#include <regionsw.hxx> #include <basesh.hxx> -#include <wdocsh.hxx> #include <view.hxx> -#include <swmodule.hxx> #include <wrtsh.hxx> -#include <swundo.hxx> -#include <column.hxx> +#include <fmtclds.hxx> #include <fmtfsize.hxx> -#include <shellio.hxx> #include <cmdid.h> -#include <globals.hrc> -#include <sfx2/bindings.hxx> -#include <sfx2/htmlmode.hxx> -#include <sfx2/viewfrm.hxx> -#include <svx/dlgutil.hxx> #include <swabstdlg.hxx> -#include <memory> void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) { diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx index ad16d5bd94f6..4609a66eca70 100644 --- a/sw/source/uibase/dialog/watermarkdialog.cxx +++ b/sw/source/uibase/dialog/watermarkdialog.cxx @@ -17,7 +17,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> -#include <svl/eitem.hxx> #include <sfx2/watermarkitem.hxx> #include <svtools/ctrltool.hxx> diff --git a/sw/source/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx index 2a205fb3bf12..e1a6c99a9428 100644 --- a/sw/source/uibase/dialog/wordcountwrapper.cxx +++ b/sw/source/uibase/dialog/wordcountwrapper.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <swtypes.hxx> #include <wordcountdialog.hxx> #include <docstat.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 31af40a2011c..e36ac4e1081b 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -17,25 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> -#include <editeng/wghtitem.hxx> -#include <editeng/adjustitem.hxx> #include <vcl/errinf.hxx> #include <vcl/weld.hxx> #include <svl/macitem.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#include <svl/urihelper.hxx> -#include <svx/langbox.hxx> #include <unotools/transliterationwrapper.hxx> -#include <poolfmt.hxx> -#include <fmtcol.hxx> -#include <docary.hxx> +#include <docsh.hxx> #include <wrtsh.hxx> -#include <uitool.hxx> #include <view.hxx> -#include <swevent.hxx> #include <gloshdl.hxx> #include <glosdoc.hxx> #include <shellio.hxx> @@ -44,19 +35,14 @@ #include <initui.hxx> #include <gloslst.hxx> #include <swdtflvr.hxx> -#include <docsh.hxx> #include <strings.hrc> -#include <swerror.h> -#include <frmmgr.hxx> #include <vcl/svapp.hxx> #include <editeng/acorrcfg.hxx> #include <sfx2/event.hxx> #include <swabstdlg.hxx> -#include <IDocumentFieldsAccess.hxx> - #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 894bba367db7..a0230ef3630a 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -54,17 +54,10 @@ #include <svx/xmlexchg.hxx> #include <svx/dbaexchange.hxx> #include <svx/clipfmtitem.hxx> -#include <svx/svxids.hrc> #include <sfx2/mieclip.hxx> -#include <svx/svdetc.hxx> -#include <svx/xoutbmp.hxx> #include <svl/urlbmk.hxx> -#include <svtools/htmlout.hxx> -#include <svx/hlnkitem.hxx> #include <vcl/inetimg.hxx> -#include <editeng/paperinf.hxx> #include <svx/fmview.hxx> -#include <editeng/scripttypeitem.hxx> #include <sfx2/docfilt.hxx> #include <vcl/imapobj.hxx> #include <sfx2/docfile.hxx> @@ -82,20 +75,15 @@ #include <svx/unomodel.hxx> #include <fmturl.hxx> #include <fmtinfmt.hxx> -#include <fmtfsize.hxx> #include <swdtflvr.hxx> #include <shellio.hxx> #include <ddefld.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <IDocumentSettingAccess.hxx> -#include <IDocumentDeviceAccess.hxx> #include <IDocumentDrawModelAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentState.hxx> -#include <pagedesc.hxx> #include <IMark.hxx> -#include <docary.hxx> #include <section.hxx> #include <ndtxt.hxx> #include <edtdd.hxx> @@ -113,11 +101,9 @@ #include <ndole.hxx> #include <swwait.hxx> #include <viewopt.hxx> -#include <swerror.h> #include <SwCapObjType.hxx> #include <cmdid.h> #include <strings.hrc> -#include <sot/stg.hxx> #include <svx/svditer.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> @@ -125,8 +111,6 @@ #include <avmedia/mediawindow.hxx> #include <swcrsr.hxx> #include <SwRewriter.hxx> -#include <globals.hrc> -#include <app.hrc> #include <vcl/svapp.hxx> #include <swserv.hxx> #include <fmtmeta.hxx> diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 04a785fae4ea..fa4d684c577c 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -30,7 +30,6 @@ #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -#include <drawinglayer/primitive2d/shadowprimitive2d.hxx> namespace sw { namespace sidebarwindows { diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index cdea6eb327e1..e321560d42fa 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -19,12 +19,10 @@ #include "AnnotationMenuButton.hxx" -#include <app.hrc> #include <strings.hrc> #include <unotools/useroptions.hxx> -#include <vcl/svapp.hxx> #include <vcl/menu.hxx> #include <vcl/decoview.hxx> #include <vcl/gradient.hxx> diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 7bd3ae6f4e3b..b2ff15aba3e7 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -23,7 +23,6 @@ #include <PostItMgr.hxx> #include <strings.hrc> -#include <cmdid.h> #include <vcl/edit.hxx> #include <vcl/menu.hxx> diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index e73592f947b9..1f8cb4cbbd05 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <cstddef> -#include <cstdlib> #include "SidebarWinAcc.hxx" #include <PostItMgr.hxx> @@ -33,13 +32,10 @@ #include "OverlayRanges.hxx" #include <strings.hrc> -#include <app.hrc> #include <viewopt.hxx> #include <cmdid.h> -#include <editeng/editobj.hxx> -#include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/langitem.hxx> #include <editeng/editview.hxx> @@ -48,12 +44,9 @@ #include <editeng/eeitem.hxx> #include <editeng/outlobj.hxx> -#include <svl/zforlist.hxx> #include <svl/undo.hxx> #include <svl/stritem.hxx> -#include <svx/svxids.hrc> - #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -72,23 +65,15 @@ #include <wrtsh.hxx> #include <doc.hxx> #include <swmodule.hxx> -#include <langhelper.hxx> #include <txtannotationfld.hxx> #include <ndtxt.hxx> -#include <sw_primitivetypes2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> -#include <drawinglayer/primitive2d/primitivetools2d.hxx> -#include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx> -#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> -#include <drawinglayer/primitive2d/shadowprimitive2d.hxx> +#include <unotools/localedatawrapper.hxx> #include <memory> #include <comphelper/lok.hxx> -#include <IDocumentDrawModelAccess.hxx> -#include <drawdoc.hxx> using namespace sw::sidebarwindows; diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index c92df0aef777..28853f47fd97 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -7,9 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <app.hrc> #include <strings.hrc> -#include <globals.hrc> #include <doc.hxx> #include <drawdoc.hxx> @@ -21,7 +19,6 @@ #include <HeaderFooterWin.hxx> #include <pagedesc.hxx> #include <pagefrm.hxx> -#include <SwRewriter.hxx> #include <view.hxx> #include <viewopt.hxx> #include <wrtsh.hxx> @@ -41,16 +38,12 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brushitem.hxx> #include <svx/hdft.hxx> -#include <svx/svxids.hrc> -#include <sfx2/dispatch.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <vcl/canvastools.hxx> -#include <vcl/decoview.hxx> -#include <vcl/gradient.hxx> #include <vcl/metric.hxx> #include <vcl/menubtn.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 9a58ee1aa954..39d1f848c05c 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <globals.hrc> #include <bitmaps.hlst> #include <cmdid.h> @@ -31,7 +30,6 @@ #include <wrtsh.hxx> #include <basegfx/color/bcolortools.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drectangle.hxx> @@ -45,7 +43,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> -#include <svx/svxids.hrc> #include <vcl/canvastools.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 6177ee855679..6c6c74ce1864 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -31,7 +31,6 @@ #include "ShadowOverlayObject.hxx" #include <vcl/svapp.hxx> -#include <vcl/scrbar.hxx> #include <vcl/outdev.hxx> #include <vcl/settings.hxx> @@ -49,9 +48,6 @@ #include <edtwin.hxx> #include <txtfld.hxx> #include <txtannotationfld.hxx> -#include <ndtxt.hxx> -#include <redline.hxx> -#include <docary.hxx> #include <rootfrm.hxx> #include <SwRewriter.hxx> #include <tools/color.hxx> @@ -66,26 +62,20 @@ #include <svl/srchitem.hxx> #include <svl/languageoptions.hxx> -#include <svtools/langtab.hxx> #include <svl/hint.hxx> #include <svx/svdview.hxx> -#include <svx/svxids.hrc> #include <editeng/eeitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/kernitem.hxx> #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> -#include <i18nlangtag/mslangid.hxx> -#include <i18nlangtag/lang.h> #include <comphelper/lok.hxx> #include <comphelper/string.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <annotsh.hxx> #include <swabstdlg.hxx> -#include <swevent.hxx> #include <memory> // distance between Anchor Y and initial note position diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index bdbb0e2804e4..79ece975ea50 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -41,21 +41,18 @@ #include <vcl/help.hxx> #include <vcl/weld.hxx> #include <vcl/gradient.hxx> -#include <vcl/scrbar.hxx> #include <vcl/settings.hxx> #include <editeng/outliner.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> #include <editeng/flditem.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> #include <uitool.hxx> #include <view.hxx> #include <wrtsh.hxx> -#include <shellres.hxx> #include <AnnotationWin.hxx> #include <redline.hxx> #include <memory> diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx index fb243624d574..ee4c8d68b489 100644 --- a/sw/source/uibase/docvw/UnfloatTableButton.cxx +++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx @@ -38,7 +38,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <basegfx/vector/b2dvector.hxx> -#include <DocumentContentOperationsManager.hxx> #include <svl/grabbagitem.hxx> #define TEXT_PADDING 3 diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index f9488aca1b38..1a5690e96e7e 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> - #include <svx/svdview.hxx> #include <editeng/outliner.hxx> #include <svx/svdobj.hxx> @@ -39,7 +37,6 @@ #include <swmodule.hxx> #include <docsh.hxx> #include <wdocsh.hxx> -#include <swundo.hxx> using namespace ::com::sun::star; diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 02eece5882fc..4e51062da05a 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - #include <swtypes.hxx> #include <hintids.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -34,10 +32,8 @@ #include <vcl/inputctx.hxx> #include <vcl/help.hxx> -#include <vcl/graph.hxx> #include <vcl/weld.hxx> #include <vcl/ptrstyle.hxx> -#include <sot/storage.hxx> #include <svl/macitem.hxx> #include <unotools/securityoptions.hxx> #include <basic/sbxvar.hxx> @@ -53,27 +49,16 @@ #include <svl/ptitem.hxx> #include <editeng/sizeitem.hxx> #include <editeng/langitem.hxx> -#include <sfx2/htmlmode.hxx> #include <svx/svdview.hxx> #include <svx/svdhdl.hxx> #include <svx/svdoutl.hxx> -#include <svx/svxids.hrc> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> #include <editeng/svxacorr.hxx> -#include <editeng/scripttypeitem.hxx> #include <editeng/flditem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brushitem.hxx> -#include <editeng/wghtitem.hxx> -#include <editeng/udlnitem.hxx> -#include <editeng/postitem.hxx> -#include <editeng/protitem.hxx> #include <unotools/charclass.hxx> -#include <basegfx/color/bcolortools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> @@ -83,7 +68,6 @@ #include <edtwin.hxx> #include <view.hxx> #include <wrtsh.hxx> -#include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> #include <IDocumentUndoRedo.hxx> #include <textboxhelper.hxx> @@ -99,21 +83,17 @@ #include <txatbase.hxx> #include <fmtanchr.hxx> #include <fmtornt.hxx> -#include <fmtfsize.hxx> -#include <fmtclds.hxx> #include <fmthdft.hxx> #include <frmfmt.hxx> #include <modcfg.hxx> #include <fmtcol.hxx> #include <wview.hxx> -#include <listsh.hxx> #include <gloslst.hxx> #include <inputwin.hxx> #include <gloshdl.hxx> #include <swundo.hxx> #include <drwtxtsh.hxx> #include <fchrfmt.hxx> -#include <fmturl.hxx> #include "romenu.hxx" #include <initui.hxx> #include <frmatr.hxx> @@ -121,11 +101,9 @@ #include <acmplwrd.hxx> #include <swcalwrp.hxx> #include <swdtflvr.hxx> -#include <wdocsh.hxx> #include <breakit.hxx> #include <checkit.hxx> #include <pagefrm.hxx> -#include <HeaderFooterWin.hxx> #include <helpids.h> #include <cmdid.h> @@ -138,10 +116,7 @@ #include <svtools/ruler.hxx> #include <formatclipboard.hxx> #include <vcl/svapp.hxx> -#include <docstat.hxx> #include <wordcountdialog.hxx> -#include <swwait.hxx> -#include <txtfld.hxx> #include <fmtfld.hxx> #include <IMark.hxx> diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 872352db5e3d..c023047a5560 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -17,22 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> - #include <doc.hxx> #include <osl/thread.h> #include <vcl/help.hxx> -#include <svl/stritem.hxx> -#include <unotools/securityoptions.hxx> #include <tools/urlobj.hxx> -#include <txtrfmrk.hxx> #include <fmtrfmrk.hxx> -#include <editeng/flditem.hxx> #include <svl/urihelper.hxx> -#include <svx/svdotext.hxx> -#include <editeng/outliner.hxx> #include <sfx2/sfxhelp.hxx> -#include <svl/itemiter.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <swmodule.hxx> @@ -42,25 +33,19 @@ #include <docsh.hxx> #include <edtwin.hxx> #include <dpage.hxx> -#include <shellres.hxx> #include <docufld.hxx> -#include <dbfld.hxx> #include <reffld.hxx> #include <cellatr.hxx> #include <shdwcrsr.hxx> -#include <fmtcol.hxx> -#include <charfmt.hxx> +#include <fmtinfmt.hxx> #include <fmtftn.hxx> #include <redline.hxx> #include <tox.hxx> -#include <txttxmrk.hxx> +#include <txatbase.hxx> #include <uitool.hxx> #include <viewopt.hxx> #include <strings.hrc> -#include <PostItMgr.hxx> -#include <fmtfld.hxx> - #include <IDocumentMarkAccess.hxx> #include <txtfrm.hxx> #include <ndtxt.hxx> diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx index ab3cd3a26ded..583f485f34a5 100644 --- a/sw/source/uibase/docvw/edtwin3.cxx +++ b/sw/source/uibase/docvw/edtwin3.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <svx/ruler.hxx> -#include <viewopt.hxx> #include <view.hxx> #include <wrtsh.hxx> #include <basesh.hxx> @@ -30,11 +28,7 @@ #include <edtwin.hxx> #include <swmodule.hxx> #include <modcfg.hxx> -#include <swtable.hxx> #include <docsh.hxx> -#include <pagedesc.hxx> -#include <frmatr.hxx> -#include <editeng/frmdiritem.hxx> #include <uiobject.hxx> // Core-Notify diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 185ff672d42f..8d13400824c0 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -21,19 +21,13 @@ #include <hintids.hxx> #include <svl/eitem.hxx> -#include <svl/stritem.hxx> -#include <vcl/imap.hxx> -#include <vcl/inetimg.hxx> #include <vcl/transfer.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svx/gallery.hxx> #include <svx/graphichelper.hxx> #include <editeng/brushitem.hxx> -#include <frmatr.hxx> -#include <fmturl.hxx> #include <fmtinfmt.hxx> #include <docsh.hxx> #include <view.hxx> diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 1cab7fc278f9..ebaf5a9261ae 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -32,11 +32,9 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/textview.hxx> -#include <svx/svxids.hrc> #include <vcl/scrbar.hxx> #include <vcl/ptrstyle.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/htmltokn.h> #include <vcl/txtattr.hxx> diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index 85a2631935f7..aee3992c1d0e 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <o3tl/any.hxx> #include <osl/diagnose.h> -#include <tools/stream.hxx> -#include <sfx2/app.hxx> #include <editeng/paperinf.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <unotools/useroptions.hxx> diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index dcf07ab3efa5..59c252be0a57 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -22,7 +22,6 @@ #include <swtypes.hxx> #include <labelcfg.hxx> -#include <labimp.hxx> #include <rtl/bootstrap.hxx> #include <unotools/configpaths.hxx> #include <xmlreader/xmlreader.hxx> @@ -31,8 +30,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> -#include <unomid.h> - using namespace utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index a8829d935d70..03a38a853438 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -20,16 +20,12 @@ #include <sal/config.h> #include <o3tl/any.hxx> -#include <tools/stream.hxx> #include <osl/diagnose.h> #include <com/sun/star/uno/Sequence.hxx> -#include <sfx2/sfxsids.hrc> #include <unotools/useroptions.hxx> #include <swmodule.hxx> #include <labimg.hxx> #include <cmdid.h> -#include <swtypes.hxx> -#include <unomid.h> using namespace utl; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index d67b1712a53d..009525d02ce5 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -27,7 +27,6 @@ #include <edtwin.hxx> #include <syncbtn.hxx> -#include <swtypes.hxx> SFX_IMPL_MODELESSDIALOGCONTOLLER(SwSyncChildWin, FN_SYNC_LABELS) diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 65b70130f11a..dbb6d9e3098c 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -33,32 +33,20 @@ #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <editeng/unolingu.hxx> -#include <unotools/localedatawrapper.hxx> #include <tools/resary.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/objsh.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/dialogs.hrc> #include <svx/strarray.hxx> -#include <basic/basmgr.hxx> -#include <editeng/langitem.hxx> -#include <svl/macitem.hxx> -#include <basic/sbmod.hxx> #include <fmtrfmrk.hxx> -#include <basic/sbmeth.hxx> -#include <basic/sbx.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <vcl/mnemonic.hxx> #include <view.hxx> #include <wrtsh.hxx> #include <doc.hxx> -#include <docsh.hxx> #include <swmodule.hxx> -#include <charatr.hxx> #include <fmtinfmt.hxx> #include <cellatr.hxx> #include <dbmgr.hxx> @@ -77,7 +65,6 @@ #include <flddropdown.hxx> #include <strings.hrc> #include <tox.hxx> -#include <cnttab.hxx> #include <unotools/useroptions.hxx> using namespace com::sun::star::uno; diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index ce704d0ab51d..a2a41fa3443c 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -18,18 +18,10 @@ */ #include <cmdid.h> -#include <swtypes.hxx> #include <sfx2/basedlgs.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/htmlmode.hxx> -#include <viewopt.hxx> #include <docsh.hxx> #include <fldwrap.hxx> -#include <wrtsh.hxx> -#include <view.hxx> -#include <swmodule.hxx> -#include <globals.hrc> #include <swabstdlg.hxx> SFX_IMPL_CHILDWINDOW_WITHID(SwFieldDlgWrapper, FN_INSERT_FIELD) diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 33a107d2641b..e994505427f0 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -19,7 +19,6 @@ #include <cmdid.h> #include <hintids.hxx> -#include <algorithm> #include <svl/eitem.hxx> #include <tools/fract.hxx> #include <editeng/lrspitem.hxx> @@ -28,7 +27,6 @@ #include <svx/pageitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> -#include <vcl/graph.hxx> #include <vcl/outdev.hxx> #include <vcl/settings.hxx> #include <tgrditem.hxx> @@ -36,7 +34,6 @@ #include <colex.hxx> #include <colmgr.hxx> #include <svx/unobrushitemhelper.hxx> -#include <svx/svxids.hrc> void SwPageExample::UpdateExample( const SfxItemSet& rSet ) { diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx index f9c624293429..8dda357ee391 100644 --- a/sw/source/uibase/frmdlg/colmgr.cxx +++ b/sw/source/uibase/frmdlg/colmgr.cxx @@ -25,9 +25,9 @@ #include <editeng/lrspitem.hxx> #include <osl/diagnose.h> -#include <frmmgr.hxx> -#include <frmfmt.hxx> #include <colmgr.hxx> +#include <fmtfsize.hxx> +#include <swtypes.hxx> // private methods diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx index ba631be77816..f79d485af3f3 100644 --- a/sw/source/uibase/frmdlg/frmmgr.cxx +++ b/sw/source/uibase/frmdlg/frmmgr.cxx @@ -21,15 +21,12 @@ #include <hintids.hxx> #include <svl/stritem.hxx> -#include <editeng/protitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/opaqitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/shaditem.hxx> #include <svx/swframevalidation.hxx> #include <svx/xdef.hxx> -#include <svx/svxids.hrc> #include <fmtclds.hxx> #include <wrtsh.hxx> #include <view.hxx> diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx index 128f3d7680fa..283b5a016a45 100644 --- a/sw/source/uibase/globdoc/globdoc.cxx +++ b/sw/source/uibase/globdoc/globdoc.cxx @@ -19,13 +19,10 @@ #include <comphelper/fileformat.h> #include <comphelper/classids.hxx> -#include <unotools/moduleoptions.hxx> #include <osl/diagnose.h> - -#include <unomid.h> +#include <tools/globname.hxx> #include <swtypes.hxx> -#include <shellio.hxx> #include <globdoc.hxx> #include <strings.hrc> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits