diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-14 22:30:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-15 13:03:08 +0100 |
| commit | 3e0bc5c7fe715ebd38bfa64a49b23df58d6d29a9 (patch) | |
| tree | 78975e75c4f91dd7ee3c335b6d941482515c52be /include | |
| parent | 24ada6566044881c95e33fada9d305904db46ad7 (diff) | |
oox: move enum DocumentType out of drawingml.hxx
... which has nasty dependencies.
Change-Id: I84ba0302142ade6e15291b782453dbe3bac753dd
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 7 | ||||
| -rw-r--r-- | include/oox/export/utils.hxx | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 988d34eed315..9305c0108da2 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -29,6 +29,8 @@ #include <filter/msfilter/escherex.hxx> #include "oox/drawingml/drawingmltypes.hxx" #include <oox/token/tokens.hxx> +#include <oox/export/utils.hxx> + #ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY // Our rotation is counter-clockwise and is in 100ths of a degree. // drawingML rotation is clockwise and is in 60000ths of a degree. @@ -86,9 +88,8 @@ protected: virtual ~DMLTextExport() {} }; -class OOX_DLLPUBLIC DrawingML { -public: - enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX }; +class OOX_DLLPUBLIC DrawingML +{ private: static int mnImageCounter; diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx index 53cdfcd9f92d..32a9fbed2a0f 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -44,6 +44,10 @@ OString write1000thOfAPercent(T number) return OString::number( number * 1000 ); } +namespace oox { namespace drawingml { + enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX }; +} } + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |