[Libreoffice-commits] core.git: include/oox oox/source sc/source sw/source
Jorenz Paragas
j.paragas.237 at gmail.com
Mon Apr 25 08:51:58 UTC 2016
include/oox/core/binarycodec.hxx | 11 ++--
include/oox/core/contexthandler.hxx | 17 ++++--
include/oox/core/contexthandler2.hxx | 20 +++++++
include/oox/core/fastparser.hxx | 18 ++++++-
include/oox/core/fasttokenhandler.hxx | 9 +++
include/oox/core/filterbase.hxx | 28 ++++++-----
include/oox/core/filterdetect.hxx | 13 +++++
include/oox/core/fragmenthandler.hxx | 14 +++++
include/oox/core/fragmenthandler2.hxx | 22 ++++++++
include/oox/core/recordparser.hxx | 13 +++--
include/oox/core/relations.hxx | 6 +-
include/oox/core/relationshandler.hxx | 13 +++++
include/oox/core/xmlfilterbase.hxx | 28 +++++++----
include/oox/vml/vmlshapecontext.hxx | 1
include/oox/vml/vmltextboxcontext.hxx | 1
oox/source/core/contexthandler2.cxx | 2
oox/source/core/filterbase.cxx | 1
oox/source/core/fragmenthandler2.cxx | 1
oox/source/core/xmlfilterbase.cxx | 2
oox/source/drawingml/ThemeOverrideFragmentHandler.cxx | 2
oox/source/drawingml/chart/axiscontext.cxx | 1
oox/source/drawingml/chart/axisconverter.cxx | 2
oox/source/drawingml/chart/chartcontextbase.cxx | 3 +
oox/source/drawingml/chart/chartdrawingfragment.cxx | 3 +
oox/source/drawingml/chart/chartspaceconverter.cxx | 2
oox/source/drawingml/chart/chartspacefragment.cxx | 2
oox/source/drawingml/chart/converterbase.cxx | 1
oox/source/drawingml/chart/datasourcecontext.cxx | 3 +
oox/source/drawingml/chart/plotareacontext.cxx | 3 +
oox/source/drawingml/chart/plotareaconverter.cxx | 2
oox/source/drawingml/chart/seriescontext.cxx | 3 +
oox/source/drawingml/chart/seriesconverter.cxx | 3 +
oox/source/drawingml/chart/titlecontext.cxx | 3 +
oox/source/drawingml/chart/titleconverter.cxx | 1
oox/source/drawingml/chart/typegroupcontext.cxx | 2
oox/source/drawingml/chart/typegroupconverter.cxx | 2
oox/source/drawingml/clrschemecontext.cxx | 3 +
oox/source/drawingml/connectorshapecontext.cxx | 2
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 2
oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 2
oox/source/drawingml/fillproperties.cxx | 3 -
oox/source/drawingml/objectdefaultcontext.cxx | 2
oox/source/drawingml/shapepropertiescontext.cxx | 3 +
oox/source/drawingml/spdefcontext.cxx | 2
oox/source/drawingml/table/tablecell.cxx | 2
oox/source/drawingml/table/tablepartstylecontext.cxx | 2
oox/source/drawingml/table/tableproperties.cxx | 1
oox/source/drawingml/table/tablerowcontext.cxx | 3 +
oox/source/drawingml/table/tablestylecontext.cxx | 3 +
oox/source/drawingml/table/tablestylelistfragmenthandler.cxx | 3 +
oox/source/drawingml/textbodycontext.cxx | 2
oox/source/drawingml/texteffectscontext.cxx | 3 +
oox/source/drawingml/textfieldcontext.cxx | 3 +
oox/source/drawingml/textparagraphproperties.cxx | 1
oox/source/drawingml/textspacingcontext.cxx | 3 +
oox/source/drawingml/texttabstoplistcontext.cxx | 3 +
oox/source/drawingml/themefragmenthandler.cxx | 2
oox/source/mathml/import.cxx | 2
oox/source/ole/axcontrolfragment.cxx | 3 +
oox/source/ppt/animationspersist.cxx | 3 +
oox/source/ppt/backgroundproperties.cxx | 2
oox/source/ppt/commonbehaviorcontext.cxx | 3 +
oox/source/ppt/customshowlistcontext.cxx | 4 +
oox/source/ppt/extdrawingfragmenthandler.cxx | 3 +
oox/source/ppt/layoutfragmenthandler.cxx | 3 +
oox/source/ppt/pptgraphicshapecontext.cxx | 3 -
oox/source/ppt/pptimport.cxx | 1
oox/source/ppt/pptshape.cxx | 1
oox/source/ppt/pptshapepropertiescontext.cxx | 2
oox/source/ppt/presentationfragmenthandler.cxx | 4 +
oox/source/ppt/slidefragmenthandler.cxx | 3 +
oox/source/ppt/slidemastertextstylescontext.cxx | 2
oox/source/ppt/slidepersist.cxx | 1
oox/source/ppt/timeanimvaluecontext.cxx | 4 +
oox/source/ppt/timenode.cxx | 1
oox/source/shape/LockedCanvasContext.cxx | 2
oox/source/shape/ShapeContextHandler.cxx | 2
oox/source/shape/ShapeDrawingFragmentHandler.cxx | 3 +
oox/source/shape/WpgContext.cxx | 2
oox/source/shape/WpsContext.cxx | 6 ++
oox/source/vml/vmldrawingfragment.cxx | 2
oox/source/vml/vmlshape.cxx | 1
oox/source/vml/vmlshapecontext.cxx | 4 +
sc/source/filter/oox/autofiltercontext.cxx | 2
sc/source/filter/oox/biffcodec.cxx | 1
sc/source/filter/oox/commentsfragment.cxx | 2
sc/source/filter/oox/condformatcontext.cxx | 2
sc/source/filter/oox/extlstcontext.cxx | 3 +
sc/source/filter/oox/pivottablefragment.cxx | 2
sc/source/filter/oox/querytablefragment.cxx | 2
sc/source/filter/oox/revisionfragment.cxx | 3 +
sc/source/filter/oox/richstringcontext.cxx | 2
sc/source/filter/oox/scenariocontext.cxx | 2
sc/source/filter/oox/sharedstringsfragment.cxx | 2
sc/source/filter/oox/tablecolumnscontext.cxx | 2
sc/source/filter/oox/tablefragment.cxx | 2
sc/source/filter/oox/worksheethelper.cxx | 1
sw/source/filter/ww8/docxsdrexport.cxx | 1
98 files changed, 361 insertions(+), 43 deletions(-)
New commits:
commit 474eca1f9b42749665bbf69f6dc62c66ea4ad7fd
Author: Jorenz Paragas <j.paragas.237 at gmail.com>
Date: Sun Apr 24 15:05:12 2016 -0700
tdf#42949: clean up includes in include/oox/core using iwyu
This allows the headers in that folder to stand on their own and
not depend on any transitively included headers. All changes to
other files are needed to fix compiler errors related to missing
includes that occurred afterwards.
Change-Id: I2083b30763f0b2c1aacdff00226e5f567ae52db4
Reviewed-on: https://gerrit.libreoffice.org/24355
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 0bf2cd7..56cea81 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -20,12 +20,15 @@
#ifndef INCLUDED_OOX_CORE_BINARYCODEC_HXX
#define INCLUDED_OOX_CORE_BINARYCODEC_HXX
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-
+#include <com/sun/star/uno/Sequence.h>
+#include <oox/dllapi.h>
#include <rtl/cipher.h>
#include <rtl/digest.h>
-#include <oox/dllapi.h>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace beans { struct NamedValue; }
+} } }
namespace oox { class AttributeList; }
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 50b935d..38f723e 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -20,15 +20,23 @@
#ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
#define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
+#include <exception>
+#include <memory>
+
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <cppuhelper/implbase.hxx>
-#include <rtl/ref.hxx>
-#include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
#include <oox/dllapi.h>
-#include <memory>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
+ namespace xml { namespace sax { class XFastAttributeList; } }
namespace xml { namespace sax { class XLocator; } }
} } }
@@ -38,7 +46,6 @@ namespace oox {
namespace core {
class XmlFilterBase;
-class FragmentHandler;
struct Relation;
class Relations;
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 20ab9ff..cca43cb 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -20,12 +20,28 @@
#ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
#define INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
+#include <cstddef>
+#include <exception>
#include <memory>
#include <vector>
-#include <oox/helper/attributelist.hxx>
-#include <oox/helper/binaryinputstream.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
#include <oox/core/contexthandler.hxx>
#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace xml { namespace sax { class XFastAttributeList; } }
+ namespace xml { namespace sax { class XFastContextHandler; } }
+} } }
+
+namespace oox {
+ class AttributeList;
+ class SequenceInputStream;
+}
namespace oox {
namespace core {
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index d8d2ced..f8fdad7 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -20,8 +20,22 @@
#ifndef INCLUDED_OOX_CORE_FASTPARSER_HXX
#define INCLUDED_OOX_CORE_FASTPARSER_HXX
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/sax/XFastParser.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace io { class XInputStream; }
+ namespace uno { class XComponentContext; }
+ namespace xml { namespace sax { class XFastDocumentHandler; } }
+ namespace xml { namespace sax { class XFastParser; } }
+ namespace xml { namespace sax { class XFastTokenHandler; } }
+ namespace xml { namespace sax { struct InputSource; } }
+} } }
namespace oox {
struct NamespaceMap;
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 339d3ca..02e2be7 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -20,10 +20,17 @@
#ifndef INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
#define INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
-#include <oox/dllapi.h>
+#include <exception>
+
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <cppuhelper/implbase.hxx>
+#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
#include <sax/fastattribs.hxx>
namespace oox { class TokenMap; }
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index bed5366..02f10a1 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -20,40 +20,44 @@
#ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
#define INCLUDED_OOX_CORE_FILTERBASE_HXX
-#include <com/sun/star/beans/NamedValue.hpp>
+#include <exception>
+#include <memory>
+
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/sequenceashashmap.hxx>
+#include <oox/dllapi.h>
#include <oox/helper/binarystreambase.hxx>
#include <oox/helper/storagebase.hxx>
-#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
- namespace awt { struct DeviceInfo; }
+ namespace beans { struct PropertyValue; }
+ namespace drawing { class XShape; }
namespace frame { class XFrame; }
namespace frame { class XModel; }
- namespace drawing { class XShape; }
- namespace graphic { class XGraphic; }
namespace io { class XInputStream; }
namespace io { class XOutputStream; }
namespace io { class XStream; }
- namespace lang { class XMultiComponentFactory; }
+ namespace lang { class XComponent; }
namespace lang { class XMultiServiceFactory; }
- namespace task { class XInteractionHandler; }
namespace task { class XStatusIndicator; }
namespace uno { class XComponentContext; }
} } }
namespace comphelper {
- class IDocPasswordVerifier;
+ class SequenceAsHashMap;
}
namespace utl {
class MediaDescriptor;
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index 7c5552f..6a1902d 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -20,16 +20,29 @@
#ifndef INCLUDED_OOX_CORE_FILTERDETECT_HXX
#define INCLUDED_OOX_CORE_FILTERDETECT_HXX
+#include <exception>
#include <vector>
+
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <cppuhelper/implbase.hxx>
#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
+ namespace beans { struct PropertyValue; }
namespace io { class XInputStream; }
namespace uno { class XComponentContext; }
+ namespace xml { namespace sax { class XFastAttributeList; } }
+ namespace xml { namespace sax { class XFastContextHandler; } }
+ namespace xml { namespace sax { class XLocator; } }
} } }
namespace utl { class MediaDescriptor; }
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 952d301..7afdb79 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -20,19 +20,33 @@
#ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
#define INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
+#include <exception>
+
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <cppuhelper/implbase.hxx>
#include <oox/core/contexthandler.hxx>
#include <oox/core/relations.hxx>
#include <oox/dllapi.h>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace io { class XInputStream; }
+ namespace xml { namespace sax { class XFastAttributeList; } }
+ namespace xml { namespace sax { class XFastContextHandler; } }
+ namespace xml { namespace sax { class XLocator; } }
} } }
namespace oox {
namespace core {
+class XmlFilterBase;
/** Base data of a fragment.
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index 8ec3c00..7e52948 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -20,14 +20,34 @@
#ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
#define INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
+#include <exception>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
+#include <oox/core/contexthandler.hxx>
#include <oox/core/contexthandler2.hxx>
#include <oox/core/fragmenthandler.hxx>
-#include <vector>
#include <oox/dllapi.h>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace xml { namespace sax { class XFastAttributeList; } }
+ namespace xml { namespace sax { class XFastContextHandler; } }
+} } }
+
+namespace oox {
+ class AttributeList;
+ class SequenceInputStream;
+}
namespace oox {
namespace core {
+class XmlFilterBase;
class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper
{
diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index a9909a0..0f53c42 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -21,17 +21,24 @@
#define INCLUDED_OOX_CORE_RECORDPARSER_HXX
#include <map>
+#include <memory>
+
#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <rtl/ref.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/core/fragmenthandler.hxx>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace oox {
namespace core {
-namespace prv { class Locator; }
-namespace prv { class ContextStack; }
+namespace prv {
+ class ContextStack;
+ class Locator;
+}
struct RecordInputSource
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index 7663cb5..d3303bd 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -20,11 +20,13 @@
#ifndef INCLUDED_OOX_CORE_RELATIONS_HXX
#define INCLUDED_OOX_CORE_RELATIONS_HXX
-#include <oox/helper/helper.hxx>
-#include <oox/dllapi.h>
+#include <cstddef>
#include <map>
#include <memory>
+#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+
namespace oox {
namespace core {
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index 8d1237a..325de5a 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -20,11 +20,24 @@
#ifndef INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
#define INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
+#include <exception>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
#include <oox/core/fragmenthandler.hxx>
+#include <oox/core/relations.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace xml { namespace sax { class XFastAttributeList; } }
+ namespace xml { namespace sax { class XFastContextHandler; } }
+} } }
namespace oox {
namespace core {
+class XmlFilterBase;
class RelationsFragment : public FragmentHandler
{
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 8418439..5d0aae9 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -20,22 +20,28 @@
#ifndef INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
#define INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <rtl/ref.hxx>
-#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
+#include <memory>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
#include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx>
#include <oox/dllapi.h>
+#include <oox/helper/storagebase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
- namespace container { class XNameContainer; }
namespace document { class XDocumentProperties; }
+ namespace io { class XInputStream; }
+ namespace io { class XOutputStream; }
+ namespace io { class XStream; }
+ namespace text { class XText; }
+ namespace text { class XTextCursor; }
+ namespace text { class XTextField; }
+ namespace uno { class XComponentContext; }
namespace xml { namespace dom { class XDocument; } }
- namespace xml { namespace sax { class XLocator; } }
- namespace xml { namespace sax { class XFastDocumentHandler; } }
namespace xml { namespace sax { class XFastSAXSerializable; } }
} } }
@@ -49,12 +55,16 @@ namespace oox {
namespace vml { class Drawing; }
}
+namespace rtl { template <class reference_type> class Reference; }
+
namespace sax_fastparser {
class FastSerializerHelper;
typedef std::shared_ptr< FastSerializerHelper > FSHelperPtr;
}
+namespace utl { class MediaDescriptor; }
+
namespace oox {
namespace core {
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 4636b0f..3c6e3df 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
+#include <oox/helper/helper.hxx>
namespace oox {
namespace vml {
diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index 7d90e43..e0806e6 100644
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
+#include <oox/helper/attributelist.hxx>
#include <oox/vml/vmltextbox.hxx>
namespace oox {
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index b238a4a..75f6a10 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -18,6 +18,8 @@
*/
#include "oox/core/contexthandler2.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/tokens.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index b7b197c..d3323e5 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx
index f904069..590a44e 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -19,6 +19,7 @@
#include "oox/core/fragmenthandler2.hxx"
#include "oox/core/xmlfilterbase.hxx"
+#include <oox/helper/attributelist.hxx>
namespace oox {
namespace core {
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 3ff9eed..40bd20a 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -44,7 +44,9 @@
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/helper/zipstorage.hxx"
+#include <oox/token/namespaces.hxx>
#include "oox/token/properties.hxx"
+#include <oox/token/tokens.hxx>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
#include <com/sun/star/xml/dom/XDocument.hpp>
diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
index ba106e1..918a7fd 100644
--- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
+++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
@@ -9,6 +9,8 @@
#include <drawingml/ThemeOverrideFragmentHandler.hxx>
#include "oox/drawingml/theme.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "drawingml/themeelementscontext.hxx"
using namespace ::oox::core;
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index f9a3279..7cb89b1 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -23,6 +23,7 @@
#include "drawingml/textbodycontext.hxx"
#include "drawingml/chart/axismodel.hxx"
#include "drawingml/chart/titlecontext.hxx"
+#include <oox/helper/attributelist.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 4dabec2..8f8cd9b 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -36,6 +36,8 @@
#include "drawingml/chart/titleconverter.hxx"
#include "drawingml/chart/typegroupconverter.hxx"
#include "oox/drawingml/lineproperties.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "comphelper/processfactory.hxx"
#include <osl/diagnose.h>
diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx
index 676a9c4..5481db5 100644
--- a/oox/source/drawingml/chart/chartcontextbase.cxx
+++ b/oox/source/drawingml/chart/chartcontextbase.cxx
@@ -20,6 +20,9 @@
#include "drawingml/chart/chartcontextbase.hxx"
#include "oox/drawingml/chart/modelbase.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "drawingml/shapepropertiescontext.hxx"
namespace oox {
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 4e86209..693432f 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -26,6 +26,9 @@
#include "oox/drawingml/graphicshapecontext.hxx"
#include "oox/drawingml/shapecontext.hxx"
#include "oox/drawingml/shapegroupcontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index b912069..b4c43f2 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -27,6 +27,8 @@
#include <com/sun/star/drawing/FillStyle.hpp>
#include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/chart/chartconverter.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <oox/helper/graphichelper.hxx>
#include "drawingml/chart/chartdrawingfragment.hxx"
#include "drawingml/chart/chartspacemodel.hxx"
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 5daef00..3fe2310 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -24,6 +24,8 @@
#include "drawingml/chart/chartspacemodel.hxx"
#include "drawingml/chart/plotareacontext.hxx"
#include "drawingml/chart/titlecontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 8bc82e0..c7f9cdd 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -35,6 +35,7 @@
#include "basegfx/numeric/ftools.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/theme.hxx"
+#include <oox/token/tokens.hxx>
#include <comphelper/processfactory.hxx>
namespace oox {
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index 83893cb..f5854df 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -23,6 +23,9 @@
#include <comphelper/processfactory.hxx>
#include <oox/core/xmlfilterbase.hxx>
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <svl/zforlist.hxx>
#include <osl/diagnose.h>
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index f821755d..05c8430 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -25,6 +25,9 @@
#include "drawingml/chart/seriescontext.hxx"
#include "drawingml/chart/titlecontext.hxx"
#include "drawingml/chart/typegroupcontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index ea16e1b..5c449ad 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -31,6 +31,8 @@
#include "drawingml/chart/axisconverter.hxx"
#include "drawingml/chart/plotareamodel.hxx"
#include "drawingml/chart/typegroupconverter.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index c0016ba..5e309a5 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -24,6 +24,9 @@
#include "drawingml/chart/datasourcecontext.hxx"
#include "drawingml/chart/seriesmodel.hxx"
#include "drawingml/chart/titlecontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index db5de73..a36e68d 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -35,6 +35,9 @@
#include "drawingml/chart/typegroupconverter.hxx"
#include "drawingml/chart/typegroupmodel.hxx"
#include "oox/helper/containerhelper.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <oox/drawingml/lineproperties.hxx>
namespace oox {
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index 06ae7cc..e4f22a9 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -23,6 +23,9 @@
#include "drawingml/textbodycontext.hxx"
#include "drawingml/chart/datasourcecontext.hxx"
#include "drawingml/chart/titlemodel.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "rtl/ustrbuf.hxx"
#include <osl/diagnose.h>
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index f93183a..0e3c44d 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -32,6 +32,7 @@
#include "drawingml/chart/datasourceconverter.hxx"
#include "drawingml/chart/titlemodel.hxx"
#include "oox/helper/containerhelper.hxx"
+#include <oox/token/tokens.hxx>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/drawing/Alignment.hpp>
diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx
index 56d76c8..77f5c85 100644
--- a/oox/source/drawingml/chart/typegroupcontext.cxx
+++ b/oox/source/drawingml/chart/typegroupcontext.cxx
@@ -21,6 +21,8 @@
#include "drawingml/chart/seriescontext.hxx"
#include "drawingml/chart/typegroupmodel.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index ee1c0c4..78079e9 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -38,6 +38,8 @@
#include "drawingml/chart/seriesconverter.hxx"
#include "drawingml/chart/typegroupmodel.hxx"
#include "oox/helper/containerhelper.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace drawingml {
diff --git a/oox/source/drawingml/clrschemecontext.cxx b/oox/source/drawingml/clrschemecontext.cxx
index 9037232..a8b91e7 100644
--- a/oox/source/drawingml/clrschemecontext.cxx
+++ b/oox/source/drawingml/clrschemecontext.cxx
@@ -19,6 +19,9 @@
#include "drawingml/clrschemecontext.hxx"
#include "oox/core/xmlfilterbase.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx
index 03f346c..b03e6a5 100644
--- a/oox/source/drawingml/connectorshapecontext.cxx
+++ b/oox/source/drawingml/connectorshapecontext.cxx
@@ -25,6 +25,8 @@
#include "oox/drawingml/graphicshapecontext.hxx"
#include "oox/drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/tokens.hxx>
#include "drawingml/customshapegeometry.hxx"
#include "drawingml/textbodycontext.hxx"
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 92f6e4e..d17708c 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -20,6 +20,8 @@
#include "diagramdefinitioncontext.hxx"
#include "layoutnodecontext.hxx"
#include "datamodelcontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
#include <osl/diagnose.h>
using namespace ::oox::core;
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index 1ceb8dc..0ab6a6d 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -23,6 +23,8 @@
#include "diagramfragmenthandler.hxx"
#include "datamodelcontext.hxx"
#include "drawingml/colorchoicecontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index e48ac5f..a86d7c0 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -39,7 +39,8 @@
#include "oox/helper/graphichelper.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "oox/drawingml/shapepropertymap.hxx"
-#include "oox/token/tokens.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <rtl/math.hxx>
#include <osl/diagnose.h>
diff --git a/oox/source/drawingml/objectdefaultcontext.cxx b/oox/source/drawingml/objectdefaultcontext.cxx
index a1d19b2..01045b1 100644
--- a/oox/source/drawingml/objectdefaultcontext.cxx
+++ b/oox/source/drawingml/objectdefaultcontext.cxx
@@ -20,6 +20,8 @@
#include "drawingml/objectdefaultcontext.hxx"
#include "drawingml/spdefcontext.hxx"
#include "oox/drawingml/theme.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index e0ac8b0..930c594 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -31,6 +31,9 @@
#include "drawingml/transform2dcontext.hxx"
#include "drawingml/customshapegeometry.hxx"
#include "effectpropertiescontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/spdefcontext.cxx b/oox/source/drawingml/spdefcontext.cxx
index 3f84106..b12cdc9 100644
--- a/oox/source/drawingml/spdefcontext.cxx
+++ b/oox/source/drawingml/spdefcontext.cxx
@@ -22,6 +22,8 @@
#include "drawingml/textbody.hxx"
#include "drawingml/textbodypropertiescontext.hxx"
#include "drawingml/textliststylecontext.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 119b28c..4df26bb 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -25,6 +25,8 @@
#include "oox/drawingml/theme.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/propertyset.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <tools/color.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx b/oox/source/drawingml/table/tablepartstylecontext.cxx
index 8ba8139..4f076f4 100644
--- a/oox/source/drawingml/table/tablepartstylecontext.cxx
+++ b/oox/source/drawingml/table/tablepartstylecontext.cxx
@@ -22,6 +22,8 @@
#include "drawingml/table/tablepartstylecontext.hxx"
#include "drawingml/table/tablestyletextstylecontext.hxx"
#include "drawingml/table/tablestylecellstylecontext.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 8195a6d..4112ce8 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -29,6 +29,7 @@
#include <rtl/instance.hxx>
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/propertyset.hxx"
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx
index 551eb50..76f5a7a2 100644
--- a/oox/source/drawingml/table/tablerowcontext.cxx
+++ b/oox/source/drawingml/table/tablerowcontext.cxx
@@ -22,6 +22,9 @@
#include "drawingml/table/tablerowcontext.hxx"
#include "drawingml/table/tablecellcontext.hxx"
#include "drawingml/table/tablerow.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablestylecontext.cxx b/oox/source/drawingml/table/tablestylecontext.cxx
index 4651c09..48608d9 100644
--- a/oox/source/drawingml/table/tablestylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecontext.cxx
@@ -22,6 +22,9 @@
#include "drawingml/table/tablestylecontext.hxx"
#include "drawingml/table/tablebackgroundstylecontext.hxx"
#include "drawingml/table/tablepartstylecontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
index 7262a42..b7c7afe 100644
--- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
+++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
@@ -19,6 +19,9 @@
#include "drawingml/table/tablestylelistfragmenthandler.hxx"
#include "drawingml/table/tablestylecontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 84fc769..d252b57 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -25,6 +25,8 @@
#include "drawingml/textliststylecontext.hxx"
#include "drawingml/textfield.hxx"
#include "drawingml/textfieldcontext.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <oox/mathml/import.hxx>
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx
index 1badb73..01ad195 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -9,6 +9,9 @@
*/
#include "drawingml/texteffectscontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <map>
diff --git a/oox/source/drawingml/textfieldcontext.cxx b/oox/source/drawingml/textfieldcontext.cxx
index d0ea8aa..91301cb 100644
--- a/oox/source/drawingml/textfieldcontext.cxx
+++ b/oox/source/drawingml/textfieldcontext.cxx
@@ -21,6 +21,9 @@
#include "drawingml/textparagraphpropertiescontext.hxx"
#include "drawingml/textcharacterpropertiescontext.hxx"
#include "drawingml/textfield.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 54c81e7..9627333 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -36,6 +36,7 @@
#include "oox/helper/propertyset.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
+#include <oox/token/tokens.hxx>
#if OSL_DEBUG_LEVEL > 0
#include <vcl/unohelp.hxx>
diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx
index ef0556d..fc6dfd8 100644
--- a/oox/source/drawingml/textspacingcontext.cxx
+++ b/oox/source/drawingml/textspacingcontext.cxx
@@ -18,6 +18,9 @@
*/
#include "oox/drawingml/drawingmltypes.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "drawingml/textspacing.hxx"
#include "textspacingcontext.hxx"
diff --git a/oox/source/drawingml/texttabstoplistcontext.cxx b/oox/source/drawingml/texttabstoplistcontext.cxx
index 831ac13..46da6a2 100644
--- a/oox/source/drawingml/texttabstoplistcontext.cxx
+++ b/oox/source/drawingml/texttabstoplistcontext.cxx
@@ -23,6 +23,9 @@
#include <rtl/ustring.hxx>
#include "oox/drawingml/drawingmltypes.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "texttabstoplistcontext.hxx"
using namespace ::oox::core;
diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx
index dc142f7..cfa6ae4 100644
--- a/oox/source/drawingml/themefragmenthandler.cxx
+++ b/oox/source/drawingml/themefragmenthandler.cxx
@@ -20,6 +20,8 @@
#include "oox/drawingml/themefragmenthandler.hxx"
#include "drawingml/objectdefaultcontext.hxx"
#include "oox/drawingml/theme.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "drawingml/themeelementscontext.hxx"
using namespace ::oox::core;
diff --git a/oox/source/mathml/import.cxx b/oox/source/mathml/import.cxx
index 5b80dc4..1722986 100644
--- a/oox/source/mathml/import.cxx
+++ b/oox/source/mathml/import.cxx
@@ -11,6 +11,8 @@
#include <oox/mathml/importutils.hxx>
#include <oox/core/contexthandler.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <drawingml/textparagraph.hxx>
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx
index f538da8..4a76adc 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -20,11 +20,14 @@
#include "oox/ole/axcontrolfragment.hxx"
#include "oox/core/xmlfilterbase.hxx"
+#include <oox/helper/attributelist.hxx>
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/binaryoutputstream.hxx"
#include "oox/ole/axcontrol.hxx"
#include "oox/ole/olehelper.hxx"
#include "oox/ole/olestorage.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <osl/diagnose.h>
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index 0e0cc9b..0173d37 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -27,7 +27,10 @@
#include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
#include "oox/drawingml/shape.hxx"
+#include <oox/helper/attributelist.hxx>
#include <oox/helper/addtosequence.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index c2c8ef2..ffafb35 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -21,6 +21,8 @@
#include "drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "oox/core/contexthandler2.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index 3fad584..d6e6781 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -26,6 +26,9 @@
#include <com/sun/star/animations/XAnimate.hpp>
#include "oox/core/fragmenthandler.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <oox/ppt/pptfilterhelpers.hxx>
#include "commonbehaviorcontext.hxx"
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index e45b98b..e5957c4 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -19,6 +19,10 @@
#include "oox/ppt/customshowlistcontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
+
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index fadfec2..eae641e 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -9,6 +9,9 @@
#include "extdrawingfragmenthandler.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
+
using namespace ::oox::core;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx
index 40c8f2a..09af2df 100644
--- a/oox/source/ppt/layoutfragmenthandler.cxx
+++ b/oox/source/ppt/layoutfragmenthandler.cxx
@@ -26,6 +26,9 @@
#include "headerfootercontext.hxx"
#include "oox/ppt/layoutfragmenthandler.hxx"
#include "oox/drawingml/shapegroupcontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::com::sun::star;
using namespace ::oox::core;
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 36f5d76..8fca405 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -28,12 +28,13 @@
#include "oox/ppt/pptshapepropertiescontext.hxx"
#include "oox/ppt/slidepersist.hxx"
#include "drawingml/shapestylecontext.hxx"
-#include "oox/token/namespaces.hxx"
#include "drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "drawingml/customshapegeometry.hxx"
#include "drawingml/textbodycontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
using namespace oox::core;
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 2cfe355..3e48406 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -28,6 +28,7 @@
#include "drawingml/table/tablestylelistfragmenthandler.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/ole/vbaproject.hxx"
+#include <oox/token/tokens.hxx>
#include <services.hxx>
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 4ba58af..06a173b 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/text/XText.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/ppt/slidepersist.hxx"
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::oox::drawingml;
diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx
index 307406d..02260aa 100644
--- a/oox/source/ppt/pptshapepropertiescontext.cxx
+++ b/oox/source/ppt/pptshapepropertiescontext.cxx
@@ -32,6 +32,8 @@
#include "oox/drawingml/drawingmltypes.hxx"
#include "drawingml/customshapegeometry.hxx"
#include "drawingml/textbodycontext.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 1fe841f..5447114 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -18,6 +18,7 @@
*/
#include "comphelper/anytostring.hxx"
+#include <comphelper/sequenceashashmap.hxx>
#include "cppuhelper/exc_hlp.hxx"
#include <osl/diagnose.h>
#include <tools/multisel.hxx>
@@ -37,11 +38,14 @@
#include "oox/drawingml/drawingmltypes.hxx"
#include "oox/drawingml/themefragmenthandler.hxx"
#include "drawingml/textliststylecontext.hxx"
+#include <oox/helper/attributelist.hxx>
#include "oox/ppt/pptshape.hxx"
#include "oox/ppt/presentationfragmenthandler.hxx"
#include "oox/ppt/slidefragmenthandler.hxx"
#include "oox/ppt/layoutfragmenthandler.hxx"
#include "oox/ppt/pptimport.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <com/sun/star/office/XAnnotation.hpp>
#include <com/sun/star/office/XAnnotationAccess.hpp>
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index d8c4735..63274c1 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <osl/diagnose.h>
+#include <oox/helper/attributelist.hxx>
#include "oox/helper/propertyset.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "headerfootercontext.hxx"
@@ -39,6 +40,8 @@
#include "drawingml/clrschemecontext.hxx"
#include "drawingml/textliststyle.hxx"
#include "oox/ppt/pptimport.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::com::sun::star;
using namespace ::oox::core;
diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx
index 876f495..600c95d 100644
--- a/oox/source/ppt/slidemastertextstylescontext.cxx
+++ b/oox/source/ppt/slidemastertextstylescontext.cxx
@@ -20,6 +20,8 @@
#include "drawingml/textliststyle.hxx"
#include "drawingml/textliststylecontext.hxx"
#include "oox/ppt/slidemastertextstylescontext.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index f527868..9064a67 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -25,6 +25,7 @@
#include "oox/helper/propertymap.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/vml/vmldrawing.hxx"
+#include <oox/token/tokens.hxx>
#include "oox/core/xmlfilterbase.hxx"
#include "drawingml/textliststyle.hxx"
#include "drawingml/textparagraphproperties.hxx"
diff --git a/oox/source/ppt/timeanimvaluecontext.cxx b/oox/source/ppt/timeanimvaluecontext.cxx
index 922b3ae..531bf8c 100644
--- a/oox/source/ppt/timeanimvaluecontext.cxx
+++ b/oox/source/ppt/timeanimvaluecontext.cxx
@@ -21,6 +21,10 @@
#include "animvariantcontext.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
+
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index dee91bd..eebaee7 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -40,6 +40,7 @@
#include "oox/helper/helper.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include <oox/ppt/pptfilterhelpers.hxx>
+#include <oox/token/tokens.hxx>
#include "sal/log.hxx"
using namespace ::oox::core;
diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx
index 61728b2..93e5716 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -9,6 +9,8 @@
#include "LockedCanvasContext.hxx"
#include <oox/drawingml/shapegroupcontext.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace com::sun::star;
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 6e256ac..3613baf3 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -27,6 +27,8 @@
#include "services.hxx"
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "oox/drawingml/themefragmenthandler.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <memory>
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
index 2a86ae0..9356bc2 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -9,6 +9,9 @@
#include "ShapeDrawingFragmentHandler.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
+
using namespace com::sun::star;
namespace oox { namespace shape {
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index e343bd5..bfdeb26 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -11,6 +11,8 @@
#include <drawingml/shapepropertiescontext.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
#include <oox/drawingml/graphicshapecontext.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
using namespace com::sun::star;
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index ea596c8..738f2e1 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -8,13 +8,19 @@
*/
#include "WpsContext.hxx"
+#include <comphelper/sequenceashashmap.hxx>
#include <drawingml/customshapeproperties.hxx>
#include <drawingml/shapepropertiescontext.hxx>
#include <drawingml/shapestylecontext.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextCursor.hpp>
#include <svx/svdtrans.hxx>
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <boost/optional.hpp>
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index 17dcd9c..c1bed09 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -20,6 +20,8 @@
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/core/xmlfilterbase.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "oox/vml/vmldrawing.hxx"
#include "oox/vml/vmlinputstream.hxx"
#include "oox/vml/vmlshapecontext.hxx"
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e645606..34527f0 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -54,6 +54,7 @@
#include "oox/ole/axcontrol.hxx"
#include "oox/ole/axcontrolfragment.hxx"
#include "oox/ole/oleobjecthelper.hxx"
+#include <oox/token/tokens.hxx>
#include "oox/vml/vmldrawing.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
#include "oox/vml/vmltextbox.hxx"
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index f193227..dc65422 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -20,6 +20,10 @@
#include "oox/vml/vmlshapecontext.hxx"
#include "oox/core/xmlfilterbase.hxx"
+#include <oox/helper/attributelist.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "oox/vml/vmldrawing.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx
index 11f0da8..6f85055 100644
--- a/sc/source/filter/oox/autofiltercontext.cxx
+++ b/sc/source/filter/oox/autofiltercontext.cxx
@@ -21,6 +21,8 @@
#include "autofilterbuffer.hxx"
#include "biffinputstream.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 02878bb..65ce1f9 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -20,6 +20,7 @@
#include "biffcodec.hxx"
#include <osl/thread.h>
+#include <oox/helper/attributelist.hxx>
#include <string.h>
#include "biffinputstream.hxx"
diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx
index 1c6a031..69ac9b6 100644
--- a/sc/source/filter/oox/commentsfragment.cxx
+++ b/sc/source/filter/oox/commentsfragment.cxx
@@ -20,6 +20,8 @@
#include "commentsfragment.hxx"
#include "richstringcontext.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index fed21b7..638e5be 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -21,6 +21,8 @@
#include "extlstcontext.hxx"
#include "condformatbuffer.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 1739bcb..023c27d 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -10,6 +10,9 @@
#include "extlstcontext.hxx"
#include "worksheethelper.hxx"
#include <oox/core/contexthandler.hxx>
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include "colorscale.hxx"
#include "condformatbuffer.hxx"
#include "condformatcontext.hxx"
diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx
index ca26708..7cb858b 100644
--- a/sc/source/filter/oox/pivottablefragment.cxx
+++ b/sc/source/filter/oox/pivottablefragment.cxx
@@ -21,6 +21,8 @@
#include "biffinputstream.hxx"
#include "pivottablebuffer.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx
index c085dae..e8643a7 100644
--- a/sc/source/filter/oox/querytablefragment.cxx
+++ b/sc/source/filter/oox/querytablefragment.cxx
@@ -21,6 +21,8 @@
#include "biffinputstream.hxx"
#include "querytablebuffer.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx
index 9631049..704c7d5 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -15,6 +15,9 @@
#include <oox/core/relations.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/core/fastparser.hxx>
+#include <oox/helper/attributelist.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
#include <svl/sharedstringpool.hxx>
#include <sax/tools/converter.hxx>
#include <editeng/editobj.hxx>
diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx
index a9ab072..df6cc4b 100644
--- a/sc/source/filter/oox/richstringcontext.cxx
+++ b/sc/source/filter/oox/richstringcontext.cxx
@@ -20,6 +20,8 @@
#include "richstringcontext.hxx"
#include "stylesfragment.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx
index b58663c..00dd0c5 100644
--- a/sc/source/filter/oox/scenariocontext.cxx
+++ b/sc/source/filter/oox/scenariocontext.cxx
@@ -20,6 +20,8 @@
#include "scenariocontext.hxx"
#include "scenariobuffer.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx
index 3438ae2..585a37c 100644
--- a/sc/source/filter/oox/sharedstringsfragment.cxx
+++ b/sc/source/filter/oox/sharedstringsfragment.cxx
@@ -21,6 +21,8 @@
#include "richstringcontext.hxx"
#include "sharedstringsbuffer.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/tablecolumnscontext.cxx b/sc/source/filter/oox/tablecolumnscontext.cxx
index f3e64d9..4225f83 100644
--- a/sc/source/filter/oox/tablecolumnscontext.cxx
+++ b/sc/source/filter/oox/tablecolumnscontext.cxx
@@ -21,6 +21,8 @@
#include "tablecolumnsbuffer.hxx"
#include "biffinputstream.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx
index a997249..12a45ec 100644
--- a/sc/source/filter/oox/tablefragment.cxx
+++ b/sc/source/filter/oox/tablefragment.cxx
@@ -24,6 +24,8 @@
#include "tablecolumnsbuffer.hxx"
#include "tablecolumnscontext.hxx"
#include "tablebuffer.hxx"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index fec6137..176d5eb 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -45,6 +45,7 @@
#include <rtl/ustrbuf.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/propertyset.hxx>
+#include <oox/token/tokens.hxx>
#include "addressconverter.hxx"
#include "autofilterbuffer.hxx"
#include "commentsbuffer.hxx"
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 475e678..7751927 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -28,6 +28,7 @@
#include <docxexportfilter.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
+#include <comphelper/sequenceashashmap.hxx>
#include <IDocumentDrawModelAccess.hxx>
More information about the Libreoffice-commits
mailing list