mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move oox/drawingml/table/ internal headers to oox/inc.

Browse Source 
Change-Id: I9de33fdcd8b1ef73d57884033f502ac4a03f63d3
This commit is contained in:
Matúš Kukan 2014-06-19 12:09:17 +02:00
parent 15f5454941
commit e787a84c69
35 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/oox/core/xmlfilterbase.hxx
View File

@ -28,7 +28,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <oox/core/filterbase.hxx> #include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx> #include <oox/core/relations.hxx>
#include <oox/drawingml/table/tablestylelist.hxx>
#include <oox/dllapi.h> #include <oox/dllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
@ -43,6 +42,10 @@ namespace com { namespace sun { namespace star {
namespace oox { namespace oox {
namespace drawingml { class Theme; } namespace drawingml { class Theme; }
namespace drawingml { namespace chart { class ChartConverter; } } namespace drawingml { namespace chart { class ChartConverter; } }
namespace drawingml { namespace table {
class TableStyleList;
typedef boost::shared_ptr< TableStyleList > TableStyleListPtr;
} }
namespace vml { class Drawing; } namespace vml { class Drawing; }
} }

2
include/oox/drawingml/table/tablebackgroundstylecontext.hxx → oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
View File

@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEBACKGROUNDSTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEBACKGROUNDSTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx> #include <oox/core/contexthandler2.hxx>
#include <oox/drawingml/table/tablestyle.hxx> #include <drawingml/table/tablestyle.hxx>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

0
include/oox/drawingml/table/tablecell.hxx → oox/inc/drawingml/table/tablecell.hxx
View File

2
include/oox/drawingml/table/tablecellcontext.hxx → oox/inc/drawingml/table/tablecellcontext.hxx
View File

@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELLCONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELLCONTEXT_HXX
#include <oox/drawingml/shapecontext.hxx> #include <oox/drawingml/shapecontext.hxx>
#include <oox/drawingml/table/tablecell.hxx> #include <drawingml/table/tablecell.hxx>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

0
include/oox/drawingml/table/tablecontext.hxx → oox/inc/drawingml/table/tablecontext.hxx
View File

2
include/oox/drawingml/table/tablepartstylecontext.hxx → oox/inc/drawingml/table/tablepartstylecontext.hxx
View File

@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPARTSTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPARTSTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx> #include <oox/core/contexthandler2.hxx>
#include <oox/drawingml/table/tablestylepart.hxx> #include <drawingml/table/tablestylepart.hxx>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

4
include/oox/drawingml/table/tableproperties.hxx → oox/inc/drawingml/table/tableproperties.hxx
View File

@ -20,8 +20,8 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
#include <oox/drawingml/table/tablerow.hxx> #include <drawingml/table/tablerow.hxx>
#include <oox/drawingml/table/tablestyle.hxx> #include <drawingml/table/tablestyle.hxx>
#include <oox/helper/propertymap.hxx> #include <oox/helper/propertymap.hxx>
#include <oox/drawingml/color.hxx> #include <oox/drawingml/color.hxx>

2
include/oox/drawingml/table/tablerow.hxx → oox/inc/drawingml/table/tablerow.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
#include <oox/drawingml/table/tablecell.hxx> #include <drawingml/table/tablecell.hxx>
#include <vector> #include <vector>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

0
include/oox/drawingml/table/tablerowcontext.hxx → oox/inc/drawingml/table/tablerowcontext.hxx
View File

2
include/oox/drawingml/table/tablestyle.hxx → oox/inc/drawingml/table/tablestyle.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
#include <oox/drawingml/table/tablestylepart.hxx> #include <drawingml/table/tablestylepart.hxx>
#include <oox/drawingml/drawingmltypes.hxx> #include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/shape.hxx> #include <oox/drawingml/shape.hxx>

2
include/oox/drawingml/table/tablestylecellstylecontext.hxx → oox/inc/drawingml/table/tablestylecellstylecontext.hxx
View File

@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECELLSTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECELLSTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx> #include <oox/core/contexthandler2.hxx>
#include <oox/drawingml/table/tablestylepart.hxx> #include <drawingml/table/tablestylepart.hxx>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

2
include/oox/drawingml/table/tablestylecontext.hxx → oox/inc/drawingml/table/tablestylecontext.hxx
View File

@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx> #include <oox/core/contexthandler2.hxx>
#include <oox/drawingml/table/tablestyle.hxx> #include <drawingml/table/tablestyle.hxx>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

0
include/oox/drawingml/table/tablestylelist.hxx → oox/inc/drawingml/table/tablestylelist.hxx
View File

2
include/oox/drawingml/table/tablestylelistfragmenthandler.hxx → oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
#include <oox/drawingml/table/tablestylelist.hxx> #include <drawingml/table/tablestylelist.hxx>
#include <oox/core/fragmenthandler2.hxx> #include <oox/core/fragmenthandler2.hxx>
namespace oox { namespace oox {

0
include/oox/drawingml/table/tablestylepart.hxx → oox/inc/drawingml/table/tablestylepart.hxx
View File

2
include/oox/drawingml/table/tablestyletextstylecontext.hxx → oox/inc/drawingml/table/tablestyletextstylecontext.hxx
View File

@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLETEXTSTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLETEXTSTYLECONTEXT_HXX
#include <oox/core/contexthandler.hxx> #include <oox/core/contexthandler.hxx>
#include <oox/drawingml/table/tablestylepart.hxx> #include <drawingml/table/tablestylepart.hxx>
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

2
oox/source/drawingml/graphicshapecontext.cxx
View File

@ -24,7 +24,7 @@
#include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/customshapeproperties.hxx" #include "oox/drawingml/customshapeproperties.hxx"
#include "oox/drawingml/diagram/diagram.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/core/xmlfilterbase.hxx"
#include "oox/helper/attributelist.hxx" #include "oox/helper/attributelist.hxx"
#include "oox/helper/graphichelper.hxx" #include "oox/helper/graphichelper.hxx"

2
oox/source/drawingml/shape.cxx
View File

@ -25,7 +25,7 @@
#include "effectproperties.hxx" #include "effectproperties.hxx"
#include "oox/drawingml/shapepropertymap.hxx" #include "oox/drawingml/shapepropertymap.hxx"
#include "oox/drawingml/textbody.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/chartconverter.hxx"
#include "oox/drawingml/chart/chartspacefragment.hxx" #include "oox/drawingml/chart/chartspacefragment.hxx"
#include "oox/drawingml/chart/chartspacemodel.hxx" #include "oox/drawingml/chart/chartspacemodel.hxx"

2
oox/source/drawingml/table/tablebackgroundstylecontext.cxx
View File

@ -19,7 +19,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablebackgroundstylecontext.hxx" #include "drawingml/table/tablebackgroundstylecontext.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/helper/attributelist.hxx" #include "oox/helper/attributelist.hxx"

4
oox/source/drawingml/table/tablecell.cxx
View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "oox/drawingml/table/tablecell.hxx" #include "drawingml/table/tablecell.hxx"
#include "oox/drawingml/table/tableproperties.hxx" #include "drawingml/table/tableproperties.hxx"
#include "oox/drawingml/shapepropertymap.hxx" #include "oox/drawingml/shapepropertymap.hxx"
#include "oox/drawingml/textbody.hxx" #include "oox/drawingml/textbody.hxx"
#include "oox/core/xmlfilterbase.hxx" #include "oox/core/xmlfilterbase.hxx"

2
oox/source/drawingml/table/tablecellcontext.cxx
View File

@ -19,7 +19,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablecellcontext.hxx" #include "drawingml/table/tablecellcontext.hxx"
#include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/textbodycontext.hxx"
#include "oox/drawingml/linepropertiescontext.hxx" #include "oox/drawingml/linepropertiescontext.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx"

8
oox/source/drawingml/table/tablecontext.cxx
View File

@ -20,10 +20,10 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/helper/attributelist.hxx" #include "oox/helper/attributelist.hxx"
#include "oox/drawingml/guidcontext.hxx" #include "oox/drawingml/guidcontext.hxx"
#include "oox/drawingml/table/tablecontext.hxx" #include "drawingml/table/tablecontext.hxx"
#include "oox/drawingml/table/tableproperties.hxx" #include "drawingml/table/tableproperties.hxx"
#include "oox/drawingml/table/tablestylecontext.hxx" #include "drawingml/table/tablestylecontext.hxx"
#include "oox/drawingml/table/tablerowcontext.hxx" #include "drawingml/table/tablerowcontext.hxx"
using namespace ::oox::core; using namespace ::oox::core;
using namespace ::com::sun::star; using namespace ::com::sun::star;

6
oox/source/drawingml/table/tablepartstylecontext.cxx
View File

@ -19,9 +19,9 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablepartstylecontext.hxx" #include "drawingml/table/tablepartstylecontext.hxx"
#include "oox/drawingml/table/tablestyletextstylecontext.hxx" #include "drawingml/table/tablestyletextstylecontext.hxx"
#include "oox/drawingml/table/tablestylecellstylecontext.hxx" #include "drawingml/table/tablestylecellstylecontext.hxx"
using namespace ::oox::core; using namespace ::oox::core;
using namespace ::com::sun::star; using namespace ::com::sun::star;

3
oox/source/drawingml/table/tableproperties.cxx
View File

@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 "oox/drawingml/drawingmltypes.hxx"
#include <com/sun/star/table/XTable.hpp> #include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>

2
oox/source/drawingml/table/tablerow.cxx
View File

@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 "oox/drawingml/drawingmltypes.hxx"
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp>

6
oox/source/drawingml/table/tablerowcontext.cxx
View File

@ -19,9 +19,9 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablerowcontext.hxx" #include "drawingml/table/tablerowcontext.hxx"
#include "oox/drawingml/table/tablecellcontext.hxx" #include "drawingml/table/tablecellcontext.hxx"
#include "oox/drawingml/table/tablerow.hxx" #include "drawingml/table/tablerow.hxx"
using namespace ::oox::core; using namespace ::oox::core;
using namespace ::com::sun::star; using namespace ::com::sun::star;

2
oox/source/drawingml/table/tablestyle.cxx
View File

@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 { namespace oox { namespace drawingml { namespace table {

2
oox/source/drawingml/table/tablestylecellstylecontext.cxx
View File

@ -19,7 +19,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablestylecellstylecontext.hxx" #include "drawingml/table/tablestylecellstylecontext.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/linepropertiescontext.hxx" #include "oox/drawingml/linepropertiescontext.hxx"
#include "oox/helper/attributelist.hxx" #include "oox/helper/attributelist.hxx"

6
oox/source/drawingml/table/tablestylecontext.cxx
View File

@ -19,9 +19,9 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablestylecontext.hxx" #include "drawingml/table/tablestylecontext.hxx"
#include "oox/drawingml/table/tablebackgroundstylecontext.hxx" #include "drawingml/table/tablebackgroundstylecontext.hxx"
#include "oox/drawingml/table/tablepartstylecontext.hxx" #include "drawingml/table/tablepartstylecontext.hxx"
using namespace ::oox::core; using namespace ::oox::core;
using namespace ::com::sun::star; using namespace ::com::sun::star;

4
oox/source/drawingml/table/tablestylelist.cxx
View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "oox/drawingml/table/tablestylelist.hxx" #include "drawingml/table/tablestylelist.hxx"
#include "oox/drawingml/table/tablestyle.hxx" #include "drawingml/table/tablestyle.hxx"
namespace oox { namespace drawingml { namespace table { namespace oox { namespace drawingml { namespace table {

4
oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "oox/drawingml/table/tablestylelistfragmenthandler.hxx" #include "drawingml/table/tablestylelistfragmenthandler.hxx"
#include "oox/drawingml/table/tablestylecontext.hxx" #include "drawingml/table/tablestylecontext.hxx"
using namespace ::oox::core; using namespace ::oox::core;
using namespace ::com::sun::star; using namespace ::com::sun::star;

2
oox/source/drawingml/table/tablestylepart.cxx
View File

@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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" #include "oox/drawingml/drawingmltypes.hxx"
using namespace ::oox::core; using namespace ::oox::core;

2
oox/source/drawingml/table/tablestyletextstylecontext.cxx
View File

@ -19,7 +19,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "oox/drawingml/table/tablestyletextstylecontext.hxx" #include "drawingml/table/tablestyletextstylecontext.hxx"
#include "oox/drawingml/colorchoicecontext.hxx" #include "oox/drawingml/colorchoicecontext.hxx"
#include "oox/helper/attributelist.hxx" #include "oox/helper/attributelist.hxx"

2
oox/source/ppt/pptimport.cxx
View File

@ -23,7 +23,7 @@
#include "oox/ppt/pptimport.hxx" #include "oox/ppt/pptimport.hxx"
#include "oox/drawingml/chart/chartconverter.hxx" #include "oox/drawingml/chart/chartconverter.hxx"
#include "oox/dump/pptxdumper.hxx" #include "oox/dump/pptxdumper.hxx"
#include "oox/drawingml/table/tablestylelistfragmenthandler.hxx" #include "drawingml/table/tablestylelistfragmenthandler.hxx"
#include "oox/helper/graphichelper.hxx" #include "oox/helper/graphichelper.hxx"
#include "oox/ole/vbaproject.hxx" #include "oox/ole/vbaproject.hxx"

2
oox/source/shape/ShapeFilterBase.hxx
View File

@ -23,7 +23,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmldrawing.hxx"
#include "oox/drawingml/table/tablestylelist.hxx" #include "drawingml/table/tablestylelist.hxx"
#include "oox/core/xmlfilterbase.hxx" #include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/drawingmltypes.hxx"