cui/source/options/optcolor.cxx | 4 +---
dbaccess/source/ui/control/FieldDescControl.cxx | 3 ---
dbaccess/source/ui/dlg/UserAdmin.cxx | 2 +-
dbaccess/source/ui/dlg/tablespage.hxx | 1 -
dbaccess/source/ui/misc/WNameMatch.cxx | 1 -
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 +-----
sc/source/ui/docshell/tpstat.cxx | 2 --
sdext/source/minimizer/optimizerdialog.cxx | 2 +-
sfx2/source/appl/appopen.cxx | 1 -
sfx2/source/appl/appquit.cxx | 1 -
sfx2/source/appl/lnkbase2.cxx | 1 -
sfx2/source/appl/sfxhelp.cxx | 2 +-
sfx2/source/dialog/newstyle.cxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 2 --
sfx2/source/doc/autoredactdialog.cxx | 3 +--
sfx2/source/doc/new.cxx | 1 -
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 1 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 3 ++-
sw/source/ui/dbui/mmaddressblockpage.hxx | 2 --
sw/source/uibase/inc/mailmergehelper.hxx | 1 -
vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +-
21 files changed, 10 insertions(+), 33 deletions(-)
New commits:
commit ee2e8d0c0670b4eeecd73b76d7f182fa003426ae
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 2 20:20:34 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 3 11:10:58 2019 +0200
drop some unnecessary includes
Change-Id: I656ed2e29988fe47e4db8fa2ea8edec022bd56c2
Reviewed-on: https://gerrit.libreoffice.org/80098
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 3456783101b3..56e75fecd969 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -26,12 +26,10 @@
#include <editeng/editids.hrc>
#include <svtools/colorcfg.hxx>
#include <svtools/extcolorcfg.hxx>
-#include <vcl/headbar.hxx>
-#include <vcl/scrbar.hxx>
#include <svx/colorbox.hxx>
#include <unotools/moduleoptions.hxx>
-#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svx/svxdlg.hxx>
#include <helpids.h>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 1e4cfca41a3c..59b3c6cf7c82 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -22,10 +22,7 @@
#include <FieldControls.hxx>
#include <tools/diagnose_ex.h>
#include <TableDesignHelpBar.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/button.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/fixed.hxx>
#include <vector>
#include <FieldDescriptions.hxx>
#include <dlgattr.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx
b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 691241d54951..0310967fa290 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -36,7 +36,7 @@
#include <strings.hxx>
#include <core_resource.hxx>
#include <dbadmin.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/passwd.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx
b/dbaccess/source/ui/dlg/tablespage.hxx
index d545e9408bc6..15e647dc0bc1 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -22,7 +22,6 @@
#include "adminpages.hxx"
#include <com/sun/star/i18n/XCollator.hpp>
-#include <vcl/layout.hxx>
#include <tabletree.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx
b/dbaccess/source/ui/misc/WNameMatch.cxx
index a1231f02bb6c..8e759d879178 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -24,7 +24,6 @@
#include <core_resource.hxx>
#include <strings.hrc>
#include <bitmaps.hlst>
-#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 247f4c431f51..e48bb2d0912d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -35,12 +35,8 @@
#include <fpicker/strings.hrc>
-#include <vcl/ctrl.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/builderfactory.hxx>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index e7544e54128e..9056118d7f40 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -24,8 +24,6 @@
#include <tpstat.hxx>
-#include <vcl/layout.hxx>
-
// Dokumentinfo-Tabpage:
std::unique_ptr<SfxTabPage> ScDocStatPage::Create( weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet* rSet )
diff --git a/sdext/source/minimizer/optimizerdialog.cxx
b/sdext/source/minimizer/optimizerdialog.cxx
index 9746ba067a92..503199400ec2 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -32,8 +32,8 @@
#include <sal/macros.h>
#include <osl/time.h>
#include <vcl/errinf.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <vcl/layout.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <tools/urlobj.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index fde6a67522d3..761b3a816dd8 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -50,7 +50,6 @@
#include <vcl/wrkwin.hxx>
#include <svl/intitem.hxx>
-#include <vcl/layout.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <sfx2/doctempl.hxx>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 77e27606f8ee..bf034e9b2b9b 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -23,7 +23,6 @@
#include <basic/sbstar.hxx>
#include <svl/svdde.hxx>
-#include <vcl/layout.hxx>
#include <svl/eitem.hxx>
#include <unotools/saveopt.hxx>
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 6d9d9808fad6..9d234bf82c81 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <vcl/layout.hxx>
#include <sfx2/linkmgr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 48147b9245c5..2c1f5e823cbd 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -71,7 +71,7 @@
#include <vcl/commandinfoprovider.hxx>
#include <vcl/dialog.hxx>
#include <vcl/keycod.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/settings.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
#include <svtools/ehdl.hxx>
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 003a58f0eb92..088dbe6ddbdb 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -22,7 +22,7 @@
#include <sfx2/newstyle.hxx>
#include <sfx2/strings.hrc>
#include <sfx2/sfxresid.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
// Private methods ------------------------------------------------------
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 3704cd1f3888..719563505f2d 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -34,9 +34,7 @@
#include <sfx2/sfxdlg.hxx>
#include <sfx2/viewsh.hxx>
#include <unotools/viewoptions.hxx>
-#include <vcl/builder.hxx>
#include <vcl/IDialogRenderable.hxx>
-#include <vcl/layout.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
diff --git a/sfx2/source/doc/autoredactdialog.cxx
b/sfx2/source/doc/autoredactdialog.cxx
index dfb90caa73a0..810952257c37 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -24,9 +24,8 @@
#include <svl/itemset.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/idle.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index c28520d62c6b..32abbf890f76 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -19,7 +19,6 @@
#include <osl/file.hxx>
#include <sfx2/new.hxx>
-#include <vcl/layout.hxx>
#include <vcl/idle.hxx>
#include <vcl/gdimtf.hxx>
#include <svl/itemset.hxx>
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 49c1df3fdaa3..00c4076b1ebb 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -20,7 +20,6 @@
#include <swtypes.hxx>
#include "customizeaddresslistdialog.hxx"
#include "createaddresslistdialog.hxx"
-#include <vcl/scrbar.hxx>
#include <dbui.hrc>
SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index f7836e88b1d8..b911b2ee31ec 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -24,9 +24,10 @@
#include <editeng/eeitem.hxx>
#include <svl/grabbagitem.hxx>
#include <svl/itemset.hxx>
+#include <vcl/event.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/transfer.hxx>
-#include <vcl/txtattr.hxx>
#include <mmconfigitem.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 27c99b0aedc7..2fc3f7e54e1f 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -21,11 +21,9 @@
#include <svx/weldeditview.hxx>
#include <vcl/wizardmachine.hxx>
-#include <vcl/button.hxx>
#include <mailmergehelper.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/textfilter.hxx>
-#include <vcl/layout.hxx>
#include <svl/lstner.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx
b/sw/source/uibase/inc/mailmergehelper.hxx
index 72b1c98a25d9..dc933e92f551 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/compbase.hxx>
-#include <vcl/scrbar.hxx>
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
#include <rtl/ustring.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 625e5cdf51f9..e18ea40cd789 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -23,8 +23,8 @@
#include <unx/gtk/gtkgdi.hxx>
#include <unx/gtk/gtksalmenu.hxx>
#include <unx/gtk/hudawareness.h>
+#include <vcl/event.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/layout.hxx>
#include <unx/wmadaptor.hxx>
#include <unx/sm.hxx>
#include <unx/salbmp.h>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
