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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index f0a931ca0678..b4db87fc8417 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -360,7 +360,7 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_In m_pFilter->openFragmentStreamWithSerializer( aFileName, "application/vnd.openxmlformats-officedocument.drawingml.chart+xml" ); - oox::drawingml::ChartExport aChartExport( XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX ); + oox::drawingml::ChartExport aChartExport(XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DOCUMENT_DOCX); aChartExport.ExportContent(); return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } @@ -436,7 +436,7 @@ void DocxExport::OutputDML(uno::Reference<drawing::XShape>& xShape) nNamespace = XML_wpg; else if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) nNamespace = XML_pic; - oox::drawingml::ShapeExport aExport(nNamespace, m_pAttrOutput->GetSerializer(), nullptr, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput); + oox::drawingml::ShapeExport aExport(nNamespace, m_pAttrOutput->GetSerializer(), nullptr, m_pFilter, oox::drawingml::DOCUMENT_DOCX, m_pAttrOutput); aExport.WriteShape(xShape); } @@ -1480,7 +1480,7 @@ DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCur SetFS(m_pDocumentFS); // the DrawingML access - m_pDrawingML = new oox::drawingml::DrawingML( m_pDocumentFS, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX ); + m_pDrawingML = new oox::drawingml::DrawingML(m_pDocumentFS, m_pFilter, oox::drawingml::DOCUMENT_DOCX); // the attribute output for the document m_pAttrOutput = new DocxAttributeOutput( *this, m_pDocumentFS, m_pDrawingML ); |