From 4bf7614503292fe69d3e5835621c1cdcaa4536cb Mon Sep 17 00:00:00 2001 From: Jorenz Paragas Date: Sat, 7 May 2016 14:17:24 -0700 Subject: 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 Reviewed-by: Michael Stahl --- oox/source/ppt/animvariantcontext.cxx | 2 ++ oox/source/ppt/buildlistcontext.cxx | 2 ++ oox/source/ppt/commontimenodecontext.cxx | 2 ++ oox/source/ppt/conditioncontext.cxx | 2 ++ oox/source/ppt/headerfootercontext.cxx | 1 + oox/source/ppt/pptshapecontext.cxx | 3 +++ oox/source/ppt/pptshapegroupcontext.cxx | 2 ++ oox/source/ppt/pptshapepropertiescontext.cxx | 1 + oox/source/ppt/slidefragmenthandler.cxx | 1 + oox/source/ppt/slidepersist.cxx | 1 + oox/source/ppt/slidetimingcontext.cxx | 3 +++ oox/source/ppt/slidetransition.cxx | 5 +++-- oox/source/ppt/slidetransitioncontext.cxx | 2 ++ oox/source/ppt/soundactioncontext.cxx | 3 +++ oox/source/ppt/timenodelistcontext.cxx | 2 ++ oox/source/ppt/timetargetelementcontext.cxx | 2 ++ 16 files changed, 32 insertions(+), 2 deletions(-) (limited to 'oox/source/ppt') 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 +#include 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 #include "oox/helper/attributelist.hxx" +#include +#include 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 #include "oox/drawingml/drawingmltypes.hxx" +#include +#include #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 +#include #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 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 +#include +#include 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 +#include 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 +#include #include 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 +#include #include 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 #include #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 +#include + 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 +#include +#include #include 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 +#include 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 +#include +#include 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 +#include #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 +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -- cgit