diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-01-17 23:46:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-01-23 09:22:08 +0100 |
| commit | eaeabd78585c185e58f62be49e5888ef78d94793 (patch) | |
| tree | 876426b3f782712de0f590123bca0785d61fa49b /sw | |
| parent | 13bc1ec30c5adf05ff987c25634b845bab7bc4ae (diff) | |
tdf#42949 Fix IWYU warnings in sw/source/ui/[c-u]*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Icf4e6f8ea7c751c8d068dbde50ea1b4726d565d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87004
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
90 files changed, 34 insertions, 538 deletions
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 6b1ad0421478..1e2488091f90 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -698,3 +698,6 @@ blacklist: # Needed for defines in swslots.hxx - cmdid.h - globals.hrc + sw/source/ui/fldui/flddinf.cxx: + # Needed for direct member access + - com/sun/star/beans/XPropertySet.hpp diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 31cba5287627..80f0d19fd641 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/request.hxx> -#include <svl/stritem.hxx> #include <vcl/svapp.hxx> -#include <cmdid.h> #include <uitool.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#include <basesh.hxx> #include <view.hxx> #include <viewopt.hxx> #include <break.hxx> diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 9b423ca7570e..95be6a1c4bf9 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -31,7 +31,6 @@ #include <cmdid.h> #include <swtypes.hxx> #include <view.hxx> -#include <wrtsh.hxx> #include <docsh.hxx> #include <uitool.hxx> #include <fmtinfmt.hxx> @@ -40,17 +39,15 @@ #include <swmodule.hxx> #include <poolfmt.hxx> -#include <globals.hrc> #include <strings.hrc> #include <chrdlgmodes.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/viewfrm.hxx> +#include <sfx2/frame.hxx> #include <svx/svxdlg.hxx> -#include <svx/svxids.hrc> #include <svx/flagsdef.hxx> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 0c539a16901d..dfa4fee9237a 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -24,7 +24,6 @@ #include <swmodule.hxx> #include <view.hxx> #include <wrtsh.hxx> -#include <globals.hrc> #include <strings.hrc> #include <vcl/metric.hxx> @@ -41,7 +40,6 @@ #include <vcl/svapp.hxx> #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <editeng/scripttypeitem.hxx> #include <comphelper/processfactory.hxx> #include <charatr.hxx> diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 8a43e389fb3a..17b436d5135b 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -20,21 +20,16 @@ #include <cmdid.h> #include <swtypes.hxx> #include <hintids.hxx> -#include <globals.hrc> #include <strings.hrc> #include <sfx2/objsh.hxx> #include <sfx2/htmlmode.hxx> -#include <svx/svxids.hrc> #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <fmtline.hxx> #include <numpara.hxx> -#include <app.hrc> -#include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/sfxhelp.hxx> #include <sfx2/viewsh.hxx> const sal_uInt16 SwParagraphNumTabPage::aPageRg[] = { diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 78c8a0cfb310..99751fed15c9 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <sfx2/htmlmode.hxx> #include <sfx2/tabdlg.hxx> #include <svl/style.hxx> @@ -25,15 +24,10 @@ #include <svl/cjkoptions.hxx> #include <docsh.hxx> #include <wrtsh.hxx> -#include <frmatr.hxx> #include <view.hxx> -#include <globals.hrc> #include <swuipardlg.hxx> -#include <pagedesc.hxx> #include <pardlg.hxx> -#include <paratr.hxx> #include <drpcps.hxx> -#include <uitool.hxx> #include <viewopt.hxx> #include <numpara.hxx> #include <strings.hrc> diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index b794755744ba..056953e4bd0f 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -22,19 +22,13 @@ #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 <swuiccoll.hxx> diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 078706cc6468..1576602143be 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -19,12 +19,11 @@ #include <svx/svxids.hrc> #include <svx/numinf.hxx> -#include <swtypes.hxx> #include <tblnumfm.hxx> -#include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <svl/itemset.hxx> +#include <sfx2/sfxdlg.hxx> #include <sfx2/tabdlg.hxx> SwNumFormatDlg::SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet) diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 947c39ac52cc..e51d301951af 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -17,22 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swmodule.hxx> #include <swtypes.hxx> #include <mailconfigpage.hxx> #include <mmconfigitem.hxx> #include <mailmergehelper.hxx> -#include <cmdid.h> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/mail/MailServiceType.hpp> #include <com/sun/star/mail/XMailService.hpp> #include <com/sun/star/mail/MailServiceProvider.hpp> -#include <globals.hrc> -#include <dbui.hrc> #include <strings.hrc> -#include <bitmaps.hlst> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 9ae91126e608..36a056da3cf2 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -21,17 +21,12 @@ #include <cmdid.h> #include <docsh.hxx> -#include <swmodule.hxx> -#include <swtypes.hxx> #include <uiitems.hxx> #include <view.hxx> #include <wrtsh.hxx> -#include <globals.hrc> -#include <unotools/configmgr.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 02f36d51c149..97f24f093336 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -29,18 +29,15 @@ #include <uitool.hxx> #include <view.hxx> -#include <globals.hrc> #include <strings.hrc> #include <optload.hrc> #include <cmdid.h> #include <optload.hxx> -#include <svx/dlgutil.hxx> #include <sfx2/htmlmode.hxx> #include <fldmgr.hxx> #include <poolfmt.hxx> #include <expfld.hxx> -#include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <svtools/insdlg.hxx> #include <svtools/unitconv.hxx> @@ -49,11 +46,8 @@ #include <comphelper/classids.hxx> #include <unotools/configmgr.hxx> -#include <docsh.hxx> -#include <app.hrc> #include <SwStyleNameMapper.hxx> #include <numrule.hxx> -#include <SwNodeNum.hxx> #include <doc.hxx> #include <svl/cjkoptions.hxx> diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 4f1a0c3bbf9c..0ab4db5e5607 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -32,24 +32,19 @@ #include <docsh.hxx> #include <IDocumentDeviceAccess.hxx> #include <IDocumentSettingAccess.hxx> -#include <IDocumentRedlineAccess.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#include <uitool.hxx> #include <cfgitems.hxx> #include <poolfmt.hxx> #include <uiitems.hxx> -#include <initui.hxx> #include <printdata.hxx> #include <modcfg.hxx> -#include <srcview.hxx> #include <crstate.hxx> #include <viewopt.hxx> #include <globals.hrc> #include <strings.hrc> #include <swwrtshitem.hxx> -#include <unomid.h> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> @@ -57,23 +52,16 @@ #include <editeng/svxenum.hxx> #include <sal/macros.h> #include <sfx2/dialoghelper.hxx> -#include <sfx2/request.hxx> #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> -#include <svl/slstitm.hxx> #include <svl/ctloptions.hxx> #include <svl/eitem.hxx> #include <svl/cjkoptions.hxx> #include <svtools/ctrltool.hxx> #include <svtools/unitconv.hxx> #include <sfx2/htmlmode.hxx> -#include <svx/xtable.hxx> -#include <svx/dlgutil.hxx> -#include <svx/strarray.hxx> -#include <svx/svxids.hrc> -#include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 1f982922f85e..977a81addb2b 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -33,9 +33,7 @@ #include <comphelper/types.hxx> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> #include <com/sun/star/sdb/CommandType.hpp> @@ -51,12 +49,9 @@ #include <swunohelper.hxx> #include <unotools/pathoptions.hxx> #include <svl/urihelper.hxx> -#include <dbui.hrc> #include <strings.hrc> #include <view.hxx> -#include <unomid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 5a7cf43d429e..08a9faff23df 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -26,24 +26,15 @@ #include "createaddresslistdialog.hxx" #include "customizeaddresslistdialog.hxx" #include <mmconfigitem.hxx> -#include <vcl/event.hxx> -#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> -#include <svtools/controldims.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/docfilt.hxx> -#include <sfx2/fcontnr.hxx> -#include <sfx2/docfac.hxx> #include <sfx2/docfile.hxx> #include <rtl/textenc.h> #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 <tools/urlobj.hxx> -#include <dbui.hrc> #include <strings.hrc> -#include <unomid.h> #include <map> using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 00c4076b1ebb..d5b9ffd68652 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> #include "customizeaddresslistdialog.hxx" #include "createaddresslistdialog.hxx" -#include <dbui.hrc> SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( weld::Window* pParent, const SwCSVData& rOldData) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index f25e3f138e41..64f6c466692f 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -22,75 +22,54 @@ #include <float.h> #include <hintids.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> -#include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XColumn.hpp> -#include <com/sun/star/sdb/XDatabaseAccess.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> -#include <sal/log.hxx> -#include <editeng/langitem.hxx> #include <svl/numuno.hxx> #include <svl/stritem.hxx> #include <tools/diagnose_ex.h> -#include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <svl/style.hxx> #include <svl/zformat.hxx> #include <sfx2/htmlmode.hxx> -#include <editeng/unolingu.hxx> -#include <sfx2/app.hxx> #include <svl/itemset.hxx> #include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> -#include <svx/rulritem.hxx> -#include <svx/svxids.hrc> #include <unotools/collatorwrapper.hxx> -#include <tabledlg.hxx> #include <fmtclds.hxx> #include <tabcol.hxx> #include <uiitems.hxx> #include <viewopt.hxx> -#include <uitool.hxx> #include <wrtsh.hxx> -#include <wview.hxx> +#include <view.hxx> #include <docsh.hxx> #include <dbmgr.hxx> #include <tblafmt.hxx> #include <cellatr.hxx> -#include <swtable.hxx> #include <swtablerep.hxx> #include <dbfld.hxx> #include <fmtcol.hxx> -#include <section.hxx> #include <swwait.hxx> #include <modcfg.hxx> #include <swmodule.hxx> #include <poolfmt.hxx> #include <connectivity/dbtools.hxx> -#include <dbui.hrc> - #include <cmdid.h> #include <SwStyleNameMapper.hxx> #include <tabsh.hxx> #include <swabstdlg.hxx> #include <strings.hrc> -#include <unomid.h> #include <IDocumentMarkAccess.hxx> #include <o3tl/any.hxx> diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index 23e7984623d8..be0178dddbc1 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> #include "dbtablepreviewdialog.hxx" #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/Frame.hpp> -#include <toolkit/helper/vclunohelper.hxx> - -#include <unomid.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index aa18828648fc..bb10a2a9a0da 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -25,13 +25,8 @@ #include "mmlayoutpage.hxx" #include <mmconfigitem.hxx> #include <swabstdlg.hxx> -#include <dbui.hrc> #include <strings.hrc> #include <view.hxx> -#include <dbmgr.hxx> -#include <sfx2/viewfrm.hxx> -#include <wrtsh.hxx> -#include <svx/dataaccessdescriptor.hxx> #include <helpids.h> diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index a80e4eda9ae5..a8545852032e 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -36,13 +36,10 @@ #include <com/sun/star/sdb/XColumn.hpp> #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <vector> -#include <globals.hrc> #include <strings.hrc> -#include <dbui.hrc> #include <mmaddressblockpage.hrc> #include <helpids.h> diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 21d0f96d74f9..1336a7dc8374 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -27,15 +27,11 @@ #include <docsh.hxx> #include "mmdocselectpage.hxx" #include <mailmergewizard.hxx> -#include <shellio.hxx> #include <swabstdlg.hxx> #include <mmconfigitem.hxx> -#include <dbui.hrc> - #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 7e51b1645ccd..c09f087b6d1c 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -21,7 +21,6 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include "mmaddressblockpage.hxx" -#include <swtypes.hxx> #include <dbui.hrc> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdbc/SQLException.hpp> diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 36be306896bf..d98509fa6a45 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -27,19 +27,14 @@ #include <i18nutil/unicode.hxx> #include <unotools/tempfile.hxx> #include <uitool.hxx> -#include <svx/dlgutil.hxx> #include <view.hxx> #include <swundo.hxx> -#include <sfx2/dispatch.hxx> -#include <svl/stritem.hxx> #include <sfx2/docfilt.hxx> #include <svtools/unitconv.hxx> -#include <com/sun/star/text/XParagraphCursor.hpp> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/view/DocumentZoomType.hpp> #include <fldmgr.hxx> #include <fldbas.hxx> -#include <poolfmt.hxx> #include <unotxdoc.hxx> #include <docsh.hxx> #include <doc.hxx> @@ -50,15 +45,12 @@ #include <fmtornt.hxx> #include <fmtfsize.hxx> #include <editeng/boxitem.hxx> -#include <svl/urihelper.hxx> -#include <shellio.hxx> #include <osl/file.hxx> #include <vcl/settings.hxx> #include <unoprnms.hxx> #include <iodetect.hxx> #include <dbui.hrc> -#include <unomid.h> using namespace osl; using namespace svt; diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 7e1855893a8e..f7153c3bc503 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -20,7 +20,6 @@ #include "mmoutputtypepage.hxx" #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> -#include <dbui.hrc> #include <strings.hrc> #include <bitmaps.hlst> #include <swtypes.hxx> @@ -31,7 +30,6 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <cmdid.h> #include <swunohelper.hxx> #include <mmresultdialogs.hxx> #include <maildispatcher.hxx> diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index c271f1435632..44a3248cb4d0 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -18,7 +18,6 @@ */ #include <mmresultdialogs.hxx> -#include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <mailconfigpage.hxx> #include "mmgreetingspage.hxx" @@ -33,10 +32,8 @@ #include <hintids.hxx> #include <swmodule.hxx> -#include <editeng/scripttypeitem.hxx> #include <editeng/langitem.hxx> #include <o3tl/temporary.hxx> -#include <officecfg/Office/Writer.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> #include <svtools/ehdl.hxx> @@ -44,17 +41,14 @@ #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <sfx2/dinfdlg.hxx> #include <sfx2/printer.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <vcl/print.hxx> -#include <vcl/settings.hxx> #include <rtl/tencinfo.h> #include <sal/log.hxx> @@ -64,7 +58,6 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/task/ErrorCodeIOException.hpp> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <dbmgr.hxx> #include <swunohelper.hxx> #include <shellio.hxx> @@ -76,7 +69,6 @@ #include <doc.hxx> #include <sfx2/app.hxx> #include <strings.hrc> -#include <unomid.h> #include <comphelper/string.hxx> #include <iodetect.hxx> diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 58bb4868866d..096c1472f69a 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -28,9 +28,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> -#include <unomid.h> - -#include <dbui.hrc> #include <strings.hrc> using namespace ::com::sun::star; diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index a10ca895c2c8..01f4b1ea29ca 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> -#include <hintids.hxx> - #include <abstract.hxx> SwInsertAbstractDlg::SwInsertAbstractDlg(weld::Window* pParent) diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index 839c084e93e1..3c16519ab46c 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -19,7 +19,7 @@ #include <addrdlg.hxx> #include <sfx2/pageids.hxx> -#include <svx/svxdlg.hxx> +#include <sfx2/sfxdlg.hxx> SwAddrDlg::SwAddrDlg(weld::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialogController(pParent, &rSet) diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 801a91da0bfd..327c5573e67a 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -27,16 +27,10 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <unotools/lingucfg.hxx> #include <unotools/viewoptions.hxx> -#include <fontcfg.hxx> -#include <swmodule.hxx> -#include <editeng/unolingu.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/printer.hxx> -#include <editeng/flstitem.hxx> -#include <svx/dlgutil.hxx> -#include <editeng/fontitem.hxx> +#include <svl/languageoptions.hxx> #include <editeng/langitem.hxx> -#include <editeng/scripttypeitem.hxx> #include <swtypes.hxx> #include <ascfldlg.hxx> #include <shellio.hxx> diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 5dc9c1dfafa1..7aacfd94cd5f 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -20,15 +20,10 @@ #include <swwait.hxx> #include <wrtsh.hxx> #include <view.hxx> -#include <swmodule.hxx> -#include <globals.hrc> #include <docsh.hxx> #include <pview.hxx> #include <doc.hxx> #include <docstdlg.hxx> -#include <modcfg.hxx> -#include <fldmgr.hxx> -#include <fldbas.hxx> #include <IDocumentStatistics.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 77235ec72f67..3edef40ea524 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -21,24 +21,19 @@ #include <sfx2/htmlmode.hxx> #include <svx/svxids.hrc> -#include <sfx2/app.hxx> #include <svl/macitem.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> #include <viewopt.hxx> #include <macassgn.hxx> -#include <swevent.hxx> #include <docsh.hxx> -#include <globals.hrc> #include <strings.hrc> #include <view.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svxdlg.hxx> -#include <doc.hxx> - SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) { diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 0150ee3f5674..f97290a0d2e8 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -21,8 +21,6 @@ #include "swdlgfact.hxx" #include <svl/style.hxx> -#include <svx/svxids.hrc> -#include <dbui.hrc> #include <globals.hrc> #include <wordcountdialog.hxx> diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 6dd7f675f793..846618ac0b3b 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -19,37 +19,6 @@ #include "swdlgfact.hxx" -#include <abstract.hxx> -#include <ascfldlg.hxx> -#include <break.hxx> -#include <colwd.hxx> -#include <convert.hxx> -#include <srtdlg.hxx> -#include <dbinsdlg.hxx> -#include <DropDownFieldDialog.hxx> -#include <DropDownFormFieldDialog.hxx> -#include <DateFormFieldDialog.hxx> -#include <fldtdlg.hxx> -#include <glossary.hxx> -#include <inpdlg.hxx> -#include <insfnote.hxx> -#include <instable.hxx> -#include <javaedit.hxx> -#include <label.hxx> -#include <mailmrge.hxx> -#include <mailmergewizard.hxx> -#include <mergetbl.hxx> -#include <multmrk.hxx> -#include <regionsw.hxx> -#include <rowht.hxx> -#include <selglos.hxx> -#include <splittbl.hxx> -#include <tautofmt.hxx> -#include <swmodalredlineacceptdlg.hxx> -#include <swrenamexnameddlg.hxx> -#include <swuiidxmrk.hxx> -#include <swuicnttab.hxx> -#include <wordcountdialog.hxx> #include <swuiexp.hxx> namespace swui diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 33f82dd0a25f..754e6e8dbf06 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -40,12 +40,9 @@ #include <section.hxx> #include <docary.hxx> #include <doc.hxx> -#include <basesh.hxx> #include <wdocsh.hxx> #include <view.hxx> -#include <swmodule.hxx> #include <wrtsh.hxx> -#include <swundo.hxx> #include <column.hxx> #include <fmtclbl.hxx> #include <fmtfsize.hxx> @@ -54,16 +51,12 @@ #include <cmdid.h> #include <strings.hrc> -#include <globals.hrc> #include <bitmaps.hlst> #include <sfx2/bindings.hxx> -#include <sfx2/htmlmode.hxx> +#include <sfx2/sfxdlg.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/dlgutil.hxx> #include <svx/dialogs.hrc> -#include <svx/svxdlg.hxx> #include <svx/flagsdef.hxx> -#include <svx/svxids.hrc> #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 4d7f3b6e1d9d..7dc7370f4b82 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -18,15 +18,12 @@ */ #include <officecfg/Office/Writer.hxx> -#include <swtypes.hxx> #include <wordcountdialog.hxx> #include <docstat.hxx> -#include <cmdid.h> #include <swmodule.hxx> -#include <wview.hxx> +#include <view.hxx> #include <swwait.hxx> #include <wrtsh.hxx> -#include <sfx2/viewfrm.hxx> #include <svl/cjkoptions.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 534aa9b81667..46acd407f057 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> #include <selglos.hxx> SwSelGlossaryDlg::SwSelGlossaryDlg(weld::Window * pParent, const OUString &rShortName) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index a518440e462a..9420a3b5f78a 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -24,22 +24,15 @@ #include <editeng/lrspitem.hxx> #include <editeng/brushitem.hxx> #include <svtools/unitconv.hxx> -#include <svx/svxids.hrc> -#include <vcl/menu.hxx> #include <cmdid.h> -#include <frmatr.hxx> -#include <swtypes.hxx> #include <wrtsh.hxx> #include <view.hxx> -#include <basesh.hxx> -#include <drpcps.hxx> #include "envfmt.hxx" #include <fmtcol.hxx> #include <swuipardlg.hxx> #include <chrdlgmodes.hxx> #include <pardlg.hxx> -#include <pattern.hxx> #include <poolfmt.hxx> #include <uitool.hxx> diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 8bf64749c9bd..928f675588a9 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -18,7 +18,6 @@ */ #include <dbmgr.hxx> -#include <sfx2/app.hxx> #include <tools/lineend.hxx> #include <vcl/print.hxx> #include <vcl/settings.hxx> @@ -37,8 +36,6 @@ #include <comphelper/string.hxx> -#include <unomid.h> - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 064e70a4e45c..43dd2f1a9b8d 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -21,14 +21,11 @@ #include <svtools/prnsetup.hxx> #include <svtools/unitconv.hxx> -#include <swtypes.hxx> #include <cmdid.h> #include "envprt.hxx" #include <envlop.hxx> #include <uitool.hxx> -#include <bitmaps.hlst> - SwEnvPrtPage::SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) : SfxTabPage(pPage, pController, "modules/swriter/ui/envprinterpage.ui", "EnvPrinterPage", &rSet) , m_xUpper(m_xBuilder->weld_widget("upper")) diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index f29f6f2eb5f7..38bc29df5f57 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -20,22 +20,17 @@ #include <memory> #include <vcl/svapp.hxx> #include <rtl/ustring.hxx> -#include <sfx2/sfxsids.hrc> #include <tools/lineend.hxx> #include <com/sun/star/uno/Sequence.h> #include <swtypes.hxx> -#include <wrtsh.hxx> -#include <initui.hxx> #include <labimp.hxx> #include "swuilabimp.hxx" #include "labfmt.hxx" #include "labprt.hxx" -#include <unotools.hxx> #include <dbmgr.hxx> #include <uitool.hxx> #include <cmdid.h> #include <helpids.h> -#include <globals.hrc> #include <strings.hrc> #include <envimg.hxx> diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 4e9d863cdd9b..bc762ef87043 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/text/AutoTextContainer.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/util/XRefreshable.hpp> -#include <swtypes.hxx> -#include "labfmt.hxx" -#include <unotools.hxx> -#include <unoatxt.hxx> -#include <unomid.h> +#include <label.hxx> +#include <labimg.hxx> #include <unoprnms.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index e1bd1dc63130..5011c4799e43 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -35,7 +35,6 @@ #include <uitool.hxx> #include <strings.hrc> -#include <unomid.h> using namespace utl; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 427616e1bfc6..edede9718984 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -17,16 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/diagnose.h> #include <svtools/prnsetup.hxx> #include <unotools/cmdoptions.hxx> #include <vcl/print.hxx> -#include <wrtsh.hxx> #include <label.hxx> #include "labprt.hxx" #include <labimg.hxx> -#include <cmdid.h> - SwLabPrtPage::SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) : SfxTabPage(pPage, pController, "modules/swriter/ui/labeloptionspage.ui", "LabelOptionsPage", &rSet) , pPrinter(nullptr) diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 16478dd81ccf..b29e025773f7 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -23,40 +23,31 @@ #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> -#include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> #include <view.hxx> #include <docsh.hxx> #include <IDocumentDeviceAccess.hxx> +#include <printdata.hxx> #include <wrtsh.hxx> #include <dbmgr.hxx> -#include <dbui.hxx> -#include <prtopt.hxx> #include <swmodule.hxx> #include <modcfg.hxx> #include <mailmergehelper.hxx> #include <mailmrge.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> +#include <comphelper/documentconstants.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> -#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> -#include <unomid.h> - #include <algorithm> using namespace ::com::sun::star; diff --git a/sw/source/ui/fldui/DateFormFieldDialog.cxx b/sw/source/ui/fldui/DateFormFieldDialog.cxx index 01049b49c790..e038eaa34ea7 100644 --- a/sw/source/ui/fldui/DateFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DateFormFieldDialog.cxx @@ -8,12 +8,10 @@ */ #include <DateFormFieldDialog.hxx> -#include <vcl/event.hxx> #include <IMark.hxx> #include <xmloff/odffields.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> -#include <svx/numfmtsh.hxx> #include <doc.hxx> namespace sw diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 64d93fb6112e..08c866294b43 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -19,7 +19,6 @@ #include <wrtsh.hxx> #include <fldbas.hxx> -#include <fldmgr.hxx> #include <DropDownFieldDialog.hxx> #include <flddropdown.hxx> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 4586a067cff7..bb6d9ed53952 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -18,10 +18,8 @@ */ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdb/XDatabaseAccess.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <sfx2/viewfrm.hxx> @@ -29,20 +27,11 @@ #include <view.hxx> #include <wrtsh.hxx> #include <dbmgr.hxx> -#include <fldmgr.hxx> -#include <expfld.hxx> -#include <txtatr.hxx> -#include <ndtxt.hxx> -#include <fldbas.hxx> -#include <dbfld.hxx> #include <changedb.hxx> -#include <globals.hrc> #include <strings.hrc> #include <bitmaps.hlst> -#include <unomid.h> - using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 01b9065cd36e..601dcadf69a6 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -18,12 +18,8 @@ */ #include <swmodule.hxx> -#include <view.hxx> #include <wrtsh.hxx> -#include <globals.hrc> #include <dbfld.hxx> -#include <fldtdlg.hxx> -#include <numrule.hxx> #include <doc.hxx> #include "flddb.hxx" diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 92d263a6efd1..05246a423f20 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -17,24 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/request.hxx> #include <sfx2/frame.hxx> -#include <vcl/svapp.hxx> +#include <sfx2/sfxsids.hrc> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <swtypes.hxx> #include <flddinf.hrc> -#include <globals.hrc> #include <strings.hrc> #include <fldbas.hxx> #include <docufld.hxx> #include <wrtsh.hxx> #include "flddinf.hxx" -#include <swmodule.hxx> -#include <view.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Date.hpp> diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index c9c4dde6c711..31bf38943ae5 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include <flddat.hxx> #include <docufld.hxx> -#include <globals.hrc> #include <strings.hrc> #include <chpfld.hxx> #include "flddok.hxx" #include <swmodule.hxx> -#include <view.hxx> #include <wrtsh.hxx> #include <svl/zformat.hxx> diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 72caa96ec481..b2ab53929819 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -21,14 +21,10 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/request.hxx> -#include <sfx2/app.hxx> #include <svx/optgenrl.hxx> -#include <svx/svxids.hrc> #include <docufld.hxx> #include <expfld.hxx> #include <view.hxx> -#include <dbfld.hxx> #include <wrtsh.hxx> #include "flddb.hxx" #include "flddinf.hxx" @@ -39,7 +35,6 @@ #include <fldedt.hxx> #include <cmdid.h> -#include <globals.hrc> #include <swabstdlg.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 1a3b94d2d19a..c2e6cbef2572 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -17,16 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/app.hxx> -#include <basic/basmgr.hxx> -#include <basic/sbmod.hxx> -#include <docsh.hxx> #include <swtypes.hxx> -#include <globals.hrc> #include <strings.hrc> #include <fldbas.hxx> #include <docufld.hxx> -#include <view.hxx> #include <wrtsh.hxx> #include <swmodule.hxx> #include "fldfunc.hxx" diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index dfc997c718df..94b9caf0ea73 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -21,7 +21,6 @@ #include <sfx2/request.hxx> #include <sfx2/htmlmode.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/svxids.hrc> #include <dbfld.hxx> #include <flddat.hxx> #include <fmtfld.hxx> @@ -36,7 +35,6 @@ #include "fldpage.hxx" #include <docufld.hxx> #include <cmdid.h> -#include <globals.hrc> #include <sfx2/bindings.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 45039e900446..a64f2eb20831 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -18,7 +18,6 @@ */ #include <swtypes.hxx> -#include <view.hxx> #include <IMark.hxx> #include <expfld.hxx> #include <swmodule.hxx> @@ -27,12 +26,9 @@ #include <wrtsh.hxx> #include <fldref.hrc> -#include <globals.hrc> #include <strings.hrc> #include <SwNodeNum.hxx> #include <IDocumentMarkAccess.hxx> -#include <ndtxt.hxx> -#include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> #include <unotools/charclass.hxx> diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 8c1bb998fb85..fd1b28077c04 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -20,16 +20,14 @@ #include <config_features.h> #include <cmdid.h> -#include <swtypes.hxx> #include <unotools/confignode.hxx> #include <comphelper/processfactory.hxx> -#include <sfx2/basedlgs.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/htmlmode.hxx> #include <sfx2/viewfrm.hxx> #include <viewopt.hxx> +#include <chldwrap.hxx> #include <docsh.hxx> -#include <fldwrap.hxx> #include "flddb.hxx" #include "flddinf.hxx" #include "fldvar.hxx" @@ -41,8 +39,6 @@ #include <fldtdlg.hxx> #include <swmodule.hxx> -#include <globals.hrc> - #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index f3626ddac505..f08d10d81fbf 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -24,7 +24,6 @@ #include <docufld.hxx> #include <expfld.hxx> #include <ddefld.hxx> -#include <view.hxx> #include <wrtsh.hxx> #include <doc.hxx> #include <docary.hxx> @@ -33,7 +32,6 @@ #include "flddinf.hxx" #include <calc.hxx> #include <svl/zformat.hxx> -#include <globals.hrc> #include <strings.hrc> #define USER_DATA_VERSION_1 "1" diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index d073b4a0215d..a1cbc81dd78a 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -19,13 +19,11 @@ #include <tools/lineend.hxx> #include <unotools/charclass.hxx> -#include <editeng/unolingu.hxx> #include <wrtsh.hxx> #include <fldbas.hxx> #include <expfld.hxx> #include <usrfld.hxx> #include <inpdlg.hxx> -#include <fldmgr.hxx> // edit field-insert SwFieldInputDlg::SwFieldInputDlg(weld::Widget *pParent, SwWrtShell &rS, diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 5b1fc9cbfa11..bfec3202309c 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -18,8 +18,6 @@ */ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <hintids.hxx> -#include <vcl/svapp.hxx> #include <svl/urihelper.hxx> #include <view.hxx> #include <sfx2/docfile.hxx> @@ -29,10 +27,8 @@ #include <fldbas.hxx> #include <fldmgr.hxx> #include <docufld.hxx> -#include <uitool.hxx> #include <javaedit.hxx> -#include <globals.hrc> #include <strings.hrc> using namespace ::com::sun::star; diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index ea47c81edb8f..a508d828698f 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -19,17 +19,15 @@ #include <hintids.hxx> -#include <sal/log.hxx> #include <sfx2/viewfrm.hxx> #include <svx/hdft.hxx> #include <editeng/flstitem.hxx> #include <sfx2/htmlmode.hxx> +#include <sfx2/sfxdlg.hxx> #include <svtools/htmlcfg.hxx> #include <svl/cjkoptions.hxx> #include <vcl/svapp.hxx> #include <numpara.hxx> -#include <fmtclds.hxx> -#include <swtypes.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> #include <view.hxx> @@ -42,8 +40,6 @@ #include <drpcps.hxx> #include <frmpage.hxx> #include <wrap.hxx> -#include <frmmgr.hxx> -#include <ccoll.hxx> #include <swuiccoll.hxx> #include <docstyle.hxx> #include <fmtcol.hxx> @@ -51,18 +47,13 @@ #include <poolfmt.hxx> #include <uitool.hxx> #include <shellres.hxx> -#include <swabstdlg.hxx> #include <cmdid.h> -#include <globals.hrc> #include <SwStyleNameMapper.hxx> -#include <svx/svxids.hrc> #include <svl/stritem.hxx> -#include <svl/aeitem.hxx> #include <svl/slstitm.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0fbe9f09d819..d9338a058a11 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -17,19 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cstdint> - #include <column.hxx> #include <hintids.hxx> -#include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <sfx2/htmlmode.hxx> #include <svx/colorbox.hxx> -#include <svx/xtable.hxx> -#include <svx/drawitem.hxx> -#include <svx/svxids.hrc> #include <editeng/borderline.hxx> #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> @@ -37,6 +31,7 @@ #include <editeng/frmdiritem.hxx> #include <editeng/ulspitem.hxx> #include <svl/ctloptions.hxx> +#include <svl/itemset.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/event.hxx> @@ -44,9 +39,7 @@ #include <vcl/svapp.hxx> #include <swmodule.hxx> -#include <sal/macros.h> -#include <globals.hrc> #include <swtypes.hxx> #include <wrtsh.hxx> #include <view.hxx> @@ -55,16 +48,12 @@ #include <cmdid.h> #include <viewopt.hxx> #include <fmtclbl.hxx> -#include <format.hxx> +#include <fmtfsize.hxx> #include <frmatr.hxx> -#include <frmmgr.hxx> -#include <frmdlg.hxx> #include <colmgr.hxx> #include <prcntfld.hxx> -#include <paratr.hxx> #include <strings.hrc> #include <section.hxx> -#include <docary.hxx> #include <pagedesc.hxx> //to match associated data in ColumnPage.ui diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 5ce3b9f4cb88..779d1d4526d9 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -25,25 +25,17 @@ #include <numrule.hxx> #include <poolfmt.hxx> #include <docsh.hxx> -#include <frmfmt.hxx> #include <calc.hxx> #include <uitool.hxx> #include <doc.hxx> #include <modcfg.hxx> #include <swmodule.hxx> -#include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> -#include <com/sun/star/text/XTextTableCursor.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> -#include <com/sun/star/text/TableColumnSeparator.hpp> -#include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <comphelper/string.hxx> #include <vcl/weld.hxx> -#include <initui.hxx> -#include <globals.hrc> #include <strings.hrc> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 2deb04142e7e..0d9140d46251 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -20,12 +20,11 @@ #include <svx/dialogs.hrc> #include <hintids.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/sfxdlg.hxx> #include <sfx2/htmlmode.hxx> #include <fmtfsize.hxx> #include <wrtsh.hxx> -#include <doc.hxx> #include <view.hxx> -#include <docsh.hxx> #include <viewopt.hxx> #include <frmdlg.hxx> #include <frmpage.hxx> @@ -33,15 +32,11 @@ #include <column.hxx> #include <macassgn.hxx> -#include <globals.hrc> #include <strings.hrc> +#include <svl/eitem.hxx> #include <svx/svxids.hrc> #include <svx/flagsdef.hxx> -#include <svx/svxdlg.hxx> -#include <svx/svdmodel.hxx> #include <svx/drawitem.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflgrit.hxx> // the dialog's carrier SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame, diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 480611b6a23e..dedafbf2fd34 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -25,7 +25,6 @@ #include <hintids.hxx> #include <bitmaps.hlst> #include <vcl/mnemonic.hxx> -#include <svl/urihelper.hxx> #include <svl/stritem.hxx> #include <sfx2/htmlmode.hxx> #include <editeng/sizeitem.hxx> @@ -38,8 +37,8 @@ #include <svx/swframeposstrings.hxx> #include <svx/swframevalidation.hxx> #include <comphelper/classids.hxx> -#include <sfx2/viewfrm.hxx> #include <tools/globname.hxx> +#include <tools/urlobj.hxx> #include <fmturl.hxx> #include <fmteiro.hxx> #include <fmtcnct.hxx> @@ -50,23 +49,18 @@ #include <uitool.hxx> #include <docsh.hxx> #include <viewopt.hxx> -#include <frmatr.hxx> #include <frmdlg.hxx> #include <frmmgr.hxx> #include <frmpage.hxx> -#include <wrap.hxx> #include <colmgr.hxx> #include <grfatr.hxx> -#include <uiitems.hxx> #include <fmtfollowtextflow.hxx> -#include <editeng/adjustitem.hxx> #include <svx/sdtaitm.hxx> #include <sal/macros.h> #include <strings.hrc> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> -#include <svx/svxids.hrc> #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 9cc2e271d7a3..a9de137b21dd 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svxdlg.hxx> +#include <sfx2/sfxdlg.hxx> #include <svx/dialogs.hrc> #include <swtypes.hxx> #include <pattern.hxx> diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index c65945628d95..5635b06ed400 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svl/itemset.hxx> #include <svx/flagsdef.hxx> +#include <sfx2/sfxdlg.hxx> #include <sfx2/tabdlg.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 4353f00588cd..a09c8475cdcd 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> #include <vcl/graph.hxx> -#include <vcl/settings.hxx> #include <sfx2/htmlmode.hxx> #include <sfx2/objsh.hxx> @@ -38,9 +37,7 @@ #include <swmodule.hxx> #include <viewopt.hxx> #include <fmtsrnd.hxx> -#include <frmatr.hxx> #include <frmmgr.hxx> -#include <globals.hrc> #include <wrap.hxx> #include <bitmaps.hlst> #include <fmtwrapinfluenceonobjpos.hxx> diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 12f8ad5abd1f..3b853f804eb3 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -17,38 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svl/style.hxx> #include <com/sun/star/text/XDocumentIndexesSupplier.hpp> #include <com/sun/star/text/XTextSectionsSupplier.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/text/XDependentTextField.hpp> -#include <com/sun/star/text/XParagraphCursor.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/text/ChapterFormat.hpp> #include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/beans/PropertyValues.hpp> -#include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/ui/dialogs/XFilePicker.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <comphelper/string.hxx> #include <wrtsh.hxx> #include <view.hxx> #include <cnttab.hxx> -#include <poolfmt.hxx> #include <unoprnms.hxx> #include <unotools.hxx> #include <unotxdoc.hxx> #include <docsh.hxx> -#include <swmodule.hxx> -#include <cmdid.h> -#include <globals.hrc> #include <SwStyleNameMapper.hxx> #include <swuicnttab.hxx> -#include <unomid.h> using namespace ::com::sun::star; using namespace ::com::sun::star::text; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 40a581b4abbe..0c181975d5bf 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -17,38 +17,27 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_folders.h> - #include <sal/log.hxx> #include <svl/style.hxx> -#include <vcl/help.hxx> #include <vcl/weld.hxx> #include <svl/stritem.hxx> -#include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> -#include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/sfxdlg.hxx> #include <svx/dialogs.hrc> -#include <svx/svxdlg.hxx> #include <svx/flagsdef.hxx> -#include <svx/svxids.hrc> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <svtools/indexentryres.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <editeng/unolingu.hxx> #include <column.hxx> #include <fmtfsize.hxx> -#include <shellio.hxx> #include <authfld.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> #include <view.hxx> -#include <basesh.hxx> -#include <outline.hxx> #include <cnttab.hxx> #include <swuicnttab.hxx> #include <poolfmt.hxx> @@ -58,23 +47,17 @@ #include <fldbas.hxx> #include <expfld.hxx> #include <unotools.hxx> -#include <unotxdoc.hxx> #include <docsh.hxx> #include <swmodule.hxx> #include <modcfg.hxx> #include <cmdid.h> -#include <globals.hrc> #include <cnttab.hrc> #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> #include <toxwrap.hxx> #include <chpfld.hxx> -#include <sfx2/app.hxx> - -#include <unomid.h> - #include <cmath> #include <memory> #include <vector> diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 64e2b5c9f451..6d021eb07c13 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> #include <multmrk.hxx> #include <toxmgr.hxx> #include <wrtsh.hxx> diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 03dc2072cc5e..290aa91a8ddf 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -21,7 +21,6 @@ #include <hintids.hxx> #include <helpids.h> #include <comphelper/processfactory.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/Bibliography.hpp> @@ -29,39 +28,27 @@ #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchFlags.hpp> #include <i18nutil/searchopt.hxx> -#include <svl/stritem.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svl/eitem.hxx> -#include <unotools/textsearch.hxx> -#include <editeng/scripttypeitem.hxx> #include <svl/itemset.hxx> #include <editeng/langitem.hxx> -#include <editeng/unolingu.hxx> #include <swtypes.hxx> -#include <idxmrk.hxx> #include <toxmgr.hxx> #include <txttxmrk.hxx> #include <wrtsh.hxx> #include <view.hxx> -#include <multmrk.hxx> #include <swundo.hxx> #include <cmdid.h> -#include <app.hrc> #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> #include <strings.hrc> -#include <swcont.hxx> #include <svl/cjkoptions.hxx> #include <ndtxt.hxx> -#include <breakit.hxx> #include <SwRewriter.hxx> -#include <unomid.h> - #define POS_CONTENT 0 #define POS_INDEX 1 diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 3c99ab0c6848..9243f6c02c34 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -19,20 +19,16 @@ #include <sfx2/request.hxx> #include <svl/stritem.hxx> -#include <svx/svxids.hrc> -#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <swabstdlg.hxx> #include <swuiexp.hxx> #include <view.hxx> -#include <basesh.hxx> #include <wrtsh.hxx> #include <cmdid.h> #include <bookmark.hxx> #include <docsh.hxx> -#include <globals.hrc> #include <ndtxt.hxx> #include <strings.hrc> #include <svtools/miscopt.hxx> diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 746fca46ef87..598fb05092da 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -18,8 +18,6 @@ */ #include <tools/urlobj.hxx> -#include <tools/stream.hxx> -#include <vcl/help.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/transliterationwrapper.hxx> @@ -30,7 +28,6 @@ #include <swtypes.hxx> #include <glosbib.hxx> #include <gloshdl.hxx> -#include <actctrl.hxx> #include <glossary.hxx> #include <glosdoc.hxx> #include <swunohelper.hxx> diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 3fd85a31895a..d0d099da0782 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -23,7 +23,6 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/help.hxx> #include <svl/stritem.hxx> #include <svl/macitem.hxx> #include <unotools/pathoptions.hxx> @@ -33,38 +32,29 @@ #include <sfx2/docfilt.hxx> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> #include <editeng/acorrcfg.hxx> #include <sfx2/viewfrm.hxx> -#include <unocrsr.hxx> #include <unotools.hxx> #include <comphelper/processfactory.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/text/AutoTextContainer.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <svl/urihelper.hxx> #include <unotools/charclass.hxx> -#include <swwait.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> #include <view.hxx> -#include <basesh.hxx> #include <glossary.hxx> #include <gloshdl.hxx> #include <glosbib.hxx> #include <initui.hxx> #include <glosdoc.hxx> #include <macassgn.hxx> -#include <swevent.hxx> #include <docsh.hxx> #include <shellio.hxx> #include <cmdid.h> -#include <swerror.h> -#include <globals.hrc> -#include <swmodule.hxx> #include <sfx2/filedlghelper.hxx> #include <memory> diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 29d4c6482b24..23e5514a33d8 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -20,20 +20,13 @@ #include <hintids.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <svx/svxids.hrc> -#include <sfx2/request.hxx> #include <editeng/fontitem.hxx> #include <fmtftn.hxx> #include <swundo.hxx> #include <cmdid.h> #include <wrtsh.hxx> -#include <view.hxx> -#include <basesh.hxx> #include <insfnote.hxx> -#include <globals.hrc> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> -#include <sfx2/viewfrm.hxx> #include <memory> diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 8ee82b88cfe1..2d6cbd0630b9 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -28,7 +28,6 @@ #include <docstyle.hxx> -#include <fldbas.hxx> #include <lineinfo.hxx> #include <linenum.hxx> #include <swmodule.hxx> diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 970c61157307..1dce5e2bcf90 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -17,36 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> -#include <sfx2/app.hxx> -#include <svx/gallery.hxx> -#include <editeng/brushitem.hxx> -#include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> #include <cmdid.h> -#include <swmodule.hxx> #include <wrtsh.hxx> #include <docsh.hxx> #include <wview.hxx> #include <uitool.hxx> #include <wdocsh.hxx> #include <uiitems.hxx> -#include <docstyle.hxx> -#include <charfmt.hxx> -#include <uinums.hxx> #include <poolfmt.hxx> #include <shellres.hxx> #include <outline.hxx> #include <num.hxx> -#include <viewopt.hxx> -#include <frmmgr.hxx> -#include <globals.hrc> #include <SwStyleNameMapper.hxx> -#include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svl/stritem.hxx> -#include <svl/aeitem.hxx> +#include <svl/eitem.hxx> #include <svl/slstitm.hxx> #include <svl/intitem.hxx> #include <comphelper/lok.hxx> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 4f979bb3570b..5647cb61ebd9 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -18,7 +18,6 @@ */ #include <hintids.hxx> -#include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <sfx2/tabdlg.hxx> @@ -40,18 +39,11 @@ #include <charfmt.hxx> #include <docstyle.hxx> #include <viewopt.hxx> -#include <svtools/ctrlbox.hxx> -#include <globals.hrc> #include <outline.hrc> #include <strings.hrc> #include <paratr.hxx> -#include <unomid.h> - #include <IDocumentOutlineNodes.hxx> -#include <app.hrc> - -#include <com/sun/star/accessibility/AccessibleRole.hpp> using namespace ::com::sun::star; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 910bccd1c7f6..b2398c80d649 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -21,13 +21,7 @@ #include <fmtfsize.hxx> #include <hintids.hxx> #include <svtools/unitconv.hxx> -#include <svx/dialogs.hrc> -#include <svx/svxids.hrc> -#include <svx/drawitem.hxx> -#include <svx/xtable.hxx> -#include <sal/macros.h> #include <vcl/field.hxx> -#include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> #include <editeng/borderline.hxx> @@ -39,10 +33,7 @@ #include <pagedesc.hxx> #include <pgfnote.hxx> #include <uiitems.hxx> -#include <sfx2/objsh.hxx> -#include <globals.hrc> -#include <strings.hrc> #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index b36fba8169a4..fcc9dc343d84 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -17,16 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/app.hxx> - #include <cmdid.h> #include <hintids.hxx> #include <swtypes.hxx> -#include <globals.hrc> #include <svx/colorbox.hxx> -#include <svx/xtable.hxx> -#include <svx/svxids.hrc> -#include <uitool.hxx> #include <editeng/sizeitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> @@ -38,7 +32,6 @@ #include <wrtsh.hxx> #include <doc.hxx> -#include <uiitems.hxx> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index b94922e93845..3e46ea05a1eb 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -17,32 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cstdint> - #include <srtdlg.hxx> +#include <editeng/editids.hrc> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/intitem.hxx> -#include <svl/eitem.hxx> -#include <sfx2/dispatch.hxx> -#include <svx/svxids.hrc> -#include <editeng/unolingu.hxx> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> #include <unotools/collatorwrapper.hxx> #include <svtools/collatorres.hxx> #include <swwait.hxx> #include <view.hxx> -#include <cmdid.h> #include <wrtsh.hxx> -#include <app.hrc> #include <strings.hrc> #include <swtable.hxx> #include <sortopt.hxx> #include <node.hxx> #include <tblsel.hxx> -#include <sfx2/request.hxx> #include <memory> static bool bCheck1 = true; diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 762a20038df2..0054b360e18e 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -17,28 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <redline.hxx> -#include <svl/eitem.hxx> -#include <sfx2/viewfrm.hxx> -#include <sfx2/dispatch.hxx> #include <svx/ctredlin.hxx> -#include <svx/postattr.hxx> #include <unotools/viewoptions.hxx> -#include <swtypes.hxx> -#include <wrtsh.hxx> -#include <view.hxx> -#include <swmodule.hxx> -#include <swwait.hxx> -#include <uitool.hxx> -#include <cmdid.h> - -#include <vector> #include <redlndlg.hxx> #include <swmodalredlineacceptdlg.hxx> -#include <unomid.h> - SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(weld::Window *pParent) : SfxDialogController(pParent, "svx/ui/acceptrejectchangesdialog.ui", "AcceptRejectChangesDialog") diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 2e4279d0dae7..3e264f5bb0a4 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -7,25 +7,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <sfx2/viewfrm.hxx> #include <view.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> #include <poolfmt.hxx> #include <docsh.hxx> -#include <charfmt.hxx> -#include <docstyle.hxx> -#include <fldbas.hxx> -#include <lineinfo.hxx> -#include <globals.hrc> #include <titlepage.hxx> -#include <uitool.hxx> #include <fmtpdsc.hxx> #include <pagedesc.hxx> -#include <IDocumentStylePoolAccess.hxx> - namespace { bool lcl_GetPageDesc(SwWrtShell *pSh, sal_uInt16 &rPageNo, std::unique_ptr<const SwFormatPageDesc>* ppPageFormatDesc) diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index ee24ec5c454a..435b4ee10dc2 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/dispatch.hxx> -#include <svx/dlgutil.hxx> #include <svtools/unitconv.hxx> #include <colwd.hxx> #include <tablemgr.hxx> @@ -26,11 +24,8 @@ #include <wdocsh.hxx> #include <view.hxx> #include <swmodule.hxx> -#include <modcfg.hxx> #include <usrpref.hxx> -#include <cmdid.h> - IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, weld::SpinButton&, void) { sal_uInt16 nId = static_cast<sal_uInt16>(m_xColNF->get_value()) - 1; diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 9420e5c2290f..fe49843b5264 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -17,20 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svl/stritem.hxx> -#include <sfx2/viewfrm.hxx> #include <modcfg.hxx> #include <sfx2/htmlmode.hxx> #include <viewopt.hxx> #include <swmodule.hxx> -#include <cmdid.h> #include <convert.hxx> #include <tablemgr.hxx> -#include <wrtsh.hxx> #include <view.hxx> #include <tblafmt.hxx> -#include <app.hrc> #include <strings.hrc> #include <swabstdlg.hxx> #include <swuiexp.hxx> diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 4d1225af9a27..d83c78641e46 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -23,7 +23,6 @@ #include <swmodule.hxx> #include <sfx2/htmlmode.hxx> #include <viewopt.hxx> -#include <swabstdlg.hxx> #define ROW_COL_PROD 16384 diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index bb45020e9783..5713709145e4 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> #include <mergetbl.hxx> SwMergeTableDlg::SwMergeTableDlg(weld::Window *pParent, bool& rWithPrev) diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 778f9272608d..f46297bf7de5 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -17,24 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svl/intitem.hxx> -#include <svl/eitem.hxx> -#include <sfx2/dispatch.hxx> -#include <svx/dlgutil.hxx> #include <svtools/unitconv.hxx> #include <fmtfsize.hxx> #include <swtypes.hxx> #include <rowht.hxx> #include <wrtsh.hxx> -#include <frmatr.hxx> #include <wdocsh.hxx> #include <view.hxx> #include <swmodule.hxx> #include <usrpref.hxx> -#include <cmdid.h> - void SwTableHeightDlg::Apply() { SwTwips nHeight = static_cast< SwTwips >(m_xHeightEdit->denormalize(m_xHeightEdit->get_value(FieldUnit::TWIP))); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 821eb68a8f24..31aaae86a5f8 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -28,24 +28,22 @@ #include <editeng/frmdiritem.hxx> #include <svl/ctloptions.hxx> #include <swmodule.hxx> -#include <fmtornt.hxx> #include <fmtpdsc.hxx> #include <fmtlsplt.hxx> #include <svtools/htmlcfg.hxx> #include <fmtrowsplt.hxx> #include <sfx2/htmlmode.hxx> +#include <sfx2/sfxdlg.hxx> #include <strings.hrc> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> -#include <docsh.hxx> #include <wrtsh.hxx> #include <view.hxx> #include <viewopt.hxx> #include <uitool.hxx> -#include <frmatr.hxx> #include <tabledlg.hxx> #include "../../uibase/table/tablepg.hxx" #include <tablemgr.hxx> @@ -55,12 +53,12 @@ #include <swtablerep.hxx> #include <SwStyleNameMapper.hxx> -#include <app.hrc> #include <cmdid.h> -#include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> -#include <svx/svxdlg.hxx> + +#include <com/sun/star/text/HoriOrientation.hpp> +#include <com/sun/star/text/VertOrientation.hpp> using namespace ::com::sun::star; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index bf8a4a701d6c..169d38f228cc 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -22,7 +22,6 @@ #include <vcl/weld.hxx> #include <sal/log.hxx> #include <strings.hrc> -#include <view.hxx> #include <shellres.hxx> #include <tautofmt.hxx> diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index f79d2c719c62..29badcd437c3 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -20,7 +20,6 @@ #include "swdetect.hxx" #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <sfx2/docfile.hxx> diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 42d52cfda197..73993a68f539 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -17,29 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> -#include <globals.hrc> - -#include <unoprnms.hxx> #include <osl/diagnose.h> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/view/XScreenCursor.hpp> -#include <com/sun/star/view/DocumentZoomType.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/text/XText.hpp> -#include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/view/XViewSettingsSupplier.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <sfx2/dispatch.hxx> -#include <svl/stritem.hxx> -#include <shellio.hxx> -#include <docsh.hxx> -#include <view.hxx> -#include <wrtsh.hxx> -#include <swmodule.hxx> -#include <unocrsr.hxx> #include <swrenamexnameddlg.hxx> |