[Libreoffice-commits] core.git: desktop/source sw/qa sw/source writerfilter/source writerperfect/source

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 7 07:11:18 UTC 2019 

 desktop/source/lib/lokclipboard.cxx                   |    1 +
 desktop/source/lib/lokclipboard.hxx                   |    2 --
 sw/qa/extras/layout/layout.cxx                        |    1 -
 sw/source/filter/ww8/docxsdrexport.cxx                |    3 ---
 writerfilter/source/dmapper/SdtHelper.cxx             |    6 ------
 writerfilter/source/dmapper/TableManager.cxx          |    5 ++++-
 writerfilter/source/dmapper/TableManager.hxx          |    2 +-
 writerfilter/source/dmapper/TablePositionHandler.hxx  |    1 -
 writerfilter/source/rtftok/rtfcontrolwords.cxx        |    1 -
 writerfilter/source/rtftok/rtflookahead.hxx           |    1 -
 writerperfect/source/writer/EPUBExportUIComponent.cxx |    1 -
 writerperfect/source/writer/EPUBExportUIComponent.hxx |    5 +----
 12 files changed, 7 insertions(+), 22 deletions(-)

New commits:
commit 1c5465ef1158ebf0f3f64e3343c2ed610024e5a8
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Aug 6 20:09:01 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Aug 7 09:10:43 2019 +0200

    Remove some unused includes
    
    See tdf#42949 for motivation.
    
    Change-Id: I76f3cbf866d20a3e70d06148fb42ca25998de34b
    Reviewed-on: https://gerrit.libreoffice.org/77063
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index 46c63bc02951..d0bd9a57e684 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -8,6 +8,7 @@
  */
 
 #include "lokclipboard.hxx"
+#include <unordered_map>
 #include <vcl/lazydelete.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx
index fd305c9b9507..35a72ae40a4a 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -11,12 +11,10 @@
 #define INCLUDED_DESKTOP_SOURCE_LIB_LOKCLIPBOARD_HXX
 
 #include <vector>
-#include <unordered_map>
 
 #include <rtl/ref.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/sequence.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp>
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 1de7bba9d926..2a43db31486c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -12,7 +12,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <com/sun/star/frame/DispatchHelper.hpp>
-#include <officecfg/Office/Common.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 305c570af64d..9a57f65a5fd7 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -10,7 +10,6 @@
 #include "docxsdrexport.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <editeng/charrotateitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/shaditem.hxx>
@@ -23,8 +22,6 @@
 #include <fmtsrnd.hxx>
 #include <fmtcntnt.hxx>
 #include <fmtornt.hxx>
-#include <ndtxt.hxx>
-#include <txatbase.hxx>
 #include <fmtfsize.hxx>
 #include <frmatr.hxx>
 #include "docxattributeoutput.hxx"
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 6111d1c495a8..05de4b0b6788 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -10,16 +10,10 @@
 #include "SdtHelper.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <sal/log.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <editeng/unoprnms.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
-#include <unotools/datetime.hxx>
 #include <comphelper/sequence.hxx>
 #include <xmloff/odffields.hxx>
 
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index f0194ca499ce..c41cee1d6871 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -22,7 +22,6 @@
 #include "DomainMapper_Impl.hxx"
 #include "util.hxx"
 
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace writerfilter
@@ -463,6 +462,10 @@ TableManager::TableManager()
     m_bCellLastParaAfterAutospacing = false;
 }
 
+TableManager::~TableManager()
+{
+}
+
 }
 
 }
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 15d9da8c3bc1..09a93efc44a1 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -25,7 +25,6 @@
 
 #include "PropertyMap.hxx"
 #include "TableData.hxx"
-#include "DomainMapperTableHandler.hxx"
 
 namespace writerfilter
 {
@@ -355,6 +354,7 @@ protected:
 
 public:
     TableManager();
+    ~TableManager();
 
     /**
        Set handler for resolveCurrentTable.
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index 345a4a01fe73..86e1666cc187 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -10,7 +10,6 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEPOSITIONHANDLER_HXX
 
 #include "LoggedResources.hxx"
-#include <memory>
 
 namespace com
 {
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 8fa04faa0d3a..7f3f7f9573d2 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -9,7 +9,6 @@
 
 #include "rtfcontrolwords.hxx"
 #include <oox/token/namespaces.hxx>
-#include <cstring>
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index 0a40d554c5e8..5d9bbab16173 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
 
-#include <memory>
 #include <sal/types.h>
 #include <tools/ref.hxx>
 #include "rtflistener.hxx"
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.cxx b/writerperfect/source/writer/EPUBExportUIComponent.cxx
index e9c2d5fba93d..e8d618b99cf6 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.cxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.cxx
@@ -9,7 +9,6 @@
 
 #include "EPUBExportUIComponent.hxx"
 
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <comphelper/namedvaluecollection.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.hxx b/writerperfect/source/writer/EPUBExportUIComponent.hxx
index 4576dad6a88c..8b5852fcc69b 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.hxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.hxx
@@ -15,6 +15,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -25,10 +26,6 @@ namespace sun
 {
 namespace star
 {
-namespace awt
-{
-class XWindow;
-}
 namespace uno
 {
 class XComponentContext;

More information about the Libreoffice-commits mailing list