Move two include files to oox/inc as they are used only in oox

Change-Id: Ie13614c1977f45aa8086f4db65ca86b7d9212735

35 files changed, 296 insertions, 42 deletions

diff --git a/oox/inc/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx
new file mode 100644
index 000000000000..15b503161440
--- /dev/null
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_OOX_INC_DRAWINGML_FILLPROPERTIES_HXX
+#define INCLUDED_OOX_INC_DRAWINGML_FILLPROPERTIES_HXX
+
+#include <map>
+
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
+#include <oox/drawingml/color.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/ole/oleobjecthelper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace graphic { class XGraphic; }
+} } }
+
+namespace oox {
+    class GraphicHelper;
+}
+
+namespace oox {
+namespace drawingml {
+
+class ShapePropertyMap;
+
+struct GradientFillProperties
+{
+    typedef ::std::map< double, Color > GradientStopMap;
+
+    GradientStopMap     maGradientStops;        /// Gradient stops (colors/transparence).
+    OptValue< css::geometry::IntegerRectangle2D > moFillToRect;
+    OptValue< css::geometry::IntegerRectangle2D > moTileRect;
+    OptValue< sal_Int32 > moGradientPath;       /// If set, gradient follows rectangle, circle, or shape.
+    OptValue< sal_Int32 > moShadeAngle;         /// Rotation angle of linear gradients.
+    OptValue< sal_Int32 > moShadeFlip;          /// Flip mode of gradient, if not stretched to shape.
+    OptValue< bool >    moShadeScaled;          /// True = scale gradient into shape.
+    OptValue< bool >    moRotateWithShape;      /// True = rotate gradient with shape.
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const GradientFillProperties& rSourceProps );
+};
+
+struct PatternFillProperties
+{
+    Color               maPattFgColor;          /// Pattern foreground color.
+    Color               maPattBgColor;          /// Pattern background color.
+    OptValue< sal_Int32 > moPattPreset;         /// Preset pattern type.
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const PatternFillProperties& rSourceProps );
+};
+
+struct ArtisticEffectProperties
+{
+    OUString            msName;
+    std::map< OUString, css::uno::Any >
+                        maAttribs;
+    ::oox::ole::OleObjectInfo mrOleObjectInfo;  /// The original graphic as embedded object.
+
+    bool                isEmpty() const;
+
+    /** Returns the struct as a PropertyValue with Name = msName and
+     *  Value = maAttribs as a Sequence< PropertyValue >. */
+    css::beans::PropertyValue getEffect();
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const ArtisticEffectProperties& rSourceProps );
+
+    /** Translate effect tokens to strings. */
+    static OUString     getEffectString( sal_Int32 nToken );
+
+    /** Translate effect strings to tokens. */
+    static sal_Int32    getEffectToken( const OUString& sName );
+};
+
+struct BlipFillProperties
+{
+    css::uno::Reference< css::graphic::XGraphic >
+                          mxGraphic;              /// The fill graphic.
+    OptValue< sal_Int32 > moBitmapMode;         /// Bitmap tile or stretch.
+    OptValue< css::geometry::IntegerRectangle2D >
+                          moFillRect;             /// Stretch fill offsets.
+    OptValue< css::geometry::IntegerRectangle2D >
+                          moClipRect;
+    OptValue< sal_Int32 > moTileOffsetX;        /// Width of bitmap tiles (EMUs).
+    OptValue< sal_Int32 > moTileOffsetY;        /// Height of bitmap tiles (EMUs).
+    OptValue< sal_Int32 > moTileScaleX;         /// Horizontal scaling of bitmap tiles (1/1000 percent).
+    OptValue< sal_Int32 > moTileScaleY;         /// Vertical scaling of bitmap tiles (1/1000 percent).
+    OptValue< sal_Int32 > moTileAlign;          /// Anchor point inside bitmap.
+    OptValue< sal_Int32 > moTileFlip;           /// Flip mode of bitmap tiles.
+    OptValue< bool >      moRotateWithShape;      /// True = rotate bitmap with shape.
+    // effects
+    OptValue< sal_Int32 > moColorEffect;        /// XML token for a color effect.
+    OptValue< sal_Int32 > moBrightness;         /// Brightness in the range [-100000,100000].
+    OptValue< sal_Int32 > moContrast;           /// Contrast in the range [-100000,100000].
+    Color                 maColorChangeFrom;      /// Start color of color transformation.
+    Color                 maColorChangeTo;        /// Destination color of color transformation.
+    Color                 maDuotoneColors[2];     /// Duotone Colors
+
+    ArtisticEffectProperties maEffect;          /// Artistic effect, not supported by core.
+    OptValue<sal_Int32> moAlphaModFix; ///< Alpha Modulate Fixed Effect.
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const BlipFillProperties& rSourceProps );
+};
+
+struct OOX_DLLPUBLIC FillProperties
+{
+    OptValue< sal_Int32 > moFillType;           /// Fill type (OOXML token).
+    Color               maFillColor;            /// Solid fill color and transparence.
+    GradientFillProperties maGradientProps;     /// Properties for gradient fills.
+    PatternFillProperties maPatternProps;       /// Properties for pattern fills.
+    BlipFillProperties  maBlipProps;            /// Properties for bitmap fills.
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const FillProperties& rSourceProps );
+
+    /** Tries to resolve current settings to a solid color, e.g. returns the
+        start color of a gradient. */
+    Color               getBestSolidColor() const;
+
+    /** Writes the properties to the passed property map. */
+    void                pushToPropMap(
+                            ShapePropertyMap& rPropMap,
+                            const GraphicHelper& rGraphicHelper,
+                            sal_Int32 nShapeRotation = 0,
+                            sal_Int32 nPhClr = API_RGB_TRANSPARENT,
+                            bool bFlipH = false,
+                            bool bFlipV = false ) const;
+};
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
index b93249c14fe8..4c40ff371db1 100644
--- a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
+++ b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
@@ -21,7 +21,8 @@
 #define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
 
 #include <drawingml/colorchoicecontext.hxx>
-#include <oox/drawingml/fillproperties.hxx>
+
+#include "drawingml/fillproperties.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx
index e8f7222e1281..7bd18776a14b 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -24,9 +24,10 @@
 
 #include <com/sun/star/io/XInputStream.hpp>
 
-#include <oox/drawingml/fillproperties.hxx>
 #include <oox/helper/helper.hxx>
 
+#include "drawingml/fillproperties.hxx"
+
 namespace oox {
     class GraphicHelper;
     class PropertyMap;
diff --git a/oox/inc/drawingml/lineproperties.hxx b/oox/inc/drawingml/lineproperties.hxx
new file mode 100644
index 000000000000..edea5f6f1d1e
--- /dev/null
+++ b/oox/inc/drawingml/lineproperties.hxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_OOX_INC_DRAWINGML_LINEPROPERTIES_HXX
+#define INCLUDED_OOX_INC_DRAWINGML_LINEPROPERTIES_HXX
+
+#include <utility>
+#include <vector>
+
+#include <com/sun/star/drawing/LineJoint.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
+#include <oox/dllapi.h>
+#include <oox/helper/helper.hxx>
+#include <sal/types.h>
+
+#include "drawingml/fillproperties.hxx"
+
+namespace oox { class GraphicHelper; }
+
+namespace oox {
+namespace drawingml {
+
+class ShapePropertyMap;
+
+struct LineArrowProperties
+{
+    OptValue< sal_Int32 > moArrowType;
+    OptValue< sal_Int32 > moArrowWidth;
+    OptValue< sal_Int32 > moArrowLength;
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const LineArrowProperties& rSourceProps );
+};
+
+struct OOX_DLLPUBLIC LineProperties
+{
+    typedef ::std::pair< sal_Int32, sal_Int32 > DashStop;
+    typedef ::std::vector< DashStop >           DashStopVector;
+
+    LineArrowProperties maStartArrow;       /// Start line arrow style.
+    LineArrowProperties maEndArrow;         /// End line arrow style.
+    FillProperties      maLineFill;         /// Line fill (solid, gradient, ...).
+    DashStopVector      maCustomDash;       /// User-defined line dash style.
+    OptValue< sal_Int32 > moLineWidth;      /// Line width (EMUs).
+    OptValue< sal_Int32 > moPresetDash;     /// Preset dash (OOXML token).
+    OptValue< sal_Int32 > moLineCompound;   /// Line compound type (OOXML token).
+    OptValue< sal_Int32 > moLineCap;        /// Line cap (OOXML token).
+    OptValue< sal_Int32 > moLineJoint;      /// Line joint type (OOXML token).
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const LineProperties& rSourceProps );
+
+    /** Writes the properties to the passed property map. */
+    void                pushToPropMap(
+                            ShapePropertyMap& rPropMap,
+                            const GraphicHelper& rGraphicHelper,
+                            sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
+
+    /** Calculates the line style attribute from the internal state of the object */
+    css::drawing::LineStyle  getLineStyle() const;
+    /** Calculates the line joint attribute from the internal state of the object */
+    css::drawing::LineJoint  getLineJoint() const;
+    /** Calculates the line width attribute from the internal state of the object */
+    sal_Int32           getLineWidth() const;
+};
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index 313e153e7222..b44eeba006e0 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -23,11 +23,12 @@
 #include <oox/helper/propertymap.hxx>
 #include <oox/drawingml/color.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
-#include <oox/drawingml/lineproperties.hxx>
-#include <oox/drawingml/fillproperties.hxx>
 #include <drawingml/textliststyle.hxx>
 #include <com/sun/star/table/XCell.hpp>
 
+#include "drawingml/fillproperties.hxx"
+#include "drawingml/lineproperties.hxx"
+
 #include <vector>
 #include <map>
 
diff --git a/oox/inc/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx
index 8c29518d46c9..28e369719bf9 100644
--- a/oox/inc/drawingml/table/tablestylepart.hxx
+++ b/oox/inc/drawingml/table/tablestylepart.hxx
@@ -24,9 +24,11 @@
 #include <boost/optional.hpp>
 #include <oox/drawingml/color.hxx>
 #include <drawingml/textfont.hxx>
-#include <oox/drawingml/fillproperties.hxx>
-#include <oox/drawingml/lineproperties.hxx>
 #include <oox/drawingml/shape.hxx>
+
+#include "drawingml/fillproperties.hxx"
+#include "drawingml/lineproperties.hxx"
+
 #include <map>
 
 namespace oox { namespace drawingml { namespace table {
diff --git a/oox/inc/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx
index 055e58f758f7..ce41fef1a42f 100644
--- a/oox/inc/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/drawingml/textcharacterproperties.hxx
@@ -24,7 +24,8 @@
 #include <oox/helper/propertymap.hxx>
 #include <oox/drawingml/color.hxx>
 #include <drawingml/textfont.hxx>
-#include <oox/drawingml/fillproperties.hxx>
+
+#include "drawingml/fillproperties.hxx"
 
 namespace oox { class PropertySet; }
 
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 4522449e10c8..1bfc94757806 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -162,7 +162,9 @@
 #include <drawingml/colorchoicecontext.hxx>
 #include <drawingml/customshapegeometry.hxx>
 #include <drawingml/customshapeproperties.hxx>
+#include <drawingml/fillproperties.hxx>
 #include <drawingml/fillpropertiesgroupcontext.hxx>
+#include <drawingml/lineproperties.hxx>
 #include <drawingml/shapepropertiescontext.hxx>
 #include <drawingml/shapestylecontext.hxx>
 #include <drawingml/table/tablestylepart.hxx>
@@ -210,9 +212,7 @@
 #include <oox/drawingml/clrscheme.hxx>
 #include <oox/drawingml/color.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
-#include <oox/drawingml/fillproperties.hxx>
 #include <oox/drawingml/graphicshapecontext.hxx>
-#include <oox/drawingml/lineproperties.hxx>
 #include <oox/drawingml/shape.hxx>
 #include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/drawingml/shapepropertymap.hxx>
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 8e50f97a23da..18d6eb5961b7 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -35,7 +35,7 @@
 #include "drawingml/chart/axismodel.hxx"
 #include "drawingml/chart/titleconverter.hxx"
 #include "drawingml/chart/typegroupconverter.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 73c24da93f96..43bdcc0d8b1a 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -26,8 +26,8 @@
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
 #include "oox/core/xmlfilterbase.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/fillproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "drawingml/textbody.hxx"
 #include "drawingml/textparagraph.hxx"
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index d0ed206cd0b1..7233d67f009b 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -40,7 +40,7 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
-#include <oox/drawingml/lineproperties.hxx>
+#include "drawingml/lineproperties.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index c92ee47f03bd..5df326a75c35 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <osl/diagnose.h>
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "drawingml/chart/seriesconverter.hxx"
 #include "drawingml/chart/typegroupmodel.hxx"
 #include <oox/core/xmlfilterbase.hxx>
diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx
index c709d0f01a6b..284d193a3182 100644
--- a/oox/source/drawingml/connectorshapecontext.cxx
+++ b/oox/source/drawingml/connectorshapecontext.cxx
@@ -23,7 +23,7 @@
 
 #include "oox/drawingml/connectorshapecontext.hxx"
 #include "oox/drawingml/graphicshapecontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 45fcc1b7c4aa..9a60cd2336b1 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -30,7 +30,7 @@
 #include "drawingml/textparagraph.hxx"
 #include "drawingml/textrun.hxx"
 #include "drawingml/diagram/diagram.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "oox/ppt/pptshapegroupcontext.hxx"
 #include "oox/ppt/pptshape.hxx"
 
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 81a14bafb5fc..2e1429da37b0 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -27,7 +27,7 @@
 #include <rtl/ustring.hxx>
 
 #include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include <oox/token/tokens.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 6f014090490c..63ad0667f6f3 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -25,8 +25,8 @@
 #include <basegfx/numeric/ftools.hxx>
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/fillproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "drawingml/textbody.hxx"
 #include "drawingml/textparagraph.hxx"
 #include "drawingml/textrun.hxx"
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index fa2fa5a02943..6bdce225da98 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <oox/drawingml/fillproperties.hxx>
+#include "drawingml/fillproperties.hxx"
 
 #include <iterator>
 
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index 22d68faabeb9..805184e6cf3d 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -22,7 +22,7 @@
 #include "oox/helper/graphichelper.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 92c129faeb3d..201a989fd383 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -35,7 +35,7 @@
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/vml/vmlshapecontainer.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "drawingml/transform2dcontext.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index b6dd5973a900..dabe5d71356b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include <vector>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index 10ed9cf5cbc8..b77d66f66814 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -20,7 +20,7 @@
 #include "drawingml/linepropertiescontext.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/helper/attributelist.hxx"
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx
index 4f4fcb11697b..aeeb60c6d0cd 100644
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ b/oox/source/drawingml/scene3dcontext.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/anytostring.hxx>
 #include "drawingml/colorchoicecontext.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/attributelist.hxx"
 #include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b65ae15dbec7..54ebdfc33247 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -20,10 +20,10 @@
 #include "oox/drawingml/shape.hxx"
 #include "drawingml/customshapeproperties.hxx"
 #include "oox/drawingml/theme.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "drawingml/graphicproperties.hxx"
 #include <drawingml/scene3dcontext.hxx>
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "effectproperties.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "drawingml/textbody.hxx"
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 404656b54e66..686de1743838 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -28,7 +28,7 @@
 #include <drawingml/shapepropertiescontext.hxx>
 #include "drawingml/shapestylecontext.hxx"
 #include "drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/customshapegeometry.hxx"
 #include "drawingml/textbodycontext.hxx"
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx
index 7dff3f19ebfe..e7c39af3a619 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -25,7 +25,7 @@
 #include "oox/drawingml/shapegroupcontext.hxx"
 #include "oox/drawingml/connectorshapecontext.hxx"
 #include "oox/drawingml/graphicshapecontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/customshapegeometry.hxx"
 #include <drawingml/shapepropertiescontext.hxx>
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 3cb5bd028ee4..84ba8a044d0e 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -23,7 +23,7 @@
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/colorchoicecontext.hxx"
 #include "drawingml/texteffectscontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "drawingml/textparagraphproperties.hxx"
 #include "oox/core/relations.hxx"
 #include "hyperlinkcontext.hxx"
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index f040a9846ce9..9eb690191e28 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -26,7 +26,7 @@
 
 #include "drawingml/colorchoicecontext.hxx"
 #include "drawingml/textcharacterpropertiescontext.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "textspacingcontext.hxx"
 #include "texttabstoplistcontext.hxx"
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index 7f757476abd3..2ed435d59c7e 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -19,9 +19,9 @@
 
 #include "drawingml/themeelementscontext.hxx"
 #include "drawingml/clrschemecontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "drawingml/linepropertiescontext.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "drawingml/fillpropertiesgroupcontext.hxx"
 #include "drawingml/textcharacterproperties.hxx"
 #include "oox/drawingml/theme.hxx"
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 262e8eebd72d..084ce1aeac79 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -23,7 +23,7 @@
 #include "oox/export/drawingml.hxx"
 #include "oox/export/utils.hxx"
 #include <oox/drawingml/color.hxx>
-#include <oox/drawingml/fillproperties.hxx>
+#include <drawingml/fillproperties.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index bfe2a6cfdf31..29011d52aa58 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -29,7 +29,7 @@
 #include "oox/ppt/slidepersist.hxx"
 #include "drawingml/shapestylecontext.hxx"
 #include "drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/customshapegeometry.hxx"
 #include "drawingml/textbodycontext.hxx"
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 13a447b1224a..16c0eb2c70fb 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -30,7 +30,7 @@
 #include "oox/ppt/slidepersist.hxx"
 #include "drawingml/shapestylecontext.hxx"
 #include "drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/customshapegeometry.hxx"
 #include "drawingml/textbodycontext.hxx"
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 5208bd49e33e..1f36de8e87a0 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -29,13 +29,13 @@
 #include "oox/ppt/pptshapecontext.hxx"
 #include "oox/ppt/pptshapegroupcontext.hxx"
 #include "oox/drawingml/graphicshapecontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/customshapegeometry.hxx"
 #include "drawingml/shapepropertiescontext.hxx"
 #include "drawingml/textbodycontext.hxx"
 #include "oox/drawingml/connectorshapecontext.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "extdrawingfragmenthandler.hxx"
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx
index d00d9a96469a..c5ff7af04c29 100644
--- a/oox/source/ppt/pptshapepropertiescontext.cxx
+++ b/oox/source/ppt/pptshapepropertiescontext.cxx
@@ -28,7 +28,7 @@
 #include "oox/ppt/slidepersist.hxx"
 #include "drawingml/shapestylecontext.hxx"
 #include "drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "drawingml/customshapegeometry.hxx"
 #include "drawingml/textbodycontext.hxx"
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 3de25a809e2c..039e2e185cda 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -22,7 +22,7 @@
 #include "oox/ppt/timenode.hxx"
 #include "oox/ppt/pptshape.hxx"
 #include "oox/ppt/slidepersist.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include "drawingml/fillproperties.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/propertymap.hxx"
 #include "oox/helper/propertyset.hxx"
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 36cc43dea07d..27fa0f4486e9 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -27,8 +27,8 @@
 #include <osl/diagnose.h>
 #include "oox/drawingml/color.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/lineproperties.hxx"
+#include "drawingml/fillproperties.hxx"
+#include "drawingml/lineproperties.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/graphichelper.hxx"