diff options
Diffstat (limited to 'oox/source')
86 files changed, 183 insertions, 157 deletions
diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx index 5f3e7fc85a76..8d710955db6e 100644 --- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx +++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx @@ -7,9 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "oox/drawingml/ThemeOverrideFragmentHandler.hxx" +#include <drawingml/ThemeOverrideFragmentHandler.hxx> #include "oox/drawingml/theme.hxx" -#include "oox/drawingml/themeelementscontext.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 c4145043f2c2..295b25f76fe1 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/axiscontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/axismodel.hxx" #include "drawingml/chart/titlecontext.hxx" diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx index f489c2f41e7a..74bc6c112dd2 100644 --- a/oox/source/drawingml/chart/chartcontextbase.cxx +++ b/oox/source/drawingml/chart/chartcontextbase.cxx @@ -20,7 +20,7 @@ #include "drawingml/chart/chartcontextbase.hxx" #include "oox/drawingml/chart/modelbase.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 40ea77a402d7..7117877618b4 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/chartspacefragment.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/chartspacemodel.hxx" #include "drawingml/chart/plotareacontext.hxx" #include "drawingml/chart/titlecontext.hxx" diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx index c1a9c6c5c1cc..a1c107e28c48 100644 --- a/oox/source/drawingml/chart/chartspacemodel.cxx +++ b/oox/source/drawingml/chart/chartspacemodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/chartspacemodel.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 abf5bcb78c20..d0ab4c0bf956 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -27,8 +27,8 @@ #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" #include "oox/drawingml/theme.hxx" #include "drawingml/chart/chartspacemodel.hxx" #include "oox/helper/modelobjecthelper.hxx" diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx index 738fa92b79b5..53cb1ae9c9ee 100644 --- a/oox/source/drawingml/chart/plotareacontext.cxx +++ b/oox/source/drawingml/chart/plotareacontext.cxx @@ -19,7 +19,7 @@ #include "drawingml/chart/plotareacontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" #include "drawingml/chart/axiscontext.hxx" #include "drawingml/chart/plotareamodel.hxx" #include "drawingml/chart/seriescontext.hxx" diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 9646851f35cc..e9002f406d8d 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/seriescontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/datasourcecontext.hxx" #include "drawingml/chart/seriesmodel.hxx" #include "drawingml/chart/titlecontext.hxx" diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx index 8daa50a16c22..5507384a8563 100644 --- a/oox/source/drawingml/chart/seriesmodel.cxx +++ b/oox/source/drawingml/chart/seriesmodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/seriesmodel.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index 0a627ee6c931..e589335ed649 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/titlecontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/datasourcecontext.hxx" #include "drawingml/chart/titlemodel.hxx" diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 29dc019bfb02..844aa0a62034 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -26,8 +26,8 @@ #include <com/sun/star/chart2/XLegend.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XTitled.hpp> -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" #include "drawingml/chart/datasourceconverter.hxx" #include "drawingml/chart/titlemodel.hxx" #include "oox/helper/containerhelper.hxx" diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx index 614f212d0a76..3ca7f5d58cd9 100644 --- a/oox/source/drawingml/chart/titlemodel.cxx +++ b/oox/source/drawingml/chart/titlemodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/titlemodel.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx index 30f1cccd9321..f27f6dac9341 100644 --- a/oox/source/drawingml/chart/typegroupmodel.cxx +++ b/oox/source/drawingml/chart/typegroupmodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/typegroupmodel.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 83244bed6856..d16a14f5992a 100644 --- a/oox/source/drawingml/clrschemecontext.cxx +++ b/oox/source/drawingml/clrschemecontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/clrschemecontext.hxx" +#include "drawingml/clrschemecontext.hxx" #include "oox/core/xmlfilterbase.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index e255fcbd6fa7..3236c5adafb1 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -18,7 +18,7 @@ */ #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/color.hxx" diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx index 4fa115aa99fa..03f346c70051 100644 --- a/oox/source/drawingml/connectorshapecontext.cxx +++ b/oox/source/drawingml/connectorshapecontext.cxx @@ -25,8 +25,8 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 87d330447fa5..6868e2c3d5d3 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/customshapegeometry.hxx" +#include "drawingml/customshapegeometry.hxx" +#include <drawingml/customshapeproperties.hxx> #include <com/sun/star/xml/sax/FastToken.hpp> #include <boost/unordered_map.hpp> diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 85d87cba669b..78d0af10fff8 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -12,7 +12,7 @@ #include <tools/stream.hxx> #include <comphelper/sequenceasvector.hxx> -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index efaddba265a5..5758d7996592 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index ef8f9e4ab9cd..b5b6dffa1f7a 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -19,9 +19,9 @@ #include "datamodelcontext.hxx" #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 4d6a421868d4..1c53d7497129 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -26,9 +26,9 @@ #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> #include <rtl/ustrbuf.hxx> #include <editeng/unoprnms.hxx> -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" -#include "oox/drawingml/textrun.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" +#include "drawingml/textrun.hxx" #include "drawingml/diagram/diagram.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 2b811f91f408..9ef921516c73 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -30,6 +30,7 @@ #include "oox/drawingml/shape.hxx" #include "oox/drawingml/fillproperties.hxx" +#include <oox/token/tokens.hxx> namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XDocument; } } diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 59b183634e97..f1c3cb7cddf5 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -22,7 +22,7 @@ #include "diagramdefinitioncontext.hxx" #include "diagramfragmenthandler.hxx" #include "datamodelcontext.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index f1692ec30fb0..049f409d4120 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -27,10 +27,10 @@ #include "oox/helper/attributelist.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" -#include "oox/drawingml/textrun.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" +#include "drawingml/textrun.hxx" +#include "drawingml/customshapeproperties.hxx" #include "layoutnodecontext.hxx" using namespace ::com::sun::star; diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 4612fcbf9cb5..facfda417762 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -22,7 +22,7 @@ #include "oox/helper/attributelist.hxx" #include "drawingml/diagram/diagram.hxx" #include "oox/drawingml/shapecontext.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "diagramdefinitioncontext.hxx" #include "constraintlistcontext.hxx" diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index 7d6549cc0785..d1d0cd9e935a 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -10,7 +10,7 @@ #include "effectpropertiescontext.hxx" #include "effectproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx index 6b2f29ef8fd4..c15bc7c56b5c 100644 --- a/oox/source/drawingml/embeddedwavaudiofile.cxx +++ b/oox/source/drawingml/embeddedwavaudiofile.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 8401d7a294fb..109fc23a2216 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -20,7 +20,8 @@ #include <iterator> #include <boost/utility.hpp> -#include "oox/drawingml/fillproperties.hxx" +#include <oox/drawingml/fillproperties.hxx> +#include <drawingml/graphicproperties.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx index e60f68947738..a45dd787670d 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index f753783a3737..e78a3e26d710 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -21,8 +21,9 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include <osl/diagnose.h> -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/graphicproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "drawingml/diagram/diagram.hxx" #include "drawingml/table/tablecontext.hxx" #include "oox/core/xmlfilterbase.hxx" @@ -33,7 +34,7 @@ #include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshapecontainer.hxx" #include "oox/drawingml/fillproperties.hxx" -#include "oox/drawingml/transform2dcontext.hxx" +#include "drawingml/transform2dcontext.hxx" #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" diff --git a/oox/source/drawingml/guidcontext.cxx b/oox/source/drawingml/guidcontext.cxx index 0e000d799e6a..89eff0594f8a 100644 --- a/oox/source/drawingml/guidcontext.cxx +++ b/oox/source/drawingml/guidcontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/guidcontext.hxx" +#include "drawingml/guidcontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 6e648dc5ba5b..b2774d1784b1 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -24,7 +24,7 @@ #include "oox/helper/propertymap.hxx" #include "oox/core/relations.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx index 45a4a0eb8abb..bc5395dab4d7 100644 --- a/oox/source/drawingml/linepropertiescontext.cxx +++ b/oox/source/drawingml/linepropertiescontext.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/linepropertiescontext.hxx" +#include "drawingml/linepropertiescontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/objectdefaultcontext.cxx b/oox/source/drawingml/objectdefaultcontext.cxx index 7b1e40c19e5f..0b1024152990 100644 --- a/oox/source/drawingml/objectdefaultcontext.cxx +++ b/oox/source/drawingml/objectdefaultcontext.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/objectdefaultcontext.hxx" -#include "oox/drawingml/spdefcontext.hxx" +#include "drawingml/objectdefaultcontext.hxx" +#include "drawingml/spdefcontext.hxx" #include "oox/drawingml/theme.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx index c8d9dd5a8386..2514d8f348b6 100644 --- a/oox/source/drawingml/scene3dcontext.cxx +++ b/oox/source/drawingml/scene3dcontext.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/scene3dcontext.hxx" +#include "drawingml/scene3dcontext.hxx" #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 8545307558f5..099feb0e6bc2 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -18,14 +18,16 @@ */ #include "oox/drawingml/shape.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "oox/drawingml/theme.hxx" #include "oox/drawingml/fillproperties.hxx" +#include "drawingml/graphicproperties.hxx" +#include <drawingml/scene3dcontext.hxx> #include "oox/drawingml/lineproperties.hxx" #include "effectproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/ThemeOverrideFragmentHandler.hxx" +#include "drawingml/textbody.hxx" +#include <drawingml/ThemeOverrideFragmentHandler.hxx> #include "drawingml/table/tableproperties.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include "drawingml/chart/chartspacefragment.hxx" diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx index 2060f18c52ff..38b26c761e3e 100644 --- a/oox/source/drawingml/shape3dproperties.cxx +++ b/oox/source/drawingml/shape3dproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/shape3dproperties.hxx" +#include "drawingml/shape3dproperties.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index 536bbc7d4d4a..5bb38a4f9581 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -25,13 +25,14 @@ #include "oox/helper/attributelist.hxx" #include "oox/drawingml/shapecontext.hxx" -#include "oox/drawingml/shapestylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include <drawingml/shapepropertiescontext.hxx> +#include "drawingml/shapestylecontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/textbodypropertiescontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/textbodypropertiescontext.hxx" #include "hyperlinkcontext.hxx" using namespace oox::core; diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index f4e045437206..a1ae52d367c1 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -27,8 +27,9 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include <drawingml/shapepropertiescontext.hxx> +#include "drawingml/textbodycontext.hxx" using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index 9eb71b2ba08a..e0ac8b005152 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/shapepropertiescontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/drawing/LineStyle.hpp> @@ -25,11 +25,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNamed.hpp> -#include "oox/drawingml/scene3dcontext.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/transform2dcontext.hxx" -#include "oox/drawingml/customshapegeometry.hxx" +#include "drawingml/scene3dcontext.hxx" +#include "drawingml/linepropertiescontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/transform2dcontext.hxx" +#include "drawingml/customshapegeometry.hxx" #include "effectpropertiescontext.hxx" using namespace oox::core; diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx index aeb6278b3ec7..1f805f8bd46a 100644 --- a/oox/source/drawingml/shapestylecontext.cxx +++ b/oox/source/drawingml/shapestylecontext.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/shapestylecontext.hxx" +#include "drawingml/shapestylecontext.hxx" #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/spdefcontext.cxx b/oox/source/drawingml/spdefcontext.cxx index 2b718334454d..3f84106dd42e 100644 --- a/oox/source/drawingml/spdefcontext.cxx +++ b/oox/source/drawingml/spdefcontext.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/spdefcontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textbodypropertiescontext.hxx" -#include "oox/drawingml/textliststylecontext.hxx" +#include "drawingml/spdefcontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textbodypropertiescontext.hxx" +#include "drawingml/textliststylecontext.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 a91da191476a..2281d0423041 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include "drawingml/table/tablebackgroundstylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 817caba51882..96cb28c47e93 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -21,7 +21,7 @@ #include "drawingml/table/tableproperties.hxx" #include <basegfx/color/bcolor.hxx> #include "oox/drawingml/shapepropertymap.hxx" -#include "oox/drawingml/textbody.hxx" +#include "drawingml/textbody.hxx" #include "oox/drawingml/theme.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index c0de51f552e5..b0df1663c10e 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -20,9 +20,9 @@ #include <osl/diagnose.h> #include "drawingml/table/tablecellcontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/linepropertiescontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 52edb76fb6e9..ac6a8624a40a 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -19,7 +19,7 @@ #include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/guidcontext.hxx" +#include "drawingml/guidcontext.hxx" #include "drawingml/table/tablecontext.hxx" #include "drawingml/table/tableproperties.hxx" #include "drawingml/table/tablestylecontext.hxx" diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index a318a0ae91a3..ef9be244dfe0 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -20,8 +20,8 @@ #include <osl/diagnose.h> #include "drawingml/table/tablestylecellstylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/linepropertiescontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index 93277fc15b32..f1e64ff76e13 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include "drawingml/table/tablestyletextstylecontext.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 9e9d0ddd2c99..165b9dbdba0a 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textbody.hxx" +#include "drawingml/textbody.hxx" #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textparagraph.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index 9cfffdc186f9..4154e1bb727a 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/textbodypropertiescontext.hxx" -#include "oox/drawingml/textparagraph.hxx" -#include "oox/drawingml/textparagraphpropertiescontext.hxx" -#include "oox/drawingml/textcharacterpropertiescontext.hxx" -#include "oox/drawingml/textliststylecontext.hxx" -#include "oox/drawingml/textfield.hxx" -#include "oox/drawingml/textfieldcontext.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/textbodypropertiescontext.hxx" +#include "drawingml/textparagraph.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/textliststylecontext.hxx" +#include "drawingml/textfield.hxx" +#include "drawingml/textfieldcontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index 1c1b4f2f861c..9f146c67a32d 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/textbodyproperties.hxx" +#include "drawingml/textbodyproperties.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 80d82a0d6174..89167b666eb4 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textbodypropertiescontext.hxx" +#include "drawingml/textbodypropertiescontext.hxx" #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -#include "oox/drawingml/textbodyproperties.hxx" +#include "drawingml/textbodyproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index d91988246695..d7a848d99ef1 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textcharacterproperties.hxx" +#include "drawingml/textcharacterproperties.hxx" #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 600f4727c582..87d884e98948 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" -#include "oox/drawingml/texteffectscontext.hxx" +#include "drawingml/colorchoicecontext.hxx" +#include "drawingml/texteffectscontext.hxx" #include "oox/drawingml/lineproperties.hxx" -#include "oox/drawingml/textparagraphproperties.hxx" +#include "drawingml/textparagraphproperties.hxx" #include "oox/core/relations.hxx" #include "hyperlinkcontext.hxx" diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx index a4cfd7ace713..e996e1a1afe8 100644 --- a/oox/source/drawingml/texteffectscontext.cxx +++ b/oox/source/drawingml/texteffectscontext.cxx @@ -8,7 +8,7 @@ * */ -#include "oox/drawingml/texteffectscontext.hxx" +#include "drawingml/texteffectscontext.hxx" #include <map> diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 55b538b0ee96..2523156ade0d 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textfield.hxx" +#include "drawingml/textfield.hxx" #include <list> @@ -30,8 +30,8 @@ #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/textparagraphproperties.hxx" -#include "oox/drawingml/textcharacterproperties.hxx" +#include "drawingml/textparagraphproperties.hxx" +#include "drawingml/textcharacterproperties.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textfieldcontext.cxx b/oox/source/drawingml/textfieldcontext.cxx index 8dcb14d3baeb..d0ea8aa95506 100644 --- a/oox/source/drawingml/textfieldcontext.cxx +++ b/oox/source/drawingml/textfieldcontext.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textfieldcontext.hxx" -#include "oox/drawingml/textparagraphpropertiescontext.hxx" -#include "oox/drawingml/textcharacterpropertiescontext.hxx" -#include "oox/drawingml/textfield.hxx" +#include "drawingml/textfieldcontext.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/textfield.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 2bda567cc115..742f020c2ace 100644 --- a/oox/source/drawingml/textfont.cxx +++ b/oox/source/drawingml/textfont.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textfont.hxx" +#include "drawingml/textfont.hxx" #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontPitch.hpp> #include "oox/drawingml/theme.hxx" diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 3a92b120ab64..29b359fdf97e 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textliststyle.hxx" +#include "drawingml/textliststyle.hxx" namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx index 117351bea284..b8ada9e836fb 100644 --- a/oox/source/drawingml/textliststylecontext.cxx +++ b/oox/source/drawingml/textliststylecontext.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textliststylecontext.hxx" -#include "oox/drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textliststylecontext.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 098a9415222f..ce6109983895 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textparagraph.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/textcharacterproperties.hxx" +#include "drawingml/textcharacterproperties.hxx" #include <rtl/ustring.hxx> #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 924a5e4d14e8..a7b5f6bfba84 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textparagraphproperties.hxx" +#include "drawingml/textparagraphproperties.hxx" #include <com/sun/star/text/XNumberingRulesSupplier.hpp> #include <com/sun/star/container/XIndexReplace.hpp> diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index 035f99ac2a0f..6c01a0a0e06e 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -25,8 +25,8 @@ #include <svx/unopage.hxx> -#include "oox/drawingml/colorchoicecontext.hxx" -#include "oox/drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/colorchoicecontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/helper/attributelist.hxx" #include "textspacingcontext.hxx" diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 99e40fc131af..b988522882dd 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textrun.hxx" +#include "drawingml/textrun.hxx" #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx index 8ef0caec6a83..ef0556d3036d 100644 --- a/oox/source/drawingml/textspacingcontext.cxx +++ b/oox/source/drawingml/textspacingcontext.cxx @@ -18,7 +18,7 @@ */ #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/textspacing.hxx" +#include "drawingml/textspacing.hxx" #include "textspacingcontext.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx index 31c3c1bd12cf..8f4b7bcd410e 100644 --- a/oox/source/drawingml/theme.cxx +++ b/oox/source/drawingml/theme.cxx @@ -18,6 +18,8 @@ */ #include "oox/drawingml/theme.hxx" +#include <oox/token/tokens.hxx> +#include <drawingml/textcharacterproperties.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index 0b6ab7a6b127..d28150b22362 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/themeelementscontext.hxx" -#include "oox/drawingml/clrschemecontext.hxx" +#include "drawingml/themeelementscontext.hxx" +#include "drawingml/clrschemecontext.hxx" #include "oox/drawingml/lineproperties.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" +#include "drawingml/linepropertiescontext.hxx" #include "oox/drawingml/fillproperties.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/textcharacterproperties.hxx" #include "oox/drawingml/theme.hxx" #include "oox/helper/attributelist.hxx" #include "effectproperties.hxx" diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx index b0f4f85a3a8d..edb044bbd823 100644 --- a/oox/source/drawingml/themefragmenthandler.cxx +++ b/oox/source/drawingml/themefragmenthandler.cxx @@ -18,9 +18,9 @@ */ #include "oox/drawingml/themefragmenthandler.hxx" -#include "oox/drawingml/objectdefaultcontext.hxx" +#include "drawingml/objectdefaultcontext.hxx" #include "oox/drawingml/theme.hxx" -#include "oox/drawingml/themeelementscontext.hxx" +#include "drawingml/themeelementscontext.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index d3f7f5ee4df3..a6a39eb60b0a 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/transform2dcontext.hxx" +#include "drawingml/transform2dcontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/shape.hxx" -#include "oox/drawingml/textbody.hxx" +#include "drawingml/customshapeproperties.hxx" +#include "drawingml/textbody.hxx" using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index bc5aca0e262c..92cb578e83a6 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -29,7 +29,7 @@ #include "oox/helper/attributelist.hxx" #include "oox/core/fragmenthandler.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "pptfilterhelpers.hxx" using namespace ::oox::core; diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx index e081a7552965..c2c8ef219553 100644 --- a/oox/source/ppt/backgroundproperties.cxx +++ b/oox/source/ppt/backgroundproperties.cxx @@ -18,7 +18,7 @@ */ #include "oox/ppt/backgroundproperties.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/core/contexthandler2.hxx" diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 9af11a27d0c9..678fb71daecf 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -23,6 +23,7 @@ #include "drawingml/diagram/diagram.hxx" #include "oox/dump/pptxdumper.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index 229867d1b7f7..c31cc55b1455 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -27,13 +27,13 @@ #include "oox/ppt/pptgraphicshapecontext.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" -#include "oox/drawingml/shapestylecontext.hxx" +#include "drawingml/shapestylecontext.hxx" #include "oox/token/namespaces.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" #include <oox/token/tokens.hxx> using namespace oox::core; diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index d02612860ce3..f454f4487fe9 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -19,7 +19,7 @@ #include "oox/ppt/pptshape.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/textbody.hxx" +#include "drawingml/textbody.hxx" #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index c0117aa85b5d..e5e0fce1c634 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -28,13 +28,13 @@ #include "oox/ppt/pptshapecontext.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" -#include "oox/drawingml/shapestylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/shapestylecontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/transform2dcontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/transform2dcontext.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 9bf3d2bd5383..fb6f7803307c 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -29,8 +29,9 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/fillproperties.hxx" #include "extdrawingfragmenthandler.hxx" diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index 77ba83c32f7c..cf1278320ccb 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -26,12 +26,12 @@ #include "oox/ppt/pptshape.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" -#include "oox/drawingml/shapestylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/shapestylecontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.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 a0eb00152436..bef84de51bd6 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -35,7 +35,7 @@ #include "oox/drawingml/theme.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/themefragmenthandler.hxx" -#include "oox/drawingml/textliststylecontext.hxx" +#include "drawingml/textliststylecontext.hxx" #include "oox/ppt/pptshape.hxx" #include "oox/ppt/presentationfragmenthandler.hxx" #include "oox/ppt/slidefragmenthandler.hxx" diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 70c9472395d8..0edece08f800 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -35,7 +35,8 @@ #include "oox/ppt/pptshape.hxx" #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmldrawingfragment.hxx" -#include "oox/drawingml/clrschemecontext.hxx" +#include "drawingml/clrschemecontext.hxx" +#include "drawingml/textliststyle.hxx" #include "oox/ppt/pptimport.hxx" using namespace ::com::sun::star; diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx index 71f67677ce0a..876f495c041e 100644 --- a/oox/source/ppt/slidemastertextstylescontext.cxx +++ b/oox/source/ppt/slidemastertextstylescontext.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textliststyle.hxx" -#include "oox/drawingml/textliststylecontext.hxx" +#include "drawingml/textliststyle.hxx" +#include "drawingml/textliststylecontext.hxx" #include "oox/ppt/slidemastertextstylescontext.hxx" using namespace ::oox::core; diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index b13c5f7eb889..54b28e6ad96a 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -22,9 +22,12 @@ #include "oox/ppt/slidepersist.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" +#include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" #include "oox/vml/vmldrawing.hxx" #include "oox/core/xmlfilterbase.hxx" +#include "drawingml/textliststyle.hxx" +#include "drawingml/textparagraphproperties.hxx" #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 9d72e3ebeff1..0996fdb3f947 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -24,7 +24,7 @@ #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.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 a2ab7dce42e3..5f3db9acde88 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -41,7 +41,7 @@ #include "oox/helper/attributelist.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/ppt/slidetransition.hxx" #include "animvariantcontext.hxx" diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 93e3dd0d5578..230dd89558ed 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/uno/Any.hxx> #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index 9b62fef85897..4cbf200f8ce2 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -8,7 +8,7 @@ */ #include "WpgContext.hxx" -#include <oox/drawingml/shapepropertiescontext.hxx> +#include <drawingml/shapepropertiescontext.hxx> #include <oox/drawingml/shapegroupcontext.hxx> #include <oox/drawingml/graphicshapecontext.hxx> diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index fb42e6268394..4d5863873fd5 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -8,11 +8,15 @@ */ #include "WpsContext.hxx" -#include <oox/drawingml/shapepropertiescontext.hxx> -#include <oox/drawingml/shapestylecontext.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 <oox/drawingml/drawingmltypes.hxx> +#include <boost/optional.hpp> + using namespace com::sun::star; namespace oox |