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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index beb79c3e0ce2..b8f758ea571c 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1145,7 +1145,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape ) typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > ); typedef std::unordered_map< const char*, ShapeConverter, rtl::CStringHash, rtl::CStringEqual> NameToConvertMapType; -static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType eDocumentType) +static const NameToConvertMapType& lcl_GetConverters(DocumentType eDocumentType) { static bool shape_map_inited = false; static NameToConvertMapType shape_converters; @@ -1178,7 +1178,7 @@ static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType eDo shape_converters[ "com.sun.star.presentation.OutlinerShape" ] = &ShapeExport::WriteTextShape; shape_converters[ "com.sun.star.presentation.SlideNumberShape" ] = &ShapeExport::WriteTextShape; shape_converters[ "com.sun.star.presentation.TitleTextShape" ] = &ShapeExport::WriteTextShape; - if (eDocumentType == DrawingML::DOCUMENT_DOCX) + if (eDocumentType == DOCUMENT_DOCX) shape_converters[ "com.sun.star.drawing.GroupShape" ] = &ShapeExport::WriteGroupShape; shape_map_inited = true; |