diff options
author | Jorenz Paragas <j.paragas.237@gmail.com> | 2016-05-07 14:17:24 -0700 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-05-10 19:20:40 +0000 |
commit | 4bf7614503292fe69d3e5835621c1cdcaa4536cb (patch) | |
tree | 4aa8f96d0861c4663cbe45a5636ecbfca0140f7e | |
parent | 3742748699cc09b04bff3d7c606f1c7a21427357 (diff) |
tdf#42949: clean up includes in include/oox/helper with iwyu
...and fix the many compiler errors that occurred as a result.
Change-Id: I497c326272b2f02737ca3765720d6815b735423b
Reviewed-on: https://gerrit.libreoffice.org/24735
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
144 files changed, 311 insertions, 44 deletions
diff --git a/include/oox/helper/addtosequence.hxx b/include/oox/helper/addtosequence.hxx index 57b77323aafe..dbb271ca09b5 100644 --- a/include/oox/helper/addtosequence.hxx +++ b/include/oox/helper/addtosequence.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Any.hxx> #include <oox/dllapi.h> -#include <rtl/ustring.hxx> namespace oox { diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index acb8709020ba..524d7f769a51 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -20,12 +20,16 @@ #ifndef INCLUDED_OOX_HELPER_ATTRIBUTELIST_HXX #define INCLUDED_OOX_HELPER_ATTRIBUTELIST_HXX +#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/xml/sax/XFastAttributeList.hpp> #include <oox/helper/helper.hxx> -#include <oox/token/namespaces.hxx> -#include <oox/token/tokens.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 sax_fastparser { class FastAttributeList; diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 88e9033be26d..cf247f02797b 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -20,9 +20,18 @@ #ifndef INCLUDED_OOX_HELPER_BINARYINPUTSTREAM_HXX #define INCLUDED_OOX_HELPER_BINARYINPUTSTREAM_HXX +#include <cstddef> +#include <memory> #include <vector> -#include <com/sun/star/io/XInputStream.hpp> + +#include <com/sun/star/uno/Reference.hxx> +#include <oox/dllapi.h> #include <oox/helper/binarystreambase.hxx> +#include <oox/helper/helper.hxx> +#include <rtl/string.hxx> +#include <rtl/textenc.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> namespace com { namespace sun { namespace star { namespace io { class XInputStream; } diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 358e72c20515..4dfbaf8559cc 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -20,9 +20,17 @@ #ifndef INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX #define INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX -#include <oox/helper/binarystreambase.hxx> +#include <cstddef> #include <memory> +#include <com/sun/star/uno/Reference.hxx> +#include <oox/dllapi.h> +#include <oox/helper/binarystreambase.hxx> +#include <oox/helper/helper.hxx> +#include <rtl/textenc.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> + namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index e49eca63c601..f9fd1e0ebe15 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX #define INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX +#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <oox/helper/helper.hxx> #include <oox/dllapi.h> -#include <memory> +#include <sal/types.h> namespace com { namespace sun { namespace star { namespace io { class XSeekable; } diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 6fc6bd7eb6af..016df0d60d3f 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -20,19 +20,19 @@ #ifndef INCLUDED_OOX_HELPER_CONTAINERHELPER_HXX #define INCLUDED_OOX_HELPER_CONTAINERHELPER_HXX -#include <map> +#include <cstddef> #include <vector> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Sequence.h> -#include <oox/dllapi.h> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <oox/dllapi.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> namespace com { namespace sun { namespace star { - namespace container { class XIndexAccess; } - namespace container { class XIndexContainer; } namespace container { class XNameAccess; } namespace container { class XNameContainer; } - namespace uno { class XComponentContext; } + namespace uno { class Any; } } } } namespace oox { diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx index 8ad8bd462d61..efcb68dd8ea1 100644 --- a/include/oox/helper/grabbagstack.hxx +++ b/include/oox/helper/grabbagstack.hxx @@ -11,12 +11,17 @@ #ifndef INCLUDED_OOX_HELPER_GRABBAGSTACK_HXX #define INCLUDED_OOX_HELPER_GRABBAGSTACK_HXX +#include <stack> +#include <vector> + +#include <com/sun/star/beans/PropertyValue.hpp> #include <oox/dllapi.h> #include <rtl/ustring.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> +#include <sal/types.h> -#include <vector> -#include <stack> +namespace com { namespace sun { namespace star { + namespace uno { class Any; } +} } } namespace oox { diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index 36f374805c33..6301332fc7eb 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -22,12 +22,15 @@ #include <deque> #include <map> -#include <rtl/ustring.hxx> + #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/uno/Reference.hxx> +#include <oox/dllapi.h> #include <oox/helper/binarystreambase.hxx> +#include <oox/helper/helper.hxx> #include <oox/helper/storagebase.hxx> +#include <rtl/ustring.hxx> +#include <sal/types.h> struct WMF_EXTERNALHEADER; diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 7c742f5d9e72..0adbceb34757 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_OOX_HELPER_HELPER_HXX #define INCLUDED_OOX_HELPER_HELPER_HXX -#include <algorithm> +#include <cstring> #include <limits> -#include <sal/macros.h> -#include <osl/endian.h> + #include <rtl/math.hxx> #include <rtl/string.hxx> -#include <rtl/ustring.hxx> -#include <string.h> +#include <rtl/textenc.h> +#include <sal/macros.h> +#include <sal/types.h> namespace oox { diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 85ce16808a7b..986e0c7c5945 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -20,8 +20,11 @@ #ifndef INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX #define INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX +#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <oox/dllapi.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> namespace com { namespace sun { namespace star { namespace awt { struct Gradient; } diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index 2ee50a376426..cbc4244a7ca7 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -21,9 +21,10 @@ #define INCLUDED_OOX_HELPER_PROGRESSBAR_HXX #include <memory> + #include <com/sun/star/uno/Reference.hxx> #include <oox/dllapi.h> - +#include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index 8aa7f3d14a06..cf9b802cd7d5 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -20,13 +20,14 @@ #ifndef INCLUDED_OOX_HELPER_PROPERTYMAP_HXX #define INCLUDED_OOX_HELPER_PROPERTYMAP_HXX -#include <vector> #include <map> + #include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <rtl/ustring.hxx> -#include <oox/token/properties.hxx> #include <oox/dllapi.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index 1470cfcf3f51..750e5f75a679 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -20,10 +20,18 @@ #ifndef INCLUDED_OOX_HELPER_PROPERTYSET_HXX #define INCLUDED_OOX_HELPER_PROPERTYSET_HXX -#include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> #include <oox/dllapi.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> + +namespace com { namespace sun { namespace star { + namespace beans { class XMultiPropertySet; } + namespace beans { class XPropertySet; } + namespace beans { class XPropertySetInfo; } +} } } namespace oox { diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index d1784f73be5d..fb32c9d8c30f 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_OOX_HELPER_REFMAP_HXX #define INCLUDED_OOX_HELPER_REFMAP_HXX -#include <sal/types.h> - -#include <functional> #include <algorithm> +#include <functional> #include <map> #include <memory> diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index 9fab74a97ccf..1084e71cecf5 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_OOX_HELPER_REFVECTOR_HXX #define INCLUDED_OOX_HELPER_REFVECTOR_HXX -#include <sal/types.h> - -#include <functional> #include <algorithm> +#include <functional> #include <memory> #include <vector> +#include <sal/types.h> + namespace oox { diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index b953495fb094..7f88c5ff2123 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -20,10 +20,14 @@ #ifndef INCLUDED_OOX_HELPER_STORAGEBASE_HXX #define INCLUDED_OOX_HELPER_STORAGEBASE_HXX +#include <functional> +#include <memory> #include <vector> + #include <com/sun/star/uno/Reference.hxx> -#include <oox/helper/refmap.hxx> #include <oox/dllapi.h> +#include <oox/helper/refmap.hxx> +#include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { namespace embed { class XStorage; } diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx index 8412b77a53ba..d059c88e8839 100644 --- a/include/oox/helper/textinputstream.hxx +++ b/include/oox/helper/textinputstream.hxx @@ -21,7 +21,9 @@ #define INCLUDED_OOX_HELPER_TEXTINPUTSTREAM_HXX #include <com/sun/star/uno/Reference.hxx> +#include <rtl/textenc.h> #include <rtl/ustring.hxx> +#include <sal/types.h> namespace com { namespace sun { namespace star { namespace io { class XInputStream; } diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index 4e4236393cbd..4972254bbc0b 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -20,9 +20,17 @@ #ifndef INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX #define INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX +#include <vector> + +#include <com/sun/star/uno/Reference.hxx> #include <oox/helper/storagebase.hxx> +#include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { + namespace embed { class XStorage; } + namespace io { class XInputStream; } + namespace io { class XOutputStream; } + namespace io { class XStream; } namespace uno { class XComponentContext; } } } } diff --git a/oox/inc/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx index b40649b61532..814fdcd2ba5b 100644 --- a/oox/inc/drawingml/textrun.hxx +++ b/oox/inc/drawingml/textrun.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX #define INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX +#include <memory> + #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index 75f6a10d701c..60d5e1db41f5 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -19,6 +19,7 @@ #include "oox/core/contexthandler2.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/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 70fcd4925150..f7a8f8125df5 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -29,6 +29,8 @@ #include "oox/helper/attributelist.hxx" #include "oox/helper/zipstorage.hxx" #include "oox/ole/olestorage.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "oox/crypto/DocumentDecryption.hxx" diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index 590a44e78226..9a708d569d56 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -20,6 +20,8 @@ #include "oox/core/fragmenthandler2.hxx" #include "oox/core/xmlfilterbase.hxx" #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace core { diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index 23eb2a6fc977..f94d5ebfa569 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -22,6 +22,8 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace core { diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 066a3d6432c6..fe6a1aaef3a2 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -22,6 +22,7 @@ #include <cstdio> #include <set> #include <com/sun/star/beans/XPropertyAccess.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/embed/XRelationshipAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index 9fad1902ea2f..fad77ab3421e 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -25,6 +25,8 @@ #include "drawingml/chart/titlecontext.hxx" #include <oox/core/xmlfilterbase.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/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 8f8cd9bd68eb..8e50f97a23da 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -37,6 +37,7 @@ #include "drawingml/chart/typegroupconverter.hxx" #include "oox/drawingml/lineproperties.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include "comphelper/processfactory.hxx" #include <osl/diagnose.h> diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index b4c43f229f7e..9131da4e8753 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -28,6 +28,7 @@ #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include <oox/helper/graphichelper.hxx> #include "drawingml/chart/chartdrawingfragment.hxx" diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index c7f9cdd33504..dba0a30b4dd5 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/properties.hxx> #include <oox/token/tokens.hxx> #include <comphelper/processfactory.hxx> diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx index 519f74d664fe..d39cf864db53 100644 --- a/oox/source/drawingml/chart/modelbase.cxx +++ b/oox/source/drawingml/chart/modelbase.cxx @@ -20,6 +20,7 @@ #include "oox/drawingml/chart/modelbase.hxx" #include "oox/helper/attributelist.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 8e05f3c30f97..197867bc206f 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -35,6 +35,7 @@ #include "drawingml/chart/chartspacemodel.hxx" #include "oox/helper/modelobjecthelper.hxx" #include <oox/helper/graphichelper.hxx> +#include <oox/token/properties.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index f55ef9bffc66..2e967156cfc7 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -33,6 +33,7 @@ #include "drawingml/chart/typegroupconverter.hxx" #include <oox/core/xmlfilterbase.hxx> #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> namespace oox { diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 4682f5d9b845..d0ed206cd0b1 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -38,6 +38,7 @@ #include "oox/helper/containerhelper.hxx" #include <oox/helper/attributelist.hxx> #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include <oox/drawingml/lineproperties.hxx> diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 0e3c44dbd371..8586ccbbc339 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/properties.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 20c84f64a0b8..9a46dd9a751c 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -24,6 +24,8 @@ #include <oox/core/xmlfilterbase.hxx> #include <oox/helper/attributelist.hxx> #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 80cf3f3e6254..d0369b2532c3 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -40,6 +40,7 @@ #include <oox/core/xmlfilterbase.hxx> #include "oox/helper/containerhelper.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> namespace oox { diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index 4ebbf5ac08d6..d1e5df65fded 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -21,7 +21,8 @@ #include "drawingml/colorchoicecontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/color.hxx" - +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx index b03e6a5bb5a2..c709d0f01a6b 100644 --- a/oox/source/drawingml/connectorshapecontext.cxx +++ b/oox/source/drawingml/connectorshapecontext.cxx @@ -26,6 +26,7 @@ #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> #include "drawingml/customshapegeometry.hxx" #include "drawingml/textbodycontext.hxx" diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 4557a6d30468..a490533917f9 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -25,6 +25,8 @@ #include "oox/helper/helper.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <unordered_map> using namespace ::oox::core; diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 92252f30fa4d..625135c86362 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -13,6 +13,7 @@ #include <comphelper/sequence.hxx> #include "drawingml/customshapeproperties.hxx" +#include <oox/token/properties.hxx> #include "oox/token/tokenmap.hxx" #include <com/sun/star/awt/Rectangle.hpp> diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 19fbc613044e..018210267dea 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -21,10 +21,12 @@ #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" +#include <oox/token/properties.hxx> #include "oox/token/tokenmap.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> #include <com/sun/star/drawing/XShape.hpp> diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx index 602f8fe8f5f0..71f17f65d65a 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.cxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx @@ -19,6 +19,8 @@ #include "constraintlistcontext.hxx" #include "oox/helper/attributelist.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <osl/diagnose.h> using namespace ::oox::core; diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index c818d8b69990..c438445ea93d 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -22,6 +22,8 @@ #include "drawingml/fillpropertiesgroupcontext.hxx" #include "drawingml/shapepropertiescontext.hxx" #include "drawingml/textbodycontext.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <osl/diagnose.h> using namespace ::oox::core; diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 1075c69c8493..d381b68511b6 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -25,6 +25,8 @@ #include "drawingml/customshapeproperties.hxx" #include "diagramdefinitioncontext.hxx" #include "constraintlistcontext.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <osl/diagnose.h> using namespace ::oox::core; diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx index 2dd529b834cb..d6c7de519991 100644 --- a/oox/source/drawingml/effectproperties.cxx +++ b/oox/source/drawingml/effectproperties.cxx @@ -11,7 +11,8 @@ #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/shapepropertymap.hxx" #include "oox/helper/graphichelper.hxx" -#include "oox/token/tokens.hxx" +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include <basegfx/numeric/ftools.hxx> #include <o3tl/make_unique.hxx> diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index 041595382f1d..63faada8e3bd 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -12,6 +12,8 @@ #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <o3tl/make_unique.hxx> diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx index 7ed371ed2b68..4923bfcd299f 100644 --- a/oox/source/drawingml/embeddedwavaudiofile.cxx +++ b/oox/source/drawingml/embeddedwavaudiofile.cxx @@ -19,6 +19,8 @@ #include "drawingml/embeddedwavaudiofile.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/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index d02c8ae1e84e..9044b5d12866 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -39,6 +39,7 @@ #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/shapepropertymap.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include <rtl/math.hxx> #include <osl/diagnose.h> diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx index 69175f4d647e..ecfdb335f5e4 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx @@ -23,6 +23,8 @@ #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/fillproperties.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <sfx2/docfile.hxx> using namespace ::com::sun::star; diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index 116f793d22d6..73c2fdc0c227 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -40,6 +40,8 @@ #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::io; diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index a00c0843d10e..1e88e68b5bd2 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -25,6 +25,9 @@ #include "oox/helper/propertymap.hxx" #include "oox/core/relations.hxx" #include "oox/core/xmlfilterbase.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "drawingml/embeddedwavaudiofile.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx index 8376df069822..10ed9cf5cbc8 100644 --- a/oox/source/drawingml/linepropertiescontext.cxx +++ b/oox/source/drawingml/linepropertiescontext.cxx @@ -22,6 +22,8 @@ #include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.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/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx index 5af3b83a93dd..4f4fcb11697b 100644 --- a/oox/source/drawingml/scene3dcontext.cxx +++ b/oox/source/drawingml/scene3dcontext.cxx @@ -27,6 +27,8 @@ #include "oox/drawingml/fillproperties.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; diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index eb7a5395e84b..537ca03c4a66 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -43,6 +43,7 @@ #include "oox/helper/modelobjecthelper.hxx" #include <oox/mathml/importutils.hxx> #include <oox/mathml/import.hxx> +#include <oox/token/properties.hxx> #include <comphelper/classids.hxx> #include <tools/gen.hxx> diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index b0a609c36307..9b097fc05881 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -34,6 +34,8 @@ #include "drawingml/textbodycontext.hxx" #include "drawingml/textbodypropertiescontext.hxx" #include "hyperlinkcontext.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/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index 77e3704f7418..2dbd69424ed5 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -30,6 +30,8 @@ #include "drawingml/customshapegeometry.hxx" #include <drawingml/shapepropertiescontext.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/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index 25b0bcc241f4..7ffecabd9135 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include "oox/helper/modelobjecthelper.hxx" +#include <oox/token/properties.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx index 6074f34ed6ee..6a487e57b202 100644 --- a/oox/source/drawingml/shapestylecontext.cxx +++ b/oox/source/drawingml/shapestylecontext.cxx @@ -21,6 +21,8 @@ #include "oox/helper/attributelist.hxx" #include "drawingml/colorchoicecontext.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/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index ea6f7a0647c5..b376cab17d19 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -22,6 +22,8 @@ #include "drawingml/table/tablebackgroundstylecontext.hxx" #include "drawingml/fillpropertiesgroupcontext.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/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 9a569505aeb1..1c0d08616599 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -26,6 +26,7 @@ #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/propertyset.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include <tools/color.hxx> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index b0df1663c10e..e7bffe3c83bc 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -24,6 +24,8 @@ #include "drawingml/linepropertiescontext.hxx" #include "drawingml/fillpropertiesgroupcontext.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/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 30bab795e2b7..9e4cd315e62f 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -24,6 +24,8 @@ #include "drawingml/table/tableproperties.hxx" #include "drawingml/table/tablestylecontext.hxx" #include "drawingml/table/tablerowcontext.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/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index 6f6f2354203a..cc4d381e0528 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -23,6 +23,8 @@ #include "drawingml/fillpropertiesgroupcontext.hxx" #include "drawingml/linepropertiescontext.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/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index 609cc8b2639e..55240664bed6 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -22,6 +22,8 @@ #include "drawingml/table/tablestyletextstylecontext.hxx" #include "drawingml/colorchoicecontext.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/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index f61330add65c..d409a924a5d5 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/textbodyproperties.hxx" +#include <oox/token/properties.hxx> #include "oox/token/tokens.hxx" using namespace ::com::sun::star::drawing; diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index 8c19acc70f6e..0c5da82aafeb 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -26,6 +26,9 @@ #include "oox/drawingml/drawingmltypes.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 48803de31157..d45e59ddc9c7 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -27,6 +27,7 @@ #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/drawingmltypes.hxx" +#include <oox/token/properties.hxx> #include "oox/token/tokens.hxx" using ::oox::core::XmlFilterBase; diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 1c62c1db37fc..3cb5bd028ee4 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -27,6 +27,8 @@ #include "drawingml/textparagraphproperties.hxx" #include "oox/core/relations.hxx" #include "hyperlinkcontext.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/textfont.cxx b/oox/source/drawingml/textfont.cxx index b689d830836e..9cc83c632de4 100644 --- a/oox/source/drawingml/textfont.cxx +++ b/oox/source/drawingml/textfont.cxx @@ -23,6 +23,7 @@ #include "oox/drawingml/theme.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/attributelist.hxx" +#include <oox/token/tokens.hxx> using ::oox::core::XmlFilterBase; diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx index b8ada9e836fb..e7d3ea9f4f88 100644 --- a/oox/source/drawingml/textliststylecontext.cxx +++ b/oox/source/drawingml/textliststylecontext.cxx @@ -20,6 +20,8 @@ #include "drawingml/textliststylecontext.hxx" #include "drawingml/textparagraphpropertiescontext.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/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 87961dfa9bd0..985de13849e5 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/text/ControlCharacter.hpp> +#include <oox/token/properties.hxx> using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 20b9d3881c07..4abee8fdc756 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/properties.hxx> #include <oox/token/tokens.hxx> #if OSL_DEBUG_LEVEL > 0 diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index a4c034f0ebcf..3a0eb4156849 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -30,6 +30,9 @@ #include "oox/helper/attributelist.hxx" #include "textspacingcontext.hxx" #include "texttabstoplistcontext.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 3585be83a754..8d36dfc4bb02 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextField.hpp> @@ -29,6 +30,7 @@ #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" +#include <oox/token/properties.hxx> #include "oox/token/tokens.hxx" using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index ea9208a1c2ec..1f2622f93a3f 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -28,6 +28,8 @@ #include "oox/helper/attributelist.hxx" #include "effectproperties.hxx" #include "effectpropertiescontext.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/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index 15c30f8cf628..1950a4e2345d 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -22,6 +22,7 @@ #include "oox/drawingml/shape.hxx" #include "drawingml/customshapeproperties.hxx" #include "drawingml/textbody.hxx" +#include <oox/token/namespaces.hxx> using namespace ::com::sun::star; using ::oox::core::ContextHandlerRef; diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index 5b5eb5b2d01c..65de093af611 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <string.h> +#include <algorithm> #include <vector> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index cd1f25dc8fb4..8c31f0bf9712 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -18,6 +18,7 @@ */ #include "oox/helper/binarystreambase.hxx" +#include <oox/helper/helper.hxx> #include <com/sun/star/io/XSeekable.hpp> #include <osl/diagnose.h> diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index 2f8b3d5851b6..eedf306483b9 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <algorithm> + #include "oox/helper/containerhelper.hxx" #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 82860c380f10..819e83afc4c5 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -48,6 +48,7 @@ using ::com::sun::star::text::WritingMode; #include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> +#include <oox/token/properties.hxx> #include "oox/token/propertynames.hxx" using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index ff092e029b05..b66de7ac8fed 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -19,6 +19,8 @@ #include "oox/helper/propertyset.hxx" +#include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <osl/diagnose.h> #include <rtl/strbuf.hxx> #include "oox/helper/propertymap.hxx" diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 3d5084fb16c3..25f505b8dacf 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XFormComponent.hpp> @@ -55,6 +56,8 @@ #include "oox/helper/graphichelper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/ole/axbinarywriter.hxx" +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace ole { diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index e20e13fec539..9b032d798da8 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -24,7 +24,8 @@ #include <osl/diagnose.h> #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/graphichelper.hxx" -#include "oox/token/tokens.hxx" +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "oox/ole/axcontrol.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index d55dc65f8df4..08b390a10aa7 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -31,6 +31,7 @@ #include <osl/diagnose.h> #include <comphelper/sequenceashashmap.hxx> #include "oox/helper/propertymap.hxx" +#include <oox/token/properties.hxx> namespace oox { namespace ole { diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 1ed1e99a5d2c..805bb2d7a504 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -22,6 +22,7 @@ #include <algorithm> #include <set> #include <com/sun/star/awt/XControlModel.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/io/XInputStreamProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -37,6 +38,8 @@ #include "oox/helper/storagebase.hxx" #include "oox/helper/textinputstream.hxx" #include "oox/ole/vbahelper.hxx" +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include <unordered_map> namespace oox { diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index 35833dc24eec..5beddc384061 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -17,6 +17,7 @@ #include <tools/stream.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <com/sun/star/script/vba/XVBACompatibility.hpp> diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 17ab0abfe47f..7aa47ce8c4f7 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -19,6 +19,7 @@ #include "oox/ole/vbaproject.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index 7e8d36da6674..1c879a6582ec 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -30,6 +30,8 @@ #include "oox/core/fragmenthandler.hxx" #include "oox/core/xmlfilterbase.hxx" #include "drawingml/colorchoicecontext.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/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx index 1d812f31be87..1bee71b75522 100644 --- a/oox/source/ppt/buildlistcontext.cxx +++ b/oox/source/ppt/buildlistcontext.cxx @@ -20,6 +20,8 @@ #include "buildlistcontext.hxx" #include <rtl/ustring.hxx> #include "oox/helper/attributelist.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace ppt { diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 7a5402abca45..c8e11e0f6979 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -38,6 +38,8 @@ #include "oox/ppt/pptimport.hxx" #include <oox/ppt/pptfilterhelpers.hxx> #include "oox/drawingml/drawingmltypes.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "animationtypes.hxx" diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index 9e7d816fd04d..e7137926d3dd 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -31,6 +31,8 @@ #include "oox/helper/attributelist.hxx" #include "oox/ppt/animationspersist.hxx" #include "animationtypes.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "timetargetelementcontext.hxx" diff --git a/oox/source/ppt/headerfootercontext.cxx b/oox/source/ppt/headerfootercontext.cxx index d0f9b25f3a89..9de098fca166 100644 --- a/oox/source/ppt/headerfootercontext.cxx +++ b/oox/source/ppt/headerfootercontext.cxx @@ -19,6 +19,7 @@ #include "headerfootercontext.hxx" #include "oox/helper/attributelist.hxx" +#include <oox/token/tokens.hxx> using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index c85083836904..13a447b1224a 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -35,6 +35,9 @@ #include "drawingml/customshapegeometry.hxx" #include "drawingml/textbodycontext.hxx" #include "drawingml/transform2dcontext.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index 0c2beb181cc0..57f0f9127a0a 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -37,6 +37,8 @@ #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/fillproperties.hxx" #include "extdrawingfragmenthandler.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/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index 02260aa24d08..d00d9a96469a 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -33,6 +33,7 @@ #include "drawingml/customshapegeometry.hxx" #include "drawingml/textbodycontext.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> using namespace oox::core; diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index fc8ff5d1e46d..972480f87ac2 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -41,6 +41,7 @@ #include "drawingml/textliststyle.hxx" #include "oox/ppt/pptimport.hxx" #include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> using namespace ::com::sun::star; diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index eaee10d121b3..fec1d6cd8615 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -26,6 +26,7 @@ #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" #include "oox/vml/vmldrawing.hxx" +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include "oox/core/xmlfilterbase.hxx" #include "drawingml/textliststyle.hxx" diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx index 6fe48aad6673..e0744512dcc2 100644 --- a/oox/source/ppt/slidetimingcontext.cxx +++ b/oox/source/ppt/slidetimingcontext.cxx @@ -28,6 +28,9 @@ #include "oox/helper/attributelist.hxx" #include "oox/ppt/timenodelistcontext.hxx" #include "buildlistcontext.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/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 6136568c6ee4..e21ecdd7f7ce 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -28,8 +28,9 @@ #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" -#include "oox/token/namespaces.hxx" -#include "oox/token/tokens.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include <oox/ppt/pptfilterhelpers.hxx> using namespace ::com::sun::star::uno; diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 589edb98a64a..9b29653e98e6 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -30,6 +30,8 @@ #include "oox/ppt/soundactioncontext.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/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index ef2d137aae3c..a16598854c15 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -25,6 +25,9 @@ #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" #include "drawingml/embeddedwavaudiofile.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 15925d911a60..5efc6c7ed8ec 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -43,6 +43,8 @@ #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/colorchoicecontext.hxx" #include "oox/ppt/slidetransition.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "animvariantcontext.hxx" #include "commonbehaviorcontext.hxx" diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 608a302de4c9..5043ef5bb55b 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -25,6 +25,8 @@ #include "oox/helper/attributelist.hxx" #include "drawingml/embeddedwavaudiofile.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 763807107dda..f111ef4da50a 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index b0b36fa6547b..4dd8814688f0 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -32,6 +32,8 @@ #include "oox/drawingml/shapepropertymap.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/graphichelper.hxx" +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace vml { diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index b58248f7e810..4c5f54c77df0 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/properties.hxx> #include <oox/token/tokens.hxx> #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmlshapecontainer.hxx" diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index 662fdb49695e..2db802ce16bb 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -20,6 +20,8 @@ #include "oox/vml/vmlformatting.hxx" #include "oox/vml/vmltextboxcontext.hxx" #include "oox/vml/vmlshape.hxx" +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <osl/diagnose.h> diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 3227c1115ca0..ee28dbaeafc1 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SC_SOURCE_FILTER_INC_AUTOFILTERBUFFER_HXX #include <com/sun/star/table/CellRangeAddress.hpp> +#include <oox/helper/helper.hxx> #include <oox/helper/refvector.hxx> #include "workbookhelper.hxx" diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index b659394acb0f..bc1687e385bc 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -19,6 +19,7 @@ #include "autofilterbuffer.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/FilterConnection.hpp> #include <com/sun/star/sheet/FilterOperator2.hpp> #include <com/sun/star/sheet/TableFilterField3.hpp> @@ -30,7 +31,9 @@ #include <oox/helper/attributelist.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "defnamesbuffer.hxx" diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 55c3267c1031..c75c0dc5403e 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -20,6 +20,8 @@ #include "chartsheetfragment.hxx" #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "pagesettings.hxx" #include "viewsettings.hxx" diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 15de0690088d..8fa327751738 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -22,6 +22,7 @@ #include "commentsbuffer.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp> #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp> #include <com/sun/star/sheet/XSheetAnnotations.hpp> diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index e998b500697d..50eb8da79d7f 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -31,6 +31,7 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "stylesbuffer.hxx" diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 519c90e1f51a..511575a33f61 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -21,6 +21,8 @@ #include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" namespace oox { diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 61de65374a9e..504c7ec5cbdc 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -20,6 +20,8 @@ #include "connectionsfragment.hxx" #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "biffhelper.hxx" #include "connectionsbuffer.hxx" diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 6c22d33e7ca0..e22d4b60409f 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -30,6 +30,7 @@ #include <rtl/ustrbuf.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "externallinkbuffer.hxx" diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 08b10c43b6e3..eae05aac6241 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -25,7 +25,9 @@ #include <oox/helper/binaryinputstream.hxx> #include "unitconverter.hxx" #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace xls { diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 5c872c7ffea5..91c68bcc95b9 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -21,6 +21,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/drawing/XControlShape.hpp> @@ -35,6 +36,9 @@ #include <oox/drawingml/graphicshapecontext.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include <oox/vml/vmlshape.hxx> #include <oox/vml/vmlshapecontainer.hxx> #include "formulaparser.hxx" diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 1dfd8ee68cab..4a0ba64065ee 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -21,6 +21,7 @@ #include <list> #include <set> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index 3014da75ad15..00defc2184be 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -19,6 +19,7 @@ #include "externallinkbuffer.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/ComplexReference.hpp> #include <com/sun/star/sheet/DDELinkInfo.hpp> #include <com/sun/star/sheet/ExternalLinkType.hpp> @@ -34,7 +35,9 @@ #include <rtl/strbuf.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "excelhandlers.hxx" diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index 5b56b2a9db53..8246bec39917 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -21,6 +21,8 @@ #include <com/sun/star/sheet/XExternalSheetCache.hpp> #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "defnamesbuffer.hxx" #include "sheetdatacontext.hxx" diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index a0b1350ee3c4..e0b445f075fa 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -20,6 +20,7 @@ #include "formulabase.hxx" #include <map> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/sheet/AddressConvention.hpp> diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index f3825c214e84..cc8ede8ccb18 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -36,6 +36,8 @@ #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertymap.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "scitems.hxx" #include "document.hxx" diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 693722f0bd68..f9f733c47bf1 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -37,6 +37,9 @@ #include <oox/helper/graphichelper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "excelhandlers.hxx" #include "stylesbuffer.hxx" diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 8953be692e14..c7b75e3b3a5c 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -20,6 +20,7 @@ #include "pivotcachebuffer.hxx" #include <set> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -32,7 +33,9 @@ #include <oox/helper/attributelist.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "defnamesbuffer.hxx" #include "excelhandlers.hxx" diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 0ca92404a102..cf230fa417da 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -21,6 +21,8 @@ #include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "formulabuffer.hxx" diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 7aa21b4d06ba..bc3c05ce8c82 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -42,6 +42,7 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index c1c45e790b70..bc09a62754f6 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -19,6 +19,7 @@ #include "querytablebuffer.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/sheet/XAreaLink.hpp> #include <com/sun/star/sheet/XAreaLinks.hpp> @@ -26,6 +27,7 @@ #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "connectionsbuffer.hxx" diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index c88d76e80af3..b79f5e582b86 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -19,11 +19,13 @@ #include "richstring.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XText.hpp> #include <rtl/ustrbuf.hxx> #include <editeng/editobj.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "editutil.hxx" diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 6eb69b99e7f4..cde1f47152e6 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -19,6 +19,7 @@ #include "scenariobuffer.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sheet/XScenario.hpp> #include <com/sun/star/sheet/XScenarios.hpp> @@ -29,6 +30,7 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 3909e38851df..bad8050d035a 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -38,6 +38,7 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 4bdace5083c3..df763c1383d9 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/text/XText.hpp> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "formulaparser.hxx" diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 553b44eadc75..f5cc9348bceb 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -64,6 +64,9 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "condformatbuffer.hxx" #include "excelhandlers.hxx" diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index 608e2fd8b8d5..954f5d857d8a 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -20,6 +20,8 @@ #include "stylesfragment.hxx" #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> namespace oox { namespace xls { diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 9358d7536911..321870118668 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -19,6 +19,7 @@ #include "tablebuffer.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XDatabaseRange.hpp> #include <com/sun/star/sheet/XDatabaseRanges.hpp> #include <osl/diagnose.h> @@ -26,6 +27,7 @@ #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" namespace oox { diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx index d95abe05e2b2..1cbb50205268 100644 --- a/sc/source/filter/oox/tablecolumnsbuffer.cxx +++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx @@ -26,6 +26,7 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "defnamesbuffer.hxx" diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index eae62818f58b..a220024d3bf5 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/XFont.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <osl/diagnose.h> diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 8aad4362501e..c8d183ff8ab7 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/document/IndexedPropertyValues.hpp> @@ -34,6 +35,8 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" #include "unitconverter.hxx" diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index a207fed165ef..52b71406ee97 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -27,6 +27,8 @@ #include <oox/helper/progressbar.hxx> #include <oox/helper/propertyset.hxx> #include <oox/ole/olestorage.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "chartsheetfragment.hxx" diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 8115be5a2433..a12491f299c1 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -40,6 +40,7 @@ #include <oox/helper/progressbar.hxx> #include <oox/helper/propertyset.hxx> #include <oox/ole/vbaproject.hxx> +#include <oox/token/properties.hxx> #include <vcl/msgbox.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index 831314fcbbba..df3d1b2c5e82 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -29,6 +29,7 @@ #include <oox/helper/propertyset.hxx> #include <oox/core/xmlfilterbase.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "unitconverter.hxx" diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 8a5ef92a0299..dfbd097510a5 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -31,7 +31,9 @@ #include <oox/helper/attributelist.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "excelhandlers.hxx" #include "document.hxx" diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index dd6597f4ab16..7984ae6c325c 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -22,6 +22,8 @@ #include <oox/core/filterbase.hxx> #include <oox/core/relations.hxx> #include <oox/helper/attributelist.hxx> +#include <oox/token/namespaces.hxx> +#include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "autofilterbuffer.hxx" #include "autofiltercontext.hxx" diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 38da31387d25..927b6a0d5caa 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/properties.hxx> #include <oox/token/tokens.hxx> #include "addressconverter.hxx" #include "autofilterbuffer.hxx" diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 33bd72d262e7..0651c455884b 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -23,6 +23,7 @@ #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> #include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> #include "biffinputstream.hxx" #include "pagesettings.hxx" #include "workbooksettings.hxx" diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 56b99fce863f..598bddd4c7fb 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -9,6 +9,7 @@ #include <rtfsdrimport.hxx> #include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/LineStyle.hpp> |