basctl/source/basicide/baside2.cxx | 4 +- basctl/source/basicide/basidesh.cxx | 1 basctl/source/basicide/moduldl2.cxx | 2 - desktop/inc/pch/precompiled_deploymentgui.hxx | 21 ----------- desktop/source/deployment/gui/dp_gui.h | 10 ----- desktop/source/deployment/gui/dp_gui_dependencydialog.cxx | 4 -- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 1 desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 3 + desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 5 -- desktop/source/deployment/gui/dp_gui_service.cxx | 1 desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 7 --- desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 3 - desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 4 -- desktop/source/deployment/gui/license_dialog.cxx | 8 +--- include/sfx2/dinfdlg.hxx | 7 --- sc/source/ui/docshell/docsh.cxx | 3 + sfx2/source/doc/objcont.cxx | 2 - svx/source/dialog/docrecovery.cxx | 2 - sw/source/ui/dbui/createaddresslistdialog.cxx | 1 19 files changed, 18 insertions(+), 71 deletions(-)
New commits: commit 6e9d87399c114e3b9332ad33d88165b78c8cd81e Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Jun 14 11:57:33 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Jun 14 20:35:34 2019 +0200 remove some unused includes Change-Id: I1a3512fd7fd50379ecd25389a894c2a3aadb7edb Reviewed-on: https://gerrit.libreoffice.org/74035 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 04dbd78e8f57..dd1da4e144d6 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -51,10 +51,12 @@ #include <svl/visitem.hxx> #include <svl/whiter.hxx> #include <svx/svxids.hrc> +#include <vcl/event.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> +#include <vcl/textview.hxx> #include <vcl/weld.hxx> #include <vcl/xtextedt.hxx> -#include <vcl/textview.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <cassert> #include <osl/diagnose.h> diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 4f4739e2cc52..70b400443180 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -65,6 +65,7 @@ #include <sfx2/viewfac.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <cppuhelper/implbase.hxx> namespace basctl diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 6c7b0225bf3d..12b47788cfbd 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -37,9 +37,9 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> +#include <vcl/svapp.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> -#include <vcl/builderfactory.hxx> #include <vcl/weld.hxx> #include <com/sun/star/io/Pipe.hpp> diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx index e6f70c82e818..a51390843ed3 100644 --- a/desktop/inc/pch/precompiled_deploymentgui.hxx +++ b/desktop/inc/pch/precompiled_deploymentgui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-05-12 16:56:51 using: + Generated on 2019-06-14 11:55:42 using: ./bin/update_pch desktop deploymentgui --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,11 +24,9 @@ #include <algorithm> #include <cassert> #include <cstddef> -#include <deque> #include <iomanip> #include <limits.h> #include <limits> -#include <list> #include <memory> #include <new> #include <ostream> @@ -48,7 +46,6 @@ #include <rtl/alloc.h> #include <rtl/locale.h> #include <rtl/ref.hxx> -#include <rtl/textcvt.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> @@ -57,27 +54,12 @@ #include <sal/saldllapi.h> #include <sal/types.h> #include <sal/typesizes.h> -#include <vcl/accel.hxx> -#include <vcl/bitmapex.hxx> #include <vcl/ctrl.hxx> -#include <vcl/dialog.hxx> #include <vcl/dllapi.h> -#include <vcl/idle.hxx> -#include <vcl/image.hxx> #include <vcl/keycod.hxx> -#include <vcl/menu.hxx> -#include <vcl/mnemonicengine.hxx> -#include <vcl/outdev.hxx> -#include <vcl/quickselectionengine.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/transfer.hxx> -#include <vcl/treelist.hxx> -#include <vcl/treelistbox.hxx> -#include <vcl/vclenum.hxx> -#include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> -#include <vcl/vclreferencebase.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> #endif // PCH_LEVEL >= 2 @@ -113,7 +95,6 @@ #include <svtools/controldims.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> -#include <tools/contnr.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/solar.h> diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 37c39c04ba58..b5a6d84c9646 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -25,10 +25,6 @@ #include <rtl/ref.hxx> #include <rtl/instance.hxx> #include <osl/thread.hxx> -#include <vcl/svapp.hxx> -#include <vcl/dialog.hxx> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> #include <salhelper/simplereferenceobject.hxx> #include <com/sun/star/ucb/XContentEventListener.hpp> #include <osl/mutex.hxx> @@ -51,16 +47,10 @@ namespace com { namespace sun { namespace star { } } } } -namespace svt { - class FixedHyperlink; -} - namespace dp_gui { enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE }; - - } // namespace dp_gui #endif diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 0a8508026e99..293a5c06fed4 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -24,12 +24,10 @@ #include <vector> #include <rtl/ustring.hxx> -#include <vcl/dialog.hxx> +#include <vcl/weld.hxx> #include "dp_gui_dependencydialog.hxx" -namespace vcl { class Window; } - using dp_gui::DependencyDialog; DependencyDialog::DependencyDialog( diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 9fada8ce9db3..31f29368708e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -62,6 +62,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/anytostring.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index e0691e6430ee..0a092956b416 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -38,10 +38,11 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <cppuhelper/weakref.hxx> #include <i18nlangtag/languagetag.hxx> +#include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/ptrstyle.hxx> +#include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <vcl/commandevent.hxx> #include <algorithm> #define USER_PACKAGE_MANAGER "user" diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index ccdc63e42526..f0400e63cfd0 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -21,11 +21,8 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTLISTBOX_HXX #include <rtl/ustring.hxx> -#include <vcl/scrbar.hxx> -#include <vcl/fixed.hxx> -#include <vcl/fixedhyper.hxx> -#include <vcl/dialog.hxx> #include <vcl/customweld.hxx> +#include <vcl/image.hxx> #include <vcl/weld.hxx> #include <cppuhelper/implbase.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 12683e6af260..10325631d6a2 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -28,6 +28,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/servicedecl.hxx> #include <comphelper/unwrapargs.hxx> +#include <unotools/resmgr.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index c8c6d5adcc73..3cff34b814ce 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -80,17 +80,11 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <salhelper/thread.hxx> -#include <vcl/svlbitm.hxx> -#include <vcl/treelistbox.hxx> #include <svtools/controldims.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/solar.h> #include <unotools/configmgr.hxx> -#include <vcl/button.hxx> -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> @@ -112,7 +106,6 @@ class KeyEvent; class MouseEvent; -namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 6240cf3566ec..eb29a69f5e09 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -24,7 +24,6 @@ #include <osl/file.hxx> #include <osl/conditn.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <vcl/dialog.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/implbase.hxx> @@ -67,8 +66,6 @@ #include <vector> -namespace vcl { class Window; } - namespace cssu = ::com::sun::star::uno; using dp_misc::StrTitle; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 6cda8170f77e..ea42a7273a5b 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -21,10 +21,6 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX #include <sal/config.h> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/dialog.hxx> -#include <vcl/prgsbar.hxx> #include <vcl/weld.hxx> #include <rtl/ref.hxx> #include <vector> diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index d84680ada04c..9ab343730d89 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -22,14 +22,12 @@ #include <unotools/configmgr.hxx> #include <comphelper/unwrapargs.hxx> #include <i18nlangtag/mslangid.hxx> -#include <vcl/event.hxx> -#include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <svl/lstner.hxx> -#include <vcl/xtextedt.hxx> -#include <vcl/textview.hxx> -#include <vcl/scrbar.hxx> +#include <vcl/event.hxx> +#include <vcl/idle.hxx> +#include <vcl/svapp.hxx> #include <vcl/threadex.hxx> #include <vcl/weld.hxx> diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 6dbca6532469..3f25e3403543 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -31,14 +31,7 @@ #include <svtools/ctrlbox.hxx> -#include <vcl/edit.hxx> -#include <vcl/field.hxx> #include <vcl/idle.hxx> -#include <vcl/layout.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/scrbar.hxx> -#include <vcl/fixed.hxx> -#include <vcl/ctrl.hxx> #include <sfx2/tabdlg.hxx> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 06d96c331c30..48b0532f73a7 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -26,9 +26,10 @@ #include <comphelper/fileformat.h> #include <comphelper/classids.hxx> #include <formula/errorcodes.hxx> -#include <vcl/weld.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> +#include <vcl/weld.hxx> #include <rtl/bootstrap.hxx> #include <rtl/tencinfo.h> #include <sal/log.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 938a1c0771c7..bdd117bc73e3 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -25,9 +25,9 @@ #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <comphelper/fileurl.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/style.hxx> -#include <vcl/wrkwin.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index b5a5436b5b70..b2731aa32afc 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -30,13 +30,11 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/string.hxx> #include <svtools/imagemgr.hxx> -#include <vcl/xtextedt.hxx> #include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> -#include <vcl/scrbar.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index ac56d6b9bf5b..62b04be87fca 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -26,7 +26,6 @@ #include "createaddresslistdialog.hxx" #include "customizeaddresslistdialog.hxx" #include <mmconfigitem.hxx> -#include <vcl/scrbar.hxx> #include <vcl/event.hxx> #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits