[Libreoffice-commits] core.git: writerfilter/source

[Andrea Gelmini]

 writerfilter/source/dmapper/TagLogger.cxx              |    1 
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx  |   21 ++++++-----------
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |    1 
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |    1 
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx          |    1 
 writerfilter/source/rtftok/rtfsprm.cxx                 |    3 --
 writerfilter/source/rtftok/rtfsprm.hxx                 |    3 --
 7 files changed, 8 insertions(+), 23 deletions(-)

New commits:
commit 11262803d6da77267dd1b2482b8575aee68aba77
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Sun Sep 20 18:56:13 2015 +0200

    writefilter: removed superfluous #includes
    
    Change-Id: If9a563767cd1165c4a7363b513447cd975cb20c9
    Reviewed-on: https://gerrit.libreoffice.org/15850
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/writerfilter/source/dmapper/TagLogger.cxx
index f1e0810..58f6bf8 100644
--- a/writerfilter/source/dmapper/TagLogger.cxx
+++ b/writerfilter/source/dmapper/TagLogger.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <libxml/xmlstring.h>
 #include <string.h>
 #include "TagLogger.hxx"
 #include <ooxml/QNameToString.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 63c1313..ff888be 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -20,27 +20,22 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
 
-#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
-
 #include <string>
 #include <set>
-#include "sal/config.h"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/implbase.hxx"
-#include "com/sun/star/xml/sax/XFastContextHandler.hpp"
-#include "OOXMLParserState.hxx"
-#include "OOXMLPropertySet.hxx"
-#include "OOXMLDocumentImpl.hxx"
-#include <oox/token/tokens.hxx>
-#include <svtools/embedhlp.hxx>
-
+#include <cppuhelper/implbase.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
+#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
 #include <oox/mathml/import.hxx>
 #include <oox/mathml/importutils.hxx>
+#include <svtools/embedhlp.hxx>
+#include "OOXMLParserState.hxx"
+#include "OOXMLPropertySet.hxx"
 
 namespace writerfilter {
 namespace ooxml
 {
-
+class OOXMLDocumentImpl;
 
 class OOXMLFastContextHandler: public ::cppu::WeakImplHelper<css::xml::sax::XFastContextHandler>
 {
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 2d7ba7a..78bf891 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -20,7 +20,6 @@
 #include <iostream>
 #include "OOXMLFastDocumentHandler.hxx"
 #include "OOXMLFastContextHandler.hxx"
-#include "oox/token/tokens.hxx"
 #include "OOXMLFactory.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index d2c73fd..ff63cdd 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTDOCUMENTHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTDOCUMENTHANDLER_HXX
 
-#include <sal/config.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index bbebd87..8c9069a 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -24,7 +24,6 @@
 #include <ooxml/OOXMLDocument.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <com/sun/star/embed/XRelationshipAccess.hpp>
-#include <com/sun/star/io/XStream.hpp>
 
 extern OUString customTarget;
 extern OUString embeddingsTarget;
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 3af3000..5584a0e 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -8,9 +8,6 @@
  */
 
 #include <rtfsprm.hxx>
-
-#include <rtl/strbuf.hxx>
-
 #include <ooxml/resourceids.hxx>
 #include <ooxml/QNameToString.hxx>
 
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 05b39cb..e05ef78 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -10,14 +10,11 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSPRM_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSPRM_HXX
 
-#include <sal/config.h>
-
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <boost/intrusive_ptr.hpp>
-#include <rtfcontrolwords.hxx>
 #include <rtfvalue.hxx>
 
 namespace writerfilter