diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-12 11:11:30 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-14 11:29:22 +0200 |
| commit | fce166376335b97bf26bcd895ae785070f393878 (patch) | |
| tree | a41102d59ab12c8cbc2c91690aee129bd32163bd /oox/source/shape | |
| parent | df344855e1c90e6be333afc143044bb04114c683 (diff) | |
Move oox/drawingml/*hxx internal headers to oox/inc.
Do not export LinePropertiesContext class as visible.
And move GraphicProperties to its own header.
Change-Id: I047c181e9f2adc7e59885f59663ea56c7eb898ed
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/WpgContext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/shape/WpsContext.cxx | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index 9b62fef85897..4cbf200f8ce2 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -8,7 +8,7 @@ */ #include "WpgContext.hxx" -#include <oox/drawingml/shapepropertiescontext.hxx> +#include <drawingml/shapepropertiescontext.hxx> #include <oox/drawingml/shapegroupcontext.hxx> #include <oox/drawingml/graphicshapecontext.hxx> diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index fb42e6268394..4d5863873fd5 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -8,11 +8,15 @@ */ #include "WpsContext.hxx" -#include <oox/drawingml/shapepropertiescontext.hxx> -#include <oox/drawingml/shapestylecontext.hxx> +#include <drawingml/customshapeproperties.hxx> +#include <drawingml/shapepropertiescontext.hxx> +#include <drawingml/shapestylecontext.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <oox/drawingml/drawingmltypes.hxx> +#include <boost/optional.hpp> + using namespace com::sun::star; namespace oox |