From e787a84c69b1e557f32de348d2efd5879c7ca222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Thu, 19 Jun 2014 12:09:17 +0200 Subject: [PATCH] Move oox/drawingml/table/ internal headers to oox/inc. Change-Id: I9de33fdcd8b1ef73d57884033f502ac4a03f63d3 --- include/oox/core/xmlfilterbase.hxx | 5 ++++- .../inc}/drawingml/table/tablebackgroundstylecontext.hxx | 2 +- {include/oox => oox/inc}/drawingml/table/tablecell.hxx | 0 .../oox => oox/inc}/drawingml/table/tablecellcontext.hxx | 2 +- {include/oox => oox/inc}/drawingml/table/tablecontext.hxx | 0 .../inc}/drawingml/table/tablepartstylecontext.hxx | 2 +- .../oox => oox/inc}/drawingml/table/tableproperties.hxx | 4 ++-- {include/oox => oox/inc}/drawingml/table/tablerow.hxx | 2 +- .../oox => oox/inc}/drawingml/table/tablerowcontext.hxx | 0 {include/oox => oox/inc}/drawingml/table/tablestyle.hxx | 2 +- .../inc}/drawingml/table/tablestylecellstylecontext.hxx | 2 +- .../oox => oox/inc}/drawingml/table/tablestylecontext.hxx | 2 +- .../oox => oox/inc}/drawingml/table/tablestylelist.hxx | 0 .../drawingml/table/tablestylelistfragmenthandler.hxx | 2 +- .../oox => oox/inc}/drawingml/table/tablestylepart.hxx | 0 .../inc}/drawingml/table/tablestyletextstylecontext.hxx | 2 +- oox/source/drawingml/graphicshapecontext.cxx | 2 +- oox/source/drawingml/shape.cxx | 2 +- .../drawingml/table/tablebackgroundstylecontext.cxx | 2 +- oox/source/drawingml/table/tablecell.cxx | 4 ++-- oox/source/drawingml/table/tablecellcontext.cxx | 2 +- oox/source/drawingml/table/tablecontext.cxx | 8 ++++---- oox/source/drawingml/table/tablepartstylecontext.cxx | 6 +++--- oox/source/drawingml/table/tableproperties.cxx | 3 ++- oox/source/drawingml/table/tablerow.cxx | 2 +- oox/source/drawingml/table/tablerowcontext.cxx | 6 +++--- oox/source/drawingml/table/tablestyle.cxx | 2 +- oox/source/drawingml/table/tablestylecellstylecontext.cxx | 2 +- oox/source/drawingml/table/tablestylecontext.cxx | 6 +++--- oox/source/drawingml/table/tablestylelist.cxx | 4 ++-- .../drawingml/table/tablestylelistfragmenthandler.cxx | 4 ++-- oox/source/drawingml/table/tablestylepart.cxx | 2 +- oox/source/drawingml/table/tablestyletextstylecontext.cxx | 2 +- oox/source/ppt/pptimport.cxx | 2 +- oox/source/shape/ShapeFilterBase.hxx | 2 +- 35 files changed, 47 insertions(+), 43 deletions(-) rename {include/oox => oox/inc}/drawingml/table/tablebackgroundstylecontext.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablecell.hxx (100%) rename {include/oox => oox/inc}/drawingml/table/tablecellcontext.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablecontext.hxx (100%) rename {include/oox => oox/inc}/drawingml/table/tablepartstylecontext.hxx (96%) rename {include/oox => oox/inc}/drawingml/table/tableproperties.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablerow.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablerowcontext.hxx (100%) rename {include/oox => oox/inc}/drawingml/table/tablestyle.hxx (98%) rename {include/oox => oox/inc}/drawingml/table/tablestylecellstylecontext.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablestylecontext.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablestylelist.hxx (100%) rename {include/oox => oox/inc}/drawingml/table/tablestylelistfragmenthandler.hxx (97%) rename {include/oox => oox/inc}/drawingml/table/tablestylepart.hxx (100%) rename {include/oox => oox/inc}/drawingml/table/tablestyletextstylecontext.hxx (97%) diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index a26bad854665..4737cef8638b 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -28,7 +28,6 @@ #include #include #include -#include #include namespace com { namespace sun { namespace star { @@ -43,6 +42,10 @@ namespace com { namespace sun { namespace star { namespace oox { namespace drawingml { class Theme; } namespace drawingml { namespace chart { class ChartConverter; } } + namespace drawingml { namespace table { + class TableStyleList; + typedef boost::shared_ptr< TableStyleList > TableStyleListPtr; + } } namespace vml { class Drawing; } } diff --git a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx similarity index 97% rename from include/oox/drawingml/table/tablebackgroundstylecontext.hxx rename to oox/inc/drawingml/table/tablebackgroundstylecontext.hxx index 8364965e8b62..ae7872eef787 100644 --- a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx +++ b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEBACKGROUNDSTYLECONTEXT_HXX #include -#include +#include namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx similarity index 100% rename from include/oox/drawingml/table/tablecell.hxx rename to oox/inc/drawingml/table/tablecell.hxx diff --git a/include/oox/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx similarity index 97% rename from include/oox/drawingml/table/tablecellcontext.hxx rename to oox/inc/drawingml/table/tablecellcontext.hxx index 78948f07e4ba..0ad58d3ca419 100644 --- a/include/oox/drawingml/table/tablecellcontext.hxx +++ b/oox/inc/drawingml/table/tablecellcontext.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELLCONTEXT_HXX #include -#include +#include namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/table/tablecontext.hxx b/oox/inc/drawingml/table/tablecontext.hxx similarity index 100% rename from include/oox/drawingml/table/tablecontext.hxx rename to oox/inc/drawingml/table/tablecontext.hxx diff --git a/include/oox/drawingml/table/tablepartstylecontext.hxx b/oox/inc/drawingml/table/tablepartstylecontext.hxx similarity index 96% rename from include/oox/drawingml/table/tablepartstylecontext.hxx rename to oox/inc/drawingml/table/tablepartstylecontext.hxx index b85348f34d8b..3b9fab2cc427 100644 --- a/include/oox/drawingml/table/tablepartstylecontext.hxx +++ b/oox/inc/drawingml/table/tablepartstylecontext.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPARTSTYLECONTEXT_HXX #include -#include +#include namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx similarity index 97% rename from include/oox/drawingml/table/tableproperties.hxx rename to oox/inc/drawingml/table/tableproperties.hxx index 98bb1a14cc26..ea03f7509adb 100644 --- a/include/oox/drawingml/table/tableproperties.hxx +++ b/oox/inc/drawingml/table/tableproperties.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX -#include -#include +#include +#include #include #include diff --git a/include/oox/drawingml/table/tablerow.hxx b/oox/inc/drawingml/table/tablerow.hxx similarity index 97% rename from include/oox/drawingml/table/tablerow.hxx rename to oox/inc/drawingml/table/tablerow.hxx index 9e58ddd3428f..29bc2d1457c5 100644 --- a/include/oox/drawingml/table/tablerow.hxx +++ b/oox/inc/drawingml/table/tablerow.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX -#include +#include #include namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/table/tablerowcontext.hxx b/oox/inc/drawingml/table/tablerowcontext.hxx similarity index 100% rename from include/oox/drawingml/table/tablerowcontext.hxx rename to oox/inc/drawingml/table/tablerowcontext.hxx diff --git a/include/oox/drawingml/table/tablestyle.hxx b/oox/inc/drawingml/table/tablestyle.hxx similarity index 98% rename from include/oox/drawingml/table/tablestyle.hxx rename to oox/inc/drawingml/table/tablestyle.hxx index 8d1c6b850b67..a0d1044a0e19 100644 --- a/include/oox/drawingml/table/tablestyle.hxx +++ b/oox/inc/drawingml/table/tablestyle.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX -#include +#include #include #include diff --git a/include/oox/drawingml/table/tablestylecellstylecontext.hxx b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx similarity index 97% rename from include/oox/drawingml/table/tablestylecellstylecontext.hxx rename to oox/inc/drawingml/table/tablestylecellstylecontext.hxx index d4af433647b7..4d4844a978e7 100644 --- a/include/oox/drawingml/table/tablestylecellstylecontext.hxx +++ b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECELLSTYLECONTEXT_HXX #include -#include +#include namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/table/tablestylecontext.hxx b/oox/inc/drawingml/table/tablestylecontext.hxx similarity index 97% rename from include/oox/drawingml/table/tablestylecontext.hxx rename to oox/inc/drawingml/table/tablestylecontext.hxx index 32f9220621f4..cf98c0e961ee 100644 --- a/include/oox/drawingml/table/tablestylecontext.hxx +++ b/oox/inc/drawingml/table/tablestylecontext.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECONTEXT_HXX #include -#include +#include namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/table/tablestylelist.hxx b/oox/inc/drawingml/table/tablestylelist.hxx similarity index 100% rename from include/oox/drawingml/table/tablestylelist.hxx rename to oox/inc/drawingml/table/tablestylelist.hxx diff --git a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx similarity index 97% rename from include/oox/drawingml/table/tablestylelistfragmenthandler.hxx rename to oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx index c32c91a58721..0e7521ae4496 100644 --- a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx +++ b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX -#include +#include #include namespace oox { diff --git a/include/oox/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx similarity index 100% rename from include/oox/drawingml/table/tablestylepart.hxx rename to oox/inc/drawingml/table/tablestylepart.hxx diff --git a/include/oox/drawingml/table/tablestyletextstylecontext.hxx b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx similarity index 97% rename from include/oox/drawingml/table/tablestyletextstylecontext.hxx rename to oox/inc/drawingml/table/tablestyletextstylecontext.hxx index 52c6e9af55de..567afd57b5bb 100644 --- a/include/oox/drawingml/table/tablestyletextstylecontext.hxx +++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLETEXTSTYLECONTEXT_HXX #include -#include +#include namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index db04d5ce9310..8f016be3bede 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -24,7 +24,7 @@ #include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/customshapeproperties.hxx" #include "oox/drawingml/diagram/diagram.hxx" -#include "oox/drawingml/table/tablecontext.hxx" +#include "drawingml/table/tablecontext.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/graphichelper.hxx" diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 85b8b4d11d1c..7b16832440c6 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -25,7 +25,7 @@ #include "effectproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" #include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/table/tableproperties.hxx" +#include "drawingml/table/tableproperties.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include "oox/drawingml/chart/chartspacefragment.hxx" #include "oox/drawingml/chart/chartspacemodel.hxx" diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index a56115699fc7..a91da191476a 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -19,7 +19,7 @@ #include -#include "oox/drawingml/table/tablebackgroundstylecontext.hxx" +#include "drawingml/table/tablebackgroundstylecontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 53d8b420ba80..6862594baf93 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tablecell.hxx" -#include "oox/drawingml/table/tableproperties.hxx" +#include "drawingml/table/tablecell.hxx" +#include "drawingml/table/tableproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" #include "oox/drawingml/textbody.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index 1813cbb918ac..c0de51f552e5 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -19,7 +19,7 @@ #include -#include "oox/drawingml/table/tablecellcontext.hxx" +#include "drawingml/table/tablecellcontext.hxx" #include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/linepropertiescontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx" diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 17949a766d5c..52edb76fb6e9 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -20,10 +20,10 @@ #include #include "oox/helper/attributelist.hxx" #include "oox/drawingml/guidcontext.hxx" -#include "oox/drawingml/table/tablecontext.hxx" -#include "oox/drawingml/table/tableproperties.hxx" -#include "oox/drawingml/table/tablestylecontext.hxx" -#include "oox/drawingml/table/tablerowcontext.hxx" +#include "drawingml/table/tablecontext.hxx" +#include "drawingml/table/tableproperties.hxx" +#include "drawingml/table/tablestylecontext.hxx" +#include "drawingml/table/tablerowcontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx b/oox/source/drawingml/table/tablepartstylecontext.cxx index 69282f2c7e98..8ba813972408 100644 --- a/oox/source/drawingml/table/tablepartstylecontext.cxx +++ b/oox/source/drawingml/table/tablepartstylecontext.cxx @@ -19,9 +19,9 @@ #include -#include "oox/drawingml/table/tablepartstylecontext.hxx" -#include "oox/drawingml/table/tablestyletextstylecontext.hxx" -#include "oox/drawingml/table/tablestylecellstylecontext.hxx" +#include "drawingml/table/tablepartstylecontext.hxx" +#include "drawingml/table/tablestyletextstylecontext.hxx" +#include "drawingml/table/tablestylecellstylecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index e7f5799a248a..3dbc8145ebcb 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tableproperties.hxx" +#include "drawingml/table/tableproperties.hxx" +#include "drawingml/table/tablestylelist.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include #include diff --git a/oox/source/drawingml/table/tablerow.cxx b/oox/source/drawingml/table/tablerow.cxx index 9fd2a38c1d8d..48fdd4d65556 100644 --- a/oox/source/drawingml/table/tablerow.cxx +++ b/oox/source/drawingml/table/tablerow.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tablerow.hxx" +#include "drawingml/table/tablerow.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include #include diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx index 5984d7601e78..551eb50431de 100644 --- a/oox/source/drawingml/table/tablerowcontext.cxx +++ b/oox/source/drawingml/table/tablerowcontext.cxx @@ -19,9 +19,9 @@ #include -#include "oox/drawingml/table/tablerowcontext.hxx" -#include "oox/drawingml/table/tablecellcontext.hxx" -#include "oox/drawingml/table/tablerow.hxx" +#include "drawingml/table/tablerowcontext.hxx" +#include "drawingml/table/tablecellcontext.hxx" +#include "drawingml/table/tablerow.hxx" using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/table/tablestyle.cxx b/oox/source/drawingml/table/tablestyle.cxx index cfaad199fb19..42a670f08c7c 100644 --- a/oox/source/drawingml/table/tablestyle.cxx +++ b/oox/source/drawingml/table/tablestyle.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tablestyle.hxx" +#include "drawingml/table/tablestyle.hxx" namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index c6be9157cb8b..a318a0ae91a3 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -19,7 +19,7 @@ #include -#include "oox/drawingml/table/tablestylecellstylecontext.hxx" +#include "drawingml/table/tablestylecellstylecontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/linepropertiescontext.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/table/tablestylecontext.cxx b/oox/source/drawingml/table/tablestylecontext.cxx index 0e6e0dec7966..4651c091f6ba 100644 --- a/oox/source/drawingml/table/tablestylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecontext.cxx @@ -19,9 +19,9 @@ #include -#include "oox/drawingml/table/tablestylecontext.hxx" -#include "oox/drawingml/table/tablebackgroundstylecontext.hxx" -#include "oox/drawingml/table/tablepartstylecontext.hxx" +#include "drawingml/table/tablestylecontext.hxx" +#include "drawingml/table/tablebackgroundstylecontext.hxx" +#include "drawingml/table/tablepartstylecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/table/tablestylelist.cxx b/oox/source/drawingml/table/tablestylelist.cxx index ed4b8fb64091..b47375aa2847 100644 --- a/oox/source/drawingml/table/tablestylelist.cxx +++ b/oox/source/drawingml/table/tablestylelist.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tablestylelist.hxx" -#include "oox/drawingml/table/tablestyle.hxx" +#include "drawingml/table/tablestylelist.hxx" +#include "drawingml/table/tablestyle.hxx" namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx index 0e564e91fa86..7262a4282584 100644 --- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx +++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tablestylelistfragmenthandler.hxx" -#include "oox/drawingml/table/tablestylecontext.hxx" +#include "drawingml/table/tablestylelistfragmenthandler.hxx" +#include "drawingml/table/tablestylecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/table/tablestylepart.cxx b/oox/source/drawingml/table/tablestylepart.cxx index d5256e7ebcc8..57fc553a7f78 100644 --- a/oox/source/drawingml/table/tablestylepart.cxx +++ b/oox/source/drawingml/table/tablestylepart.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/table/tablestylepart.hxx" +#include "drawingml/table/tablestylepart.hxx" #include "oox/drawingml/drawingmltypes.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index ba85feabc16d..93277fc15b32 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -19,7 +19,7 @@ #include -#include "oox/drawingml/table/tablestyletextstylecontext.hxx" +#include "drawingml/table/tablestyletextstylecontext.hxx" #include "oox/drawingml/colorchoicecontext.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index c3aa2208beeb..6bfb00cc7b4d 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -23,7 +23,7 @@ #include "oox/ppt/pptimport.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include "oox/dump/pptxdumper.hxx" -#include "oox/drawingml/table/tablestylelistfragmenthandler.hxx" +#include "drawingml/table/tablestylelistfragmenthandler.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/ole/vbaproject.hxx" diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 2021e475e818..f553fd9d4da5 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -23,7 +23,7 @@ #include #include #include "oox/vml/vmldrawing.hxx" -#include "oox/drawingml/table/tablestylelist.hxx" +#include "drawingml/table/tablestylelist.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/drawingmltypes.hxx"