diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-14 22:30:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-18 14:06:56 +0000 |
| commit | 09db5c150ea7eb14cfbbe710b32bc8bb6e79a247 (patch) | |
| tree | 678c659b5e9db5481e3fc1903943da06bdd22c09 /include | |
| parent | edf886a14f08d8cb58db2a22485da58662d0181b (diff) | |
oox: move enum DocumentType out of drawingml.hxx
... which has nasty dependencies.
Change-Id: I84ba0302142ade6e15291b782453dbe3bac753dd
(cherry picked from commit 3e0bc5c7fe715ebd38bfa64a49b23df58d6d29a9)
Reviewed-on: https://gerrit.libreoffice.org/21493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 66854f61998f..f042c7364372 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -52,6 +52,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: */ |