diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-10-22 00:28:05 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-22 09:24:15 +0200 |
commit | 6dd4e88c41bca12c2b7a97aee1f078bba7873960 (patch) | |
tree | b9fd1188ae74e54b79dc8dbf514b64038a81b762 | |
parent | b0de7a890e28f3a918ddb3583db0af8347e5d9ae (diff) |
tdf#42949 Fix IWYU warnings in fpicker/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ia3f05f9c9e74ef211cc21bf92f88a330e3e2378e
Reviewed-on: https://gerrit.libreoffice.org/81288
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
20 files changed, 23 insertions, 65 deletions
diff --git a/fpicker/IwyuFilter_fpicker.yaml b/fpicker/IwyuFilter_fpicker.yaml new file mode 100644 index 000000000000..ce44fed1a666 --- /dev/null +++ b/fpicker/IwyuFilter_fpicker.yaml @@ -0,0 +1,2 @@ +--- +assumeFilename: fpicker/source/office/fps_office.cxx diff --git a/fpicker/qa/unit/fpicker-dialogs-test.cxx b/fpicker/qa/unit/fpicker-dialogs-test.cxx index dba6d1eef001..7e83d2756674 100644 --- a/fpicker/qa/unit/fpicker-dialogs-test.cxx +++ b/fpicker/qa/unit/fpicker-dialogs-test.cxx @@ -9,9 +9,6 @@ #include <sal/config.h> #include <test/screenshot_test.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> -#include <sfx2/app.hxx> #include <vcl/abstdlg.hxx> using namespace ::com::sun::star; diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index d0dfd83131ca..073d0268a9be 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> #include <vcl/button.hxx> @@ -32,7 +33,6 @@ #include <tools/debug.hxx> #include <algorithm> -#include <functional> namespace svt diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index fcba48674dc9..0f857cb08f78 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX #include <vcl/lstbox.hxx> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include "fileview.hxx" #include "pickercallbacks.hxx" #include <o3tl/typed_flags_set.hxx> diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index aa95fcc8baf2..ab5d0e3b435e 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -18,6 +18,7 @@ */ +#include "OfficeControlAccess.hxx" #include "OfficeFilePicker.hxx" #include "iodlg.hxx" #include "RemoteFilesDialog.hxx" @@ -30,16 +31,10 @@ #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp> #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/NamedValue.hpp> -#include <unotools/ucbhelper.hxx> #include <unotools/pathoptions.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star::container; diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index d8b2ac09cb85..678ad35197f4 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> -#include <tools/wintypes.hxx> #include "commonpicker.hxx" #include "pickercallbacks.hxx" diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 6a49041ea918..398fbe3a3932 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -23,11 +23,7 @@ #include <vector> #include <tools/urlobj.hxx> -#include <com/sun/star/container/XContentEnumerationAccess.hpp> -#include <com/sun/star/container/XSet.hpp> -#include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <unotools/pathoptions.hxx> using namespace ::com::sun::star::container; diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 790dff6e9048..e4408df314db 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -23,8 +23,6 @@ #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include "commonpicker.hxx" diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 688f85aff6f7..97aa44706a6d 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -9,16 +9,26 @@ #include <config_oauth2.h> +#include "fpsmartcontent.hxx" +#include "QueryFolderName.hxx" #include "RemoteFilesDialog.hxx" #include <fpsofficeResMgr.hxx> +#include <fpicker/strings.hrc> #include <strings.hrc> #include <comphelper/docpasswordrequest.hxx> #include <comphelper/stillreadwriteinteraction.hxx> #include <com/sun/star/task/InteractionHandler.hpp> +#include <com/sun/star/task/PasswordContainer.hpp> +#include <svtools/PlaceEditDialog.hxx> +#include <tools/debug.hxx> #include <ucbhelper/commandenvironment.hxx> +#include <vcl/dialog.hxx> +#include <vcl/errinf.hxx> +#include <vcl/lstbox.hxx> #include <vcl/treelistentry.hxx> #include <bitmaps.hlst> #include <vcl/ptrstyle.hxx> +#include <officecfg/Office/Common.hxx> class FileViewContainer : public vcl::Window { diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index f78b2b51c820..ff0a3d6ce3e7 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -12,33 +12,26 @@ #include "autocmpledit.hxx" #include <svtools/place.hxx> -#include <svtools/PlaceEditDialog.hxx> - -#include <vcl/errinf.hxx> #include <unotools/viewoptions.hxx> #include <vcl/button.hxx> -#include <fpicker/strings.hrc> #include <vcl/menubtn.hxx> -#include <vcl/dialog.hxx> #include <vcl/vclptr.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> -#include <officecfg/Office/Common.hxx> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/task/PasswordContainer.hpp> #include <com/sun/star/task/XPasswordContainer2.hpp> #include <vector> +#include "asyncfilepicker.hxx" #include "fpdialogbase.hxx" #include "breadcrumb.hxx" #include "fileview.hxx" #include "foldertree.hxx" -#include "QueryFolderName.hxx" using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index ff287f56ba4c..6f4cb427b41e 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX #include <tools/link.hxx> -#include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.h> #include <salhelper/simplereferenceobject.hxx> diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 6168a74d2327..b52d4ed2f9ca 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -19,16 +19,18 @@ #include "commonpicker.hxx" +#include "fpdialogbase.hxx" +#include "OfficeControlAccess.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <sal/log.hxx> +#include <tools/debug.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/weakeventlistener.hxx> #include <comphelper/types.hxx> -#include "iodlg.hxx" namespace svt diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index e57ad8250262..1a379a22665f 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -24,8 +24,6 @@ #include <cppuhelper/basemutex.hxx> #include <com/sun/star/ui/dialogs/XControlInformation.hpp> #include <com/sun/star/ui/dialogs/XControlAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index bf957c5127fa..141159ee8719 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -22,7 +22,6 @@ #include <memory> #include <com/sun/star/uno/Sequence.h> #include <vcl/ctrl.hxx> -#include <vcl/weld.hxx> #include <rtl/ustring.hxx> namespace com :: sun :: star :: ucb { class XContent; } diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx index 575f4acd5aab..9db337f286a2 100644 --- a/fpicker/source/office/fpdialogbase.hxx +++ b/fpicker/source/office/fpdialogbase.hxx @@ -23,12 +23,7 @@ #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svl/inettype.hxx> -#include "asyncfilepicker.hxx" -#include "OfficeControlAccess.hxx" -#include "fpsmartcontent.hxx" - -#include <set> +#include "pickercallbacks.hxx" class SvTabListBox; class SvtFileView; diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 0f65ac68d1b8..55614f884f7c 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -28,7 +28,6 @@ #include <comphelper/processfactory.hxx> #include <ucbhelper/commandenvironment.hxx> -#include <tools/solar.h> #include <osl/diagnose.h> diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index ffa061ecb4ff..becb689a1078 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -23,7 +23,6 @@ #include "fpinteraction.hxx" #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <ucbhelper/content.hxx> #include <rtl/ref.hxx> #include <memory> diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 97d64381d154..de406c908780 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -19,23 +19,21 @@ #include <sal/config.h> -#include <sal/macros.h> #include <sal/log.hxx> #include "fileview.hxx" #include "iodlg.hxx" #include <svtools/PlaceEditDialog.hxx> +#include "OfficeControlAccess.hxx" #include "PlacesListBox.hxx" #include <fpsofficeResMgr.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> -#include <vcl/fixed.hxx> -#include <vcl/layout.hxx> +#include <vcl/errinf.hxx> +#include <vcl/event.hxx> #include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <unotools/ucbhelper.hxx> -#include <svtools/ehdl.hxx> -#include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <svtools/sfxecode.hxx> @@ -49,24 +47,17 @@ #include "asyncfilepicker.hxx" #include "iodlgimp.hxx" #include <svtools/inettbc.hxx> -#include <unotools/syslocale.hxx> #include "QueryFolderName.hxx" #include <rtl/ustring.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/util/URL.hpp> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/interaction.hxx> @@ -76,7 +67,6 @@ #include <osl/file.hxx> #include <vcl/dibtools.hxx> -#include <vcl/waitobj.hxx> #include <vcl/settings.hxx> #include <com/sun/star/task/InteractionHandler.hpp> @@ -87,8 +77,6 @@ #include <officecfg/Office/Common.hxx> #include <algorithm> -#include <functional> -#include <vector> #include <memory> using namespace ::com::sun::star::beans; diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 9a4af4c35541..e6adff2657c6 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -20,23 +20,20 @@ #define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX #include <memory> -#include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <vcl/split.hxx> +#include <vcl/treelistbox.hxx> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/ucb/IOErrorCode.hpp> -#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp> #include <unotools/confignode.hxx> -#include <svl/inettype.hxx> #include "asyncfilepicker.hxx" -#include "OfficeControlAccess.hxx" #include "fpsmartcontent.hxx" #include "fpdialogbase.hxx" #include <o3tl/typed_flags_set.hxx> diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 4876e8db76df..d6e841c14c40 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -19,20 +19,13 @@ #include "fileview.hxx" #include "iodlgimp.hxx" -#include <vcl/headbar.hxx> #include <tools/debug.hxx> -#include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> #include <vcl/menu.hxx> -#include <vcl/svapp.hxx> -#include <svl/eitem.hxx> -#include <unotools/viewoptions.hxx> #include <svtools/inettbc.hxx> #include "iodlg.hxx" #include <bitmaps.hlst> #include <svtools/imagemgr.hxx> -#include <unotools/localfilehelper.hxx> -#include <unotools/useroptions.hxx> #include <svl/svlresid.hxx> #include <svl/svl.hrc> |