From b2bfa6266ce88e9507add78280d5f5d436277173 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Fri, 31 Jan 2020 21:08:53 +0100
Subject: tdf#42949 Fix IWYU warnings in uui/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ic48d61a5f5d24742682b4d39096e468f224639df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87783
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 uui/IwyuFilter_uui.yaml              | 13 +++++++++++++
 uui/inc/ids.hrc                      |  6 ++++++
 uui/qa/unit/uui-dialogs-test.cxx     |  3 ---
 uui/source/authfallbackdlg.cxx       |  2 --
 uui/source/fltdlg.cxx                |  3 ---
 uui/source/iahndl-authentication.cxx |  1 -
 uui/source/iahndl-errorhandler.cxx   |  2 --
 uui/source/iahndl-filter.cxx         |  3 +--
 uui/source/iahndl-locking.cxx        |  2 --
 uui/source/iahndl-ssl.cxx            |  1 -
 uui/source/iahndl.cxx                |  4 ----
 uui/source/iahndl.hxx                |  1 -
 uui/source/lockcorrupt.cxx           |  1 -
 uui/source/logindlg.cxx              |  6 ------
 uui/source/loginerr.hxx              |  2 +-
 uui/source/masterpasscrtdlg.cxx      |  1 -
 uui/source/masterpasscrtdlg.hxx      |  1 -
 uui/source/passwordcontainer.hxx     |  1 +
 uui/source/secmacrowarnings.cxx      |  6 +-----
 uui/source/secmacrowarnings.hxx      |  3 ++-
 uui/source/services.cxx              |  3 ---
 uui/source/sslwarndlg.cxx            |  3 ---
 uui/source/sslwarndlg.hxx            |  1 -
 uui/source/unknownauthdlg.cxx        |  3 ---
 uui/source/unknownauthdlg.hxx        |  1 -
 25 files changed, 25 insertions(+), 48 deletions(-)
 create mode 100644 uui/IwyuFilter_uui.yaml

(limited to 'uui')

diff --git a/uui/IwyuFilter_uui.yaml b/uui/IwyuFilter_uui.yaml
new file mode 100644
index 000000000000..09edc89394e5
--- /dev/null
+++ b/uui/IwyuFilter_uui.yaml
@@ -0,0 +1,13 @@
+---
+assumeFilename: uui/source/iahndl.cxx
+blacklist:
+    uui/inc/ids.hxx:
+    # Needed by macro defines
+    - vcl/errcode.hxx
+    uui/source/iahndl.cxx:
+    # Actually used
+    - com/sun/star/awt/XWindow.hpp
+    - com/sun/star/task/XInteractionRequest.hpp
+    uui/source/passwordcontainer.cxx:
+    # Actually used
+    - com/sun/star/lang/XMultiServiceFactory.hpp
diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 061c2a77bd80..744542bf7697 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -20,6 +20,12 @@
 #ifndef INCLUDED_UUI_INC_IDS_HRC
 #define INCLUDED_UUI_INC_IDS_HRC
 
+#include <vcl/errcode.hxx>
+
+#include <utility>
+
+#include "ids.hxx"
+
 #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const std::pair<const char*, ErrCode> RID_UUI_ERRHDL[] =
diff --git a/uui/qa/unit/uui-dialogs-test.cxx b/uui/qa/unit/uui-dialogs-test.cxx
index 16e57ba99ae1..3ad47fd79f1c 100644
--- a/uui/qa/unit/uui-dialogs-test.cxx
+++ b/uui/qa/unit/uui-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/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index c147a7f1b9a7..3fa4fc1655a9 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -9,8 +9,6 @@
 
 #include "authfallbackdlg.hxx"
 
-#include <iostream>
-
 AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& instructions,
                                  const OUString& url)
     : GenericDialogController(pParent, "uui/ui/authfallback.ui", "AuthFallbackDlg")
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 989a915301b3..49c2f82cb618 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -19,14 +19,11 @@
 
 #include "fltdlg.hxx"
 
-#include <ids.hxx>
-
 #include <com/sun/star/util/XStringWidth.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <tools/urlobj.hxx>
 
 #include <osl/file.hxx>
-#include <vcl/svapp.hxx>
 
 namespace uui
 {
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index ec888dca9e4a..0a4cca10a817 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -33,7 +33,6 @@
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
 #include <unotools/resmgr.hxx>
-#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/abstdlg.hxx>
 #include <vcl/svapp.hxx>
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 1faa1f59990b..6abe1c30cfc4 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -28,11 +28,9 @@
 #include <com/sun/star/task/XInteractionRetry.hpp>
 
 #include <svx/svxerr.hxx>
-#include <svx/dialogs.hrc>
 #include <unotools/resmgr.hxx>
 #include <osl/diagnose.h>
 
-#include <ids.hxx>
 #include <ids.hrc>
 #include "getcontinuations.hxx"
 
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 25a13a84e275..706c568aa40a 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -19,13 +19,12 @@
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/document/NoSuchFilterRequest.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XInteractionFilterOptions.hpp>
 #include <com/sun/star/document/XInteractionFilterSelect.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 8df6c85b0608..f4297754d6b5 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
-
 #include <com/sun/star/document/ChangedByOthersRequest.hpp>
 #include <com/sun/star/document/LockedDocumentRequest.hpp>
 #include <com/sun/star/document/LockedOnSavingRequest.hpp>
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 8046bd5a40cb..da5d69e381c1 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -36,7 +36,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <ids.hxx>
 #include <ids.hrc>
 #include "getcontinuations.hxx"
 #include "sslwarndlg.hxx"
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 87b4825043cb..f3c7c3b94088 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 
 #include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/configuration/backend/MergeRecoveryRequest.hpp>
 #include <com/sun/star/configuration/backend/StratumCreationException.hpp>
@@ -40,7 +39,6 @@
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/task/XInteractionHandler2.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/task/XInteractionRetry.hpp>
 #include <com/sun/star/ucb/AuthenticationFallbackRequest.hpp>
 #include <com/sun/star/ucb/InteractiveAppException.hpp>
 #include <com/sun/star/ucb/InteractiveLockingLockedException.hpp>
@@ -60,14 +58,12 @@
 #include <com/sun/star/xforms/InvalidDataOnSubmitException.hpp>
 #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
 
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/conditn.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <osl/thread.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index db39affb659a..95f9d4ea06ce 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/task/InteractionClassification.hpp>
 
 #include <vcl/errcode.hxx>
-#include <tools/wintypes.hxx>
 
 #include <unordered_map>
 #include <vector>
diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index e0d5a24c1094..28e8e71f00c4 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ids.hxx>
 #include <strings.hrc>
 #include "lockcorrupt.hxx"
 #include <unotools/resmgr.hxx>
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index bf9c39bf5436..5264c26f8366 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -20,17 +20,11 @@
 #include <comphelper/string.hxx>
 #include "logindlg.hxx"
 
-#include <strings.hrc>
-#include <osl/file.hxx>
-
 #ifdef UNX
 #include <limits.h>
 #define _MAX_PATH PATH_MAX
 #endif
 
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-
 using namespace com::sun::star;
 
 LoginDialog::~LoginDialog()
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index 76973684c855..f0dd879e455b 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_UUI_SOURCE_LOGINERR_HXX
 
 #include <rtl/ustring.hxx>
-
+#include <vcl/errinf.hxx>
 
 #define LOGINERROR_FLAG_MODIFY_ACCOUNT         1
 #define LOGINERROR_FLAG_MODIFY_USER_NAME       2
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 8505e2cf7bfd..4801bec28f85 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/macros.h>
 #include <unotools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 5969d5f27e1a..c19ecb23e194 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
 #define INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
 
-#include <com/sun/star/task/PasswordRequestMode.hpp>
 #include <vcl/weld.hxx>
 
 class MasterPasswordCreateDialog : public weld::GenericDialogController
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index d4bdf32f9d9d..2e2545fa6098 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/task/XInteractionHandler2.hpp>
 #include <com/sun/star/task/XPasswordContainer2.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace com {
     namespace sun {
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 0bc2e1d04d72..0288d5d1ec15 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -18,15 +18,11 @@
  */
 
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
-#include <comphelper/documentconstants.hxx>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
-#include <sal/macros.h>
 #include <tools/debug.hxx>
-#include <unotools/resmgr.hxx>
-#include <com/sun/star/security/NoPasswordException.hpp>
+#include <unotools/securityoptions.hxx>
 
 using namespace ::com::sun::star::security;
 
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index b5e3c9a450b9..590ef0768069 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_UUI_SOURCE_SECMACROWARNINGS_HXX
 #define INCLUDED_UUI_SOURCE_SECMACROWARNINGS_HXX
 
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <unotools/securityoptions.hxx>
 #include <vcl/weld.hxx>
 
 namespace com {
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index a3ba8ad6e849..7709e41760a7 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -17,12 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <cppu/macros.hxx>
 #include <cppuhelper/factory.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <uno/environment.h>
 
 #include "passwordcontainer.hxx"
 
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index a6c1e1a39b38..be57ea1b2c57 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
-
-#include <ids.hxx>
 #include "sslwarndlg.hxx"
 
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 598ed08ae035..bd02b00412fa 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -21,7 +21,6 @@
 
 #include <vcl/weld.hxx>
 #include <com/sun/star/security/XCertificate.hpp>
-#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index f6e4eb3f7b4d..ca84be3717f9 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
-
-#include <strings.hrc>
 #include "unknownauthdlg.hxx"
 
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 45ac942daed4..43e5b062e312 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -21,7 +21,6 @@
 
 #include <vcl/weld.hxx>
 #include <com/sun/star/security/XCertificate.hpp>
-#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 
-- 
cgit