[Libreoffice-commits] core.git: include/oox oox/inc oox/source

Tor Lillqvist tml at collabora.com
Tue Jan 24 16:56:05 UTC 2017 

 include/oox/drawingml/fillproperties.hxx                |  160 ----------------
 include/oox/drawingml/lineproperties.hxx                |   87 --------
 oox/inc/drawingml/fillproperties.hxx                    |  160 ++++++++++++++++
 oox/inc/drawingml/fillpropertiesgroupcontext.hxx        |    3 
 oox/inc/drawingml/graphicproperties.hxx                 |    3 
 oox/inc/drawingml/lineproperties.hxx                    |   88 ++++++++
 oox/inc/drawingml/table/tablecell.hxx                   |    5 
 oox/inc/drawingml/table/tablestylepart.hxx              |    6 
 oox/inc/drawingml/textcharacterproperties.hxx           |    3 
 oox/inc/pch/precompiled_oox.hxx                         |    4 
 oox/source/drawingml/chart/axisconverter.cxx            |    2 
 oox/source/drawingml/chart/objectformatter.cxx          |    4 
 oox/source/drawingml/chart/seriesconverter.cxx          |    2 
 oox/source/drawingml/chart/typegroupconverter.cxx       |    2 
 oox/source/drawingml/connectorshapecontext.cxx          |    2 
 oox/source/drawingml/diagram/diagram.cxx                |    2 
 oox/source/drawingml/diagram/diagram.hxx                |    2 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx     |    4 
 oox/source/drawingml/fillproperties.cxx                 |    2 
 oox/source/drawingml/fillpropertiesgroupcontext.cxx     |    2 
 oox/source/drawingml/graphicshapecontext.cxx            |    2 
 oox/source/drawingml/lineproperties.cxx                 |    2 
 oox/source/drawingml/linepropertiescontext.cxx          |    2 
 oox/source/drawingml/scene3dcontext.cxx                 |    2 
 oox/source/drawingml/shape.cxx                          |    4 
 oox/source/drawingml/shapecontext.cxx                   |    2 
 oox/source/drawingml/shapegroupcontext.cxx              |    2 
 oox/source/drawingml/textcharacterpropertiescontext.cxx |    2 
 oox/source/drawingml/textparagraphpropertiescontext.cxx |    2 
 oox/source/drawingml/themeelementscontext.cxx           |    4 
 oox/source/export/drawingml.cxx                         |    2 
 oox/source/ppt/pptgraphicshapecontext.cxx               |    2 
 oox/source/ppt/pptshapecontext.cxx                      |    2 
 oox/source/ppt/pptshapegroupcontext.cxx                 |    4 
 oox/source/ppt/pptshapepropertiescontext.cxx            |    2 
 oox/source/ppt/slidepersist.cxx                         |    2 
 oox/source/vml/vmlformatting.cxx                        |    4 
 37 files changed, 296 insertions(+), 289 deletions(-)

New commits:
commit 31e12a9e639e708f503f4db71b8549a7426c2394
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 24 17:59:00 2017 +0200

    Move two include files to oox/inc as they are used only in oox
    
    Change-Id: Ie13614c1977f45aa8086f4db65ca86b7d9212735

diff --git a/include/oox/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx
similarity index 98%
rename from include/oox/drawingml/fillproperties.hxx
rename to oox/inc/drawingml/fillproperties.hxx
index bed67d6..15b5031 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
-#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
+#ifndef INCLUDED_OOX_INC_DRAWINGML_FILLPROPERTIES_HXX
+#define INCLUDED_OOX_INC_DRAWINGML_FILLPROPERTIES_HXX
 
 #include <map>
 
diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
index b93249c..4c40ff3 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 e8f7222e..7bd1877 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/include/oox/drawingml/lineproperties.hxx b/oox/inc/drawingml/lineproperties.hxx
similarity index 95%
rename from include/oox/drawingml/lineproperties.hxx
rename to oox/inc/drawingml/lineproperties.hxx
index f546425..edea5f6 100644
--- a/include/oox/drawingml/lineproperties.hxx
+++ b/oox/inc/drawingml/lineproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
-#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_INC_DRAWINGML_LINEPROPERTIES_HXX
+#define INCLUDED_OOX_INC_DRAWINGML_LINEPROPERTIES_HXX
 
 #include <utility>
 #include <vector>
@@ -27,9 +27,10 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <oox/dllapi.h>
 #include <oox/helper/helper.hxx>
-#include <oox/drawingml/fillproperties.hxx>
 #include <sal/types.h>
 
+#include "drawingml/fillproperties.hxx"
+
 namespace oox { class GraphicHelper; }
 
 namespace oox {
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index 313e153..b44eeba 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 8c29518..28e3697 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 055e58f..ce41fef 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 4522449e..1bfc947 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 8e50f97..18d6eb5 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 73c24da..43bdcc0 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 d0ed206..7233d67 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 c92ee47..5df326a 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 c709d0f..284d193 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 45fcc1b..9a60cd2 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 81a14ba..2e1429d 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 6f01409..63ad066 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 fa2fa5a..6bdce22 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 22d68fa..805184e 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 92c129f..201a989 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 b6dd597..dabe5d7 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 10ed9cf..b77d66f 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 4f4fcb11..aeeb60c 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 b65ae15..54ebdfc 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 404656b..686de17 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 7dff3f1..e7c39af 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 3cb5bd0..84ba8a0 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 f040a98..9eb6901 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 7f75747..2ed435d 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 262e8ee..084ce1a 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 bfe2a6c..29011d5 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 13a447b..16c0eb2 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 5208bd4..1f36de8 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 d00d9a9..c5ff7af 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 3de25a8..039e2e1 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 36cc43d..27fa0f4 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"

More information about the Libreoffice-commits mailing list