diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:09:00 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:09:00 +0100 |
| commit | da6e7f3f9505930ef4922bc7d72d8e28f5bff7bd (patch) | |
| tree | bcee3b063ca3410f72a08f3c8d228ef9a6e6f723 /oox/source/drawingml/chart | |
| parent | 62abc842160313fbcdee8ff46c6b4fae6321f21d (diff) | |
| parent | 005b11645a3438fd519a101a043f24a40ea47c02 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/filters
Conflicts:
oox/source/drawingml/chart/converterbase.cxx
oox/source/export/drawingml.cxx
Diffstat (limited to 'oox/source/drawingml/chart')
| -rw-r--r-- | oox/source/drawingml/chart/converterbase.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 46e3ca4c39b7..60962c30270d 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -39,7 +39,8 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <tools/solar.h> // for F_PI180 +#include "basegfx/numeric/ftools.hxx" +#include "properties.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/theme.hxx" |