[Libreoffice-commits] core.git: bin/find-unneeded-includes embeddedobj/source writerperfect/source xmlsecurity/source

[Miklos Vajna (via logerrit)]

 bin/find-unneeded-includes                            |    6 +++++-
 embeddedobj/source/commonembedding/xfactory.cxx       |    2 --
 embeddedobj/source/general/xcreator.cxx               |    1 -
 embeddedobj/source/msole/oleembed.cxx                 |    1 -
 embeddedobj/source/msole/ownview.cxx                  |    1 -
 writerperfect/source/impress/KeynoteImportFilter.cxx  |    1 -
 xmlsecurity/source/helper/documentsignaturehelper.cxx |    1 -
 7 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 47579fc2405e3253c9d2664522b5f6861d7c0aa0
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Sep 1 20:58:43 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Sep 2 09:08:11 2020 +0200

    Remove some unused includes
    
    Change-Id: I90d4e3db3eefa41f8492cfe23c5088ea93134afc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101890
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 5d3dcb6367da..90c4d89d8800 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -108,6 +108,8 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules):
         return True
     if include == "librevenge/librevenge.h" and "librevenge/RVNGPropertyList.h" in toAdd:
         return True
+    if include == "libetonyek/libetonyek.h" and "libetonyek/EtonyekDocument.h" in toAdd:
+        return True
 
     noRemove = (
         # <https://www.openoffice.org/tools/CodingGuidelines.sxw> insists on not
@@ -262,7 +264,9 @@ def tidy(compileCommands, paths):
             compileFile = pathAbs
             matches = [i for i in compileCommands if i["file"] == compileFile]
             if not len(matches):
-                if "assumeFilename" in moduleRules.keys():
+                # Only use assume-filename for headers, so we don't try to analyze e.g. Windows-only
+                # code on Linux.
+                if "assumeFilename" in moduleRules.keys() and not path.endswith("cxx"):
                     assume = moduleRules["assumeFilename"]
                 if assume:
                     assumeAbs = os.path.abspath(assume)
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index d383567f3e47..a4ef74d08ee4 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -19,12 +19,10 @@
 
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/EntryInitModes.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/IOException.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/documentconstants.hxx>
 
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index a186ad20a06f..9e9bb0934603 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 40924b413072..70d2b5d0a7d9 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -44,7 +44,6 @@
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 8abb7f9d2acf..9cb811b7c672 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/io/TempFile.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index c212c5ab85d0..900555be6e0b 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -21,7 +21,6 @@
 #include <unotools/ucbhelper.hxx>
 
 #include <DirectoryStream.hxx>
-#include <DocumentHandler.hxx>
 #include <WPXSvInputStream.hxx>
 
 #include "KeynoteImportFilter.hxx"
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 482ae6cc4126..784a5571d2a9 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -23,7 +23,6 @@
 #include <algorithm>
 #include <functional>
 
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>