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

Matúš Kukan matus.kukan at collabora.com
Wed Jun 25 00:46:21 PDT 2014 

 include/oox/drawingml/chart/axiscontext.hxx             |  120 -------
 include/oox/drawingml/chart/axisconverter.hxx           |   79 ----
 include/oox/drawingml/chart/axismodel.hxx               |  105 ------
 include/oox/drawingml/chart/chartcontextbase.hxx        |   95 -----
 include/oox/drawingml/chart/chartdrawingfragment.hxx    |  115 ------
 include/oox/drawingml/chart/chartspaceconverter.hxx     |   57 ---
 include/oox/drawingml/chart/chartspacefragment.hxx      |   57 ---
 include/oox/drawingml/chart/chartspacemodel.hxx         |   73 ----
 include/oox/drawingml/chart/converterbase.hxx           |  155 ---------
 include/oox/drawingml/chart/datasourcecontext.hxx       |   94 -----
 include/oox/drawingml/chart/datasourceconverter.hxx     |   71 ----
 include/oox/drawingml/chart/objectformatter.hxx         |  157 ---------
 include/oox/drawingml/chart/plotareacontext.hxx         |   98 -----
 include/oox/drawingml/chart/plotareaconverter.hxx       |  118 -------
 include/oox/drawingml/chart/plotareamodel.hxx           |  100 ------
 include/oox/drawingml/chart/seriescontext.hxx           |  266 ----------------
 include/oox/drawingml/chart/seriesconverter.hxx         |  167 ----------
 include/oox/drawingml/chart/seriesmodel.hxx             |  217 -------------
 include/oox/drawingml/chart/titlecontext.hxx            |   83 ----
 include/oox/drawingml/chart/titleconverter.hxx          |  106 ------
 include/oox/drawingml/chart/titlemodel.hxx              |   89 -----
 include/oox/drawingml/chart/typegroupcontext.hxx        |  164 ---------
 include/oox/drawingml/chart/typegroupconverter.hxx      |  185 -----------
 include/oox/drawingml/chart/typegroupmodel.hxx          |   90 -----
 include/oox/drawingml/diagram/diagram.hxx               |   58 ---
 oox/inc/drawingml/chart/axiscontext.hxx                 |  120 +++++++
 oox/inc/drawingml/chart/axisconverter.hxx               |   79 ++++
 oox/inc/drawingml/chart/axismodel.hxx                   |  105 ++++++
 oox/inc/drawingml/chart/chartcontextbase.hxx            |   95 +++++
 oox/inc/drawingml/chart/chartdrawingfragment.hxx        |  115 ++++++
 oox/inc/drawingml/chart/chartspaceconverter.hxx         |   57 +++
 oox/inc/drawingml/chart/chartspacefragment.hxx          |   57 +++
 oox/inc/drawingml/chart/chartspacemodel.hxx             |   73 ++++
 oox/inc/drawingml/chart/converterbase.hxx               |  155 +++++++++
 oox/inc/drawingml/chart/datasourcecontext.hxx           |   94 +++++
 oox/inc/drawingml/chart/datasourceconverter.hxx         |   71 ++++
 oox/inc/drawingml/chart/objectformatter.hxx             |  157 +++++++++
 oox/inc/drawingml/chart/plotareacontext.hxx             |   98 +++++
 oox/inc/drawingml/chart/plotareaconverter.hxx           |  118 +++++++
 oox/inc/drawingml/chart/plotareamodel.hxx               |  100 ++++++
 oox/inc/drawingml/chart/seriescontext.hxx               |  266 ++++++++++++++++
 oox/inc/drawingml/chart/seriesconverter.hxx             |  167 ++++++++++
 oox/inc/drawingml/chart/seriesmodel.hxx                 |  217 +++++++++++++
 oox/inc/drawingml/chart/titlecontext.hxx                |   83 ++++
 oox/inc/drawingml/chart/titleconverter.hxx              |  106 ++++++
 oox/inc/drawingml/chart/titlemodel.hxx                  |   89 +++++
 oox/inc/drawingml/chart/typegroupcontext.hxx            |  164 +++++++++
 oox/inc/drawingml/chart/typegroupconverter.hxx          |  185 +++++++++++
 oox/inc/drawingml/chart/typegroupmodel.hxx              |   90 +++++
 oox/inc/drawingml/diagram/diagram.hxx                   |   58 +++
 oox/source/drawingml/chart/axiscontext.cxx              |    6 
 oox/source/drawingml/chart/axisconverter.cxx            |    8 
 oox/source/drawingml/chart/axismodel.cxx                |    2 
 oox/source/drawingml/chart/chartcontextbase.cxx         |    2 
 oox/source/drawingml/chart/chartconverter.cxx           |    4 
 oox/source/drawingml/chart/chartdrawingfragment.cxx     |    2 
 oox/source/drawingml/chart/chartspaceconverter.cxx      |   10 
 oox/source/drawingml/chart/chartspacefragment.cxx       |    8 
 oox/source/drawingml/chart/chartspacemodel.cxx          |    2 
 oox/source/drawingml/chart/converterbase.cxx            |    2 
 oox/source/drawingml/chart/datasourcecontext.cxx        |    2 
 oox/source/drawingml/chart/datasourceconverter.cxx      |    2 
 oox/source/drawingml/chart/objectformatter.cxx          |    4 
 oox/source/drawingml/chart/plotareacontext.cxx          |   12 
 oox/source/drawingml/chart/plotareaconverter.cxx        |    8 
 oox/source/drawingml/chart/plotareamodel.cxx            |    2 
 oox/source/drawingml/chart/seriescontext.cxx            |    8 
 oox/source/drawingml/chart/seriesconverter.cxx          |   12 
 oox/source/drawingml/chart/seriesmodel.cxx              |    2 
 oox/source/drawingml/chart/titlecontext.cxx             |    6 
 oox/source/drawingml/chart/titleconverter.cxx           |    6 
 oox/source/drawingml/chart/titlemodel.cxx               |    2 
 oox/source/drawingml/chart/typegroupcontext.cxx         |    6 
 oox/source/drawingml/chart/typegroupconverter.cxx       |    6 
 oox/source/drawingml/chart/typegroupmodel.cxx           |    2 
 oox/source/drawingml/diagram/diagram.cxx                |    2 
 oox/source/drawingml/diagram/diagramfragmenthandler.hxx |    2 
 oox/source/drawingml/diagram/layoutnodecontext.cxx      |    2 
 oox/source/drawingml/graphicshapecontext.cxx            |    2 
 oox/source/drawingml/shape.cxx                          |    4 
 oox/source/export/chartexport.cxx                       |    2 
 oox/source/ppt/dgmimport.cxx                            |    2 
 oox/source/ppt/dgmlayout.cxx                            |    2 
 sw/qa/extras/ww8import/ww8import.cxx                    |    2 
 84 files changed, 2992 insertions(+), 2992 deletions(-)

New commits:
commit 4a3b0e544dbc45a3972006a2ead75492d6876f95
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Jun 25 09:45:07 2014 +0200

    error: no matching function for call to 'assertEquals'
    
    Change-Id: I0b87c2abeec30e9e4eab3ce488a5828b8a5b475d

diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index 6d0de33..270d665 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -412,7 +412,7 @@ DECLARE_WW8IMPORT_TEST(testBnc875715, "bnc875715.doc")
     uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
     // Was incorrectly set as -1270.
-    CPPUNIT_ASSERT_EQUAL(0, getProperty<sal_Int32>(xSections->getByIndex(0), "SectionLeftMargin"));
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xSections->getByIndex(0), "SectionLeftMargin"));
 }
 
 #endif
commit 2e049367219d427e315e58ef193438ea48a0196b
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Jun 24 21:16:18 2014 +0200

    Move more oox/drawingml/ internal headers to oox/inc.
    
    Change-Id: I0963c92356f8388ce02fb36e172ad3b2af8ba8f8

diff --git a/include/oox/drawingml/chart/axiscontext.hxx b/oox/inc/drawingml/chart/axiscontext.hxx
similarity index 98%
rename from include/oox/drawingml/chart/axiscontext.hxx
rename to oox/inc/drawingml/chart/axiscontext.hxx
index 0c83280..6275fcd 100644
--- a/include/oox/drawingml/chart/axiscontext.hxx
+++ b/oox/inc/drawingml/chart/axiscontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx
similarity index 98%
rename from include/oox/drawingml/chart/axisconverter.hxx
rename to oox/inc/drawingml/chart/axisconverter.hxx
index 3b7a587..e3cb8d0 100644
--- a/include/oox/drawingml/chart/axisconverter.hxx
+++ b/oox/inc/drawingml/chart/axisconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XAxis; }
diff --git a/include/oox/drawingml/chart/axismodel.hxx b/oox/inc/drawingml/chart/axismodel.hxx
similarity index 99%
rename from include/oox/drawingml/chart/axismodel.hxx
rename to oox/inc/drawingml/chart/axismodel.hxx
index b3a18f0..a206185 100644
--- a/include/oox/drawingml/chart/axismodel.hxx
+++ b/oox/inc/drawingml/chart/axismodel.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
 
 #include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/chart/titlemodel.hxx>
+#include <drawingml/chart/titlemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx
similarity index 100%
rename from include/oox/drawingml/chart/chartcontextbase.hxx
rename to oox/inc/drawingml/chart/chartcontextbase.hxx
diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
similarity index 100%
rename from include/oox/drawingml/chart/chartdrawingfragment.hxx
rename to oox/inc/drawingml/chart/chartdrawingfragment.hxx
diff --git a/include/oox/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx
similarity index 97%
rename from include/oox/drawingml/chart/chartspaceconverter.hxx
rename to oox/inc/drawingml/chart/chartspaceconverter.hxx
index a273ba9..6651bbe 100644
--- a/include/oox/drawingml/chart/chartspaceconverter.hxx
+++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace drawing { class XShapes; }
diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx b/oox/inc/drawingml/chart/chartspacefragment.hxx
similarity index 97%
rename from include/oox/drawingml/chart/chartspacefragment.hxx
rename to oox/inc/drawingml/chart/chartspacefragment.hxx
index 8f73594..60170cc 100644
--- a/include/oox/drawingml/chart/chartspacefragment.hxx
+++ b/oox/inc/drawingml/chart/chartspacefragment.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/chartspacemodel.hxx b/oox/inc/drawingml/chart/chartspacemodel.hxx
similarity index 96%
rename from include/oox/drawingml/chart/chartspacemodel.hxx
rename to oox/inc/drawingml/chart/chartspacemodel.hxx
index cc9015d..e8ddb9c 100644
--- a/include/oox/drawingml/chart/chartspacemodel.hxx
+++ b/oox/inc/drawingml/chart/chartspacemodel.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
 
 #include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/chart/plotareamodel.hxx>
-#include <oox/drawingml/chart/titlemodel.hxx>
+#include <drawingml/chart/plotareamodel.hxx>
+#include <drawingml/chart/titlemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
similarity index 98%
rename from include/oox/drawingml/chart/converterbase.hxx
rename to oox/inc/drawingml/chart/converterbase.hxx
index e58eb9d..f414b62 100644
--- a/include/oox/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
-#include <oox/drawingml/chart/objectformatter.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/objectformatter.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
diff --git a/include/oox/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx
similarity index 98%
rename from include/oox/drawingml/chart/datasourcecontext.hxx
rename to oox/inc/drawingml/chart/datasourcecontext.hxx
index 84c43bb..82aa38e 100644
--- a/include/oox/drawingml/chart/datasourcecontext.hxx
+++ b/oox/inc/drawingml/chart/datasourcecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx
similarity index 97%
rename from include/oox/drawingml/chart/datasourceconverter.hxx
rename to oox/inc/drawingml/chart/datasourceconverter.hxx
index 6b6ce95..9935499 100644
--- a/include/oox/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/drawingml/chart/datasourceconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { namespace data { class XDataSequence; } }
diff --git a/include/oox/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx
similarity index 100%
rename from include/oox/drawingml/chart/objectformatter.hxx
rename to oox/inc/drawingml/chart/objectformatter.hxx
diff --git a/include/oox/drawingml/chart/plotareacontext.hxx b/oox/inc/drawingml/chart/plotareacontext.hxx
similarity index 98%
rename from include/oox/drawingml/chart/plotareacontext.hxx
rename to oox/inc/drawingml/chart/plotareacontext.hxx
index 4a2c06d..2320288 100644
--- a/include/oox/drawingml/chart/plotareacontext.hxx
+++ b/oox/inc/drawingml/chart/plotareacontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
similarity index 98%
rename from include/oox/drawingml/chart/plotareaconverter.hxx
rename to oox/inc/drawingml/chart/plotareaconverter.hxx
index 3123c15..24653d1 100644
--- a/include/oox/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XDiagram; }
diff --git a/include/oox/drawingml/chart/plotareamodel.hxx b/oox/inc/drawingml/chart/plotareamodel.hxx
similarity index 95%
rename from include/oox/drawingml/chart/plotareamodel.hxx
rename to oox/inc/drawingml/chart/plotareamodel.hxx
index f0dd304..3d8c6a0 100644
--- a/include/oox/drawingml/chart/plotareamodel.hxx
+++ b/oox/inc/drawingml/chart/plotareamodel.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
 
 #include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/chart/axismodel.hxx>
-#include <oox/drawingml/chart/seriesmodel.hxx>
-#include <oox/drawingml/chart/typegroupmodel.hxx>
+#include <drawingml/chart/axismodel.hxx>
+#include <drawingml/chart/seriesmodel.hxx>
+#include <drawingml/chart/typegroupmodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/seriescontext.hxx b/oox/inc/drawingml/chart/seriescontext.hxx
similarity index 99%
rename from include/oox/drawingml/chart/seriescontext.hxx
rename to oox/inc/drawingml/chart/seriescontext.hxx
index d2be09c..5f34ecf 100644
--- a/include/oox/drawingml/chart/seriescontext.hxx
+++ b/oox/inc/drawingml/chart/seriescontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx
similarity index 98%
rename from include/oox/drawingml/chart/seriesconverter.hxx
rename to oox/inc/drawingml/chart/seriesconverter.hxx
index 2cbd566..d36468c 100644
--- a/include/oox/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
-#include <oox/drawingml/chart/seriesmodel.hxx>
+#include <drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/seriesmodel.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XDataSeries; }
diff --git a/include/oox/drawingml/chart/seriesmodel.hxx b/oox/inc/drawingml/chart/seriesmodel.hxx
similarity index 99%
rename from include/oox/drawingml/chart/seriesmodel.hxx
rename to oox/inc/drawingml/chart/seriesmodel.hxx
index b9c2c3c..e52fa02 100644
--- a/include/oox/drawingml/chart/seriesmodel.hxx
+++ b/oox/inc/drawingml/chart/seriesmodel.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
 
 #include <oox/drawingml/chart/datasourcemodel.hxx>
-#include <oox/drawingml/chart/titlemodel.hxx>
+#include <drawingml/chart/titlemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/titlecontext.hxx b/oox/inc/drawingml/chart/titlecontext.hxx
similarity index 97%
rename from include/oox/drawingml/chart/titlecontext.hxx
rename to oox/inc/drawingml/chart/titlecontext.hxx
index 30c5abf..882f14d 100644
--- a/include/oox/drawingml/chart/titlecontext.hxx
+++ b/oox/inc/drawingml/chart/titlecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx
similarity index 98%
rename from include/oox/drawingml/chart/titleconverter.hxx
rename to oox/inc/drawingml/chart/titleconverter.hxx
index 5515efb..d5f6525 100644
--- a/include/oox/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/drawingml/chart/titleconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XDiagram; }
diff --git a/include/oox/drawingml/chart/titlemodel.hxx b/oox/inc/drawingml/chart/titlemodel.hxx
similarity index 100%
rename from include/oox/drawingml/chart/titlemodel.hxx
rename to oox/inc/drawingml/chart/titlemodel.hxx
diff --git a/include/oox/drawingml/chart/typegroupcontext.hxx b/oox/inc/drawingml/chart/typegroupcontext.hxx
similarity index 99%
rename from include/oox/drawingml/chart/typegroupcontext.hxx
rename to oox/inc/drawingml/chart/typegroupcontext.hxx
index 7526a88..b4999fd 100644
--- a/include/oox/drawingml/chart/typegroupcontext.hxx
+++ b/oox/inc/drawingml/chart/typegroupcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
 
-#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
similarity index 99%
rename from include/oox/drawingml/chart/typegroupconverter.hxx
rename to oox/inc/drawingml/chart/typegroupconverter.hxx
index 4f1e2f8..c4930e7 100644
--- a/include/oox/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
 
-#include <oox/drawingml/chart/converterbase.hxx>
+#include <drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XChartType; }
diff --git a/include/oox/drawingml/chart/typegroupmodel.hxx b/oox/inc/drawingml/chart/typegroupmodel.hxx
similarity index 99%
rename from include/oox/drawingml/chart/typegroupmodel.hxx
rename to oox/inc/drawingml/chart/typegroupmodel.hxx
index 91570e3..72d5586 100644
--- a/include/oox/drawingml/chart/typegroupmodel.hxx
+++ b/oox/inc/drawingml/chart/typegroupmodel.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
 
-#include <oox/drawingml/chart/seriesmodel.hxx>
+#include <drawingml/chart/seriesmodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/diagram/diagram.hxx b/oox/inc/drawingml/diagram/diagram.hxx
similarity index 100%
rename from include/oox/drawingml/diagram/diagram.hxx
rename to oox/inc/drawingml/diagram/diagram.hxx
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index b91bbe5..c414504 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/axiscontext.hxx"
+#include "drawingml/chart/axiscontext.hxx"
 
 #include "oox/drawingml/shapepropertiescontext.hxx"
 #include "oox/drawingml/textbodycontext.hxx"
-#include "oox/drawingml/chart/axismodel.hxx"
-#include "oox/drawingml/chart/titlecontext.hxx"
+#include "drawingml/chart/axismodel.hxx"
+#include "drawingml/chart/titlecontext.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 26cd587..d11f327 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/axisconverter.hxx"
+#include "drawingml/chart/axisconverter.hxx"
 
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
@@ -32,9 +32,9 @@
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
-#include "oox/drawingml/chart/axismodel.hxx"
-#include "oox/drawingml/chart/titleconverter.hxx"
-#include "oox/drawingml/chart/typegroupconverter.hxx"
+#include "drawingml/chart/axismodel.hxx"
+#include "drawingml/chart/titleconverter.hxx"
+#include "drawingml/chart/typegroupconverter.hxx"
 #include "oox/drawingml/lineproperties.hxx"
 #include "comphelper/processfactory.hxx"
 
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index e655f91..d4163bc 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/axismodel.hxx"
+#include "drawingml/chart/axismodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx
index 858a3af..f489c2f 100644
--- a/oox/source/drawingml/chart/chartcontextbase.cxx
+++ b/oox/source/drawingml/chart/chartcontextbase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include "drawingml/chart/chartcontextbase.hxx"
 
 #include "oox/drawingml/chart/modelbase.hxx"
 #include "oox/drawingml/shapepropertiescontext.hxx"
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index 4fc8e3b..2d198f0 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -20,8 +20,8 @@
 #include "oox/drawingml/chart/chartconverter.hxx"
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include "oox/drawingml/chart/chartspaceconverter.hxx"
-#include "oox/drawingml/chart/chartspacemodel.hxx"
+#include "drawingml/chart/chartspaceconverter.hxx"
+#include "drawingml/chart/chartspacemodel.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 73056f1..d8f8092 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/chartdrawingfragment.hxx"
+#include "drawingml/chart/chartdrawingfragment.hxx"
 
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/connectorshapecontext.hxx"
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index e570536..26624c9 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/chartspaceconverter.hxx"
+#include "drawingml/chart/chartspaceconverter.hxx"
 
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
@@ -27,10 +27,10 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
-#include "oox/drawingml/chart/chartdrawingfragment.hxx"
-#include "oox/drawingml/chart/chartspacemodel.hxx"
-#include "oox/drawingml/chart/plotareaconverter.hxx"
-#include "oox/drawingml/chart/titleconverter.hxx"
+#include "drawingml/chart/chartdrawingfragment.hxx"
+#include "drawingml/chart/chartspacemodel.hxx"
+#include "drawingml/chart/plotareaconverter.hxx"
+#include "drawingml/chart/titleconverter.hxx"
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 66e9d98..40ea77a 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/chartspacefragment.hxx"
+#include "drawingml/chart/chartspacefragment.hxx"
 
 #include "oox/drawingml/shapepropertiescontext.hxx"
 #include "oox/drawingml/textbodycontext.hxx"
-#include "oox/drawingml/chart/chartspacemodel.hxx"
-#include "oox/drawingml/chart/plotareacontext.hxx"
-#include "oox/drawingml/chart/titlecontext.hxx"
+#include "drawingml/chart/chartspacemodel.hxx"
+#include "drawingml/chart/plotareacontext.hxx"
+#include "drawingml/chart/titlecontext.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index 47f1cb0..c1a9c6c 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/chartspacemodel.hxx"
+#include "drawingml/chart/chartspacemodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index c3c5844..611d8d7 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include "drawingml/chart/converterbase.hxx"
 
 #include <com/sun/star/chart/XAxisXSupplier.hpp>
 #include <com/sun/star/chart/XAxisYSupplier.hpp>
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index 0529849..c157e74 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/datasourcecontext.hxx"
+#include "drawingml/chart/datasourcecontext.hxx"
 
 #include "oox/drawingml/chart/datasourcemodel.hxx"
 
diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx
index 40e536b..96a2038 100644
--- a/oox/source/drawingml/chart/datasourceconverter.cxx
+++ b/oox/source/drawingml/chart/datasourceconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/datasourceconverter.hxx"
+#include "drawingml/chart/datasourceconverter.hxx"
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include "oox/drawingml/chart/chartconverter.hxx"
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index b3787dc..7849f6b 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/objectformatter.hxx"
+#include "drawingml/chart/objectformatter.hxx"
 
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
@@ -30,7 +30,7 @@
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/textparagraph.hxx"
 #include "oox/drawingml/theme.hxx"
-#include "oox/drawingml/chart/chartspacemodel.hxx"
+#include "drawingml/chart/chartspacemodel.hxx"
 #include "oox/helper/modelobjecthelper.hxx"
 
 namespace oox {
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index 96b082b..738fa92 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/plotareacontext.hxx"
+#include "drawingml/chart/plotareacontext.hxx"
 
 #include "oox/drawingml/shapepropertiescontext.hxx"
-#include "oox/drawingml/chart/axiscontext.hxx"
-#include "oox/drawingml/chart/plotareamodel.hxx"
-#include "oox/drawingml/chart/seriescontext.hxx"
-#include "oox/drawingml/chart/titlecontext.hxx"
-#include "oox/drawingml/chart/typegroupcontext.hxx"
+#include "drawingml/chart/axiscontext.hxx"
+#include "drawingml/chart/plotareamodel.hxx"
+#include "drawingml/chart/seriescontext.hxx"
+#include "drawingml/chart/titlecontext.hxx"
+#include "drawingml/chart/typegroupcontext.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index 257f6e0..c8980da 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/plotareaconverter.hxx"
+#include "drawingml/chart/plotareaconverter.hxx"
 
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
@@ -27,9 +27,9 @@
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
-#include "oox/drawingml/chart/axisconverter.hxx"
-#include "oox/drawingml/chart/plotareamodel.hxx"
-#include "oox/drawingml/chart/typegroupconverter.hxx"
+#include "drawingml/chart/axisconverter.hxx"
+#include "drawingml/chart/plotareamodel.hxx"
+#include "drawingml/chart/typegroupconverter.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx
index 4c19910..7c6ea59 100644
--- a/oox/source/drawingml/chart/plotareamodel.cxx
+++ b/oox/source/drawingml/chart/plotareamodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/plotareamodel.hxx"
+#include "drawingml/chart/plotareamodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index 5070f26..9646851 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/seriescontext.hxx"
+#include "drawingml/chart/seriescontext.hxx"
 
 #include "oox/drawingml/shapepropertiescontext.hxx"
 #include "oox/drawingml/textbodycontext.hxx"
-#include "oox/drawingml/chart/datasourcecontext.hxx"
-#include "oox/drawingml/chart/seriesmodel.hxx"
-#include "oox/drawingml/chart/titlecontext.hxx"
+#include "drawingml/chart/datasourcecontext.hxx"
+#include "drawingml/chart/seriesmodel.hxx"
+#include "drawingml/chart/titlecontext.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 292e8a4..7c1a085 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/seriesconverter.hxx"
+#include "drawingml/chart/seriesconverter.hxx"
 
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
@@ -28,11 +28,11 @@
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
 #include <basegfx/numeric/ftools.hxx>
-#include "oox/drawingml/chart/datasourceconverter.hxx"
-#include "oox/drawingml/chart/seriesmodel.hxx"
-#include "oox/drawingml/chart/titleconverter.hxx"
-#include "oox/drawingml/chart/typegroupconverter.hxx"
-#include "oox/drawingml/chart/typegroupmodel.hxx"
+#include "drawingml/chart/datasourceconverter.hxx"
+#include "drawingml/chart/seriesmodel.hxx"
+#include "drawingml/chart/titleconverter.hxx"
+#include "drawingml/chart/typegroupconverter.hxx"
+#include "drawingml/chart/typegroupmodel.hxx"
 #include "oox/helper/containerhelper.hxx"
 
 namespace oox {
diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx
index 6888d6e..8daa50a 100644
--- a/oox/source/drawingml/chart/seriesmodel.cxx
+++ b/oox/source/drawingml/chart/seriesmodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/seriesmodel.hxx"
+#include "drawingml/chart/seriesmodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index f2760bf..0a627ee 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/titlecontext.hxx"
+#include "drawingml/chart/titlecontext.hxx"
 
 #include "oox/drawingml/shapepropertiescontext.hxx"
 #include "oox/drawingml/textbodycontext.hxx"
-#include "oox/drawingml/chart/datasourcecontext.hxx"
-#include "oox/drawingml/chart/titlemodel.hxx"
+#include "drawingml/chart/datasourcecontext.hxx"
+#include "drawingml/chart/titlemodel.hxx"
 
 #include "rtl/ustrbuf.hxx"
 
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 13c3978..29dc019 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/titleconverter.hxx"
+#include "drawingml/chart/titleconverter.hxx"
 
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart2/FormattedString.hpp>
@@ -28,8 +28,8 @@
 #include <com/sun/star/chart2/XTitled.hpp>
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/textparagraph.hxx"
-#include "oox/drawingml/chart/datasourceconverter.hxx"
-#include "oox/drawingml/chart/titlemodel.hxx"
+#include "drawingml/chart/datasourceconverter.hxx"
+#include "drawingml/chart/titlemodel.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/drawing/Alignment.hpp>
diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx
index 3a903fd..614f212 100644
--- a/oox/source/drawingml/chart/titlemodel.cxx
+++ b/oox/source/drawingml/chart/titlemodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/titlemodel.hxx"
+#include "drawingml/chart/titlemodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx
index b39dfb0..72f28ed 100644
--- a/oox/source/drawingml/chart/typegroupcontext.cxx
+++ b/oox/source/drawingml/chart/typegroupcontext.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/typegroupcontext.hxx"
+#include "drawingml/chart/typegroupcontext.hxx"
 
-#include "oox/drawingml/chart/seriescontext.hxx"
-#include "oox/drawingml/chart/typegroupmodel.hxx"
+#include "drawingml/chart/seriescontext.hxx"
+#include "drawingml/chart/typegroupmodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 5b271e1..36fd0ec 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/typegroupconverter.hxx"
+#include "drawingml/chart/typegroupconverter.hxx"
 
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart2/CartesianCoordinateSystem2d.hpp>
@@ -34,8 +34,8 @@
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include "oox/drawingml/lineproperties.hxx"
-#include "oox/drawingml/chart/seriesconverter.hxx"
-#include "oox/drawingml/chart/typegroupmodel.hxx"
+#include "drawingml/chart/seriesconverter.hxx"
+#include "drawingml/chart/typegroupmodel.hxx"
 #include "oox/helper/containerhelper.hxx"
 
 namespace oox {
diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx
index bc3e6d19..30f1ccc 100644
--- a/oox/source/drawingml/chart/typegroupmodel.cxx
+++ b/oox/source/drawingml/chart/typegroupmodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/drawingml/chart/typegroupmodel.hxx"
+#include "drawingml/chart/typegroupmodel.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 9f29bd6..4d6a421 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -29,7 +29,7 @@
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/textparagraph.hxx"
 #include "oox/drawingml/textrun.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "drawingml/diagram/diagram.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/ppt/pptshapegroupcontext.hxx"
 #include "oox/ppt/pptshape.hxx"
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 9d38870..c5e8e4b 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "drawingml/diagram/diagram.hxx"
 
 namespace oox { namespace drawingml {
 
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 1d092dc..4612fcb 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -20,7 +20,7 @@
 #include "layoutnodecontext.hxx"
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "drawingml/diagram/diagram.hxx"
 #include "oox/drawingml/shapecontext.hxx"
 #include "oox/drawingml/customshapeproperties.hxx"
 #include "diagramdefinitioncontext.hxx"
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 8adc9c6..f753783 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -23,7 +23,7 @@
 
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
 #include "oox/drawingml/customshapeproperties.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "drawingml/diagram/diagram.hxx"
 #include "drawingml/table/tablecontext.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/attributelist.hxx"
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index db2fa16..cc8acde 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -27,8 +27,8 @@
 #include "oox/drawingml/textbody.hxx"
 #include "drawingml/table/tableproperties.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
-#include "oox/drawingml/chart/chartspacefragment.hxx"
-#include "oox/drawingml/chart/chartspacemodel.hxx"
+#include "drawingml/chart/chartspacefragment.hxx"
+#include "drawingml/chart/chartspacemodel.hxx"
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/vml/vmlshapecontainer.hxx"
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 174cd8c..ba60ccf 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -21,7 +21,7 @@
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/export/chartexport.hxx"
 #include "oox/export/utils.hxx"
-#include "oox/drawingml/chart/typegroupconverter.hxx"
+#include "drawingml/chart/typegroupconverter.hxx"
 
 #include <cstdio>
 
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 19ff1ca..e760b2e 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -19,7 +19,7 @@
 
 #include "oox/ppt/dgmimport.hxx"
 #include "oox/drawingml/theme.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "drawingml/diagram/diagram.hxx"
 #include "oox/dump/pptxdumper.hxx"
 
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index 10276dc..f9db4c7 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -20,7 +20,7 @@
 #include "oox/ppt/dgmlayout.hxx"
 #include "oox/drawingml/theme.hxx"
 #include "oox/drawingml/themefragmenthandler.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "drawingml/diagram/diagram.hxx"
 #include "oox/dump/pptxdumper.hxx"
 
 #include <com/sun/star/drawing/XShape.hpp>

More information about the Libreoffice-commits mailing list