diff options
Diffstat (limited to 'oox')
68 files changed, 159 insertions, 2 deletions
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index b238a4a984a8..75f6a10d701c 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 b7b197c01d0c..d3323e59f74b 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 f9040697d204..590a44e78226 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 3ff9eed37438..40bd20a469d1 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 ba106e12adda..918a7fd3ad6e 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 f9a32794ef1a..7cb89b14ffcf 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 4dabec2da288..8f8cd9bd68eb 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 676a9c4b94d6..5481db50f819 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 4e86209951d1..693432fc1a7b 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 b9120693e736..b4c43f229f7e 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 5daef0069eac..3fe231036721 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 8bc82e0ec96d..c7f9cdd33504 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 83893cb55f8c..f5854df6a86e 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 f821755d50a1..05c843045383 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 ea16e1b0c697..5c449ad3ad1a 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 c0016ba0e2d9..5e309a5dc75d 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 db5de738dd13..a36e68d4bdfb 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 06ae7cc13149..e4f22a9a16dc 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 f93183a8f18b..0e3c44dbd371 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 56d76c83603f..77f5c856da0e 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 ee1c0c45cc2d..78079e92a86a 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 9037232dcdeb..a8b91e7bf0ad 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 03f346c70051..b03e6a5bb5a2 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 92f6e4e1883f..d17708c10d4d 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 1ceb8dce9094..0ab6a6d01a9a 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 e48ac5f6c605..a86d7c0237e2 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 a1d19b2842b1..01045b1f0d6d 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 e0ac8b005152..930c594e9147 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 3f84106dd42e..b12cdc9d136d 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 119b28c242d0..4df26bbc1e41 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 8ba813972408..4f076f4bb9d2 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 8195a6dd75a3..4112ce8568be 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 551eb50431de..76f5a7a292e7 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 4651c091f6ba..48608d902c6a 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 7262a4282584..b7c7afe10e84 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 84fc7690b331..d252b5782fb5 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 1badb7322917..01ad1959c5a1 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 d0ea8aa95506..91301cbd064d 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 54c81e78083d..9627333164a4 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 ef0556d3036d..fc6dfd813139 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 831ac13fa72e..46da6a23c175 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 dc142f7c3269..cfa6ae46b931 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 5b80dc4e7b06..172298600a1a 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 f538da8d28a3..4a76adc9e2f6 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 0e0cc9b19730..0173d3794105 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 c2c8ef219553..ffafb35dc417 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 3fad584397e3..d6e6781961cc 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 e45b98befb40..e5957c410671 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 fadfec2f90ac..eae641e4a63d 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 40c8f2a92853..09af2df9e1cc 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 36f5d76976f6..8fca4056eb64 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 2cfe35593207..3e484065ddf2 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 4ba58afed37c..06a173b0d760 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 307406d241e5..02260aa24d08 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 1fe841ff5edc..5447114339c1 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 d8c4735e2eec..63274c10c236 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 876f495c041e..600c95d0acf9 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 f5278688b27f..9064a67aecf7 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 922b3ae92123..531bf8cb8276 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 dee91bd649e8..eebaee7af70f 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 61728b248b16..93e5716c1ec5 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 6e256ac21274..3613baf3ff25 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 2a86ae08b88a..9356bc2a01f9 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 e343bd5cb8db..bfdeb26e540c 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 ea596c804221..738f2e10251a 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 17dcd9c77a58..c1bed09b73fd 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 e6456065628e..34527f06a4fc 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 f1932277d06e..dc654223aca6 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" |