13 files changed, 1 insertions, 76 deletions
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;