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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 6e04a38a4f09..7c7d4d88b542 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -445,7 +445,7 @@ void XclExpImgData::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr pWorksheet = rStrm.GetCurrentStream(); - DrawingML aDML( pWorksheet, &rStrm, DrawingML::DOCUMENT_XLSX ); + DrawingML aDML(pWorksheet, &rStrm, drawingml::DOCUMENT_XLSX); OUString rId = aDML.WriteImage( maGraphic ); pWorksheet->singleElement( XML_picture, FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( rId ).getStr(), @@ -1137,7 +1137,7 @@ void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm ) { XclObjAny::WriteFromTo( rStrm, mxShape, GetTab() ); Reference< XModel > xModel( mxChartDoc, UNO_QUERY ); - ChartExport aChartExport( XML_xdr, pDrawing, xModel, &rStrm, DrawingML::DOCUMENT_XLSX ); + ChartExport aChartExport(XML_xdr, pDrawing, xModel, &rStrm, drawingml::DOCUMENT_XLSX); static sal_Int32 nChartCount = 0; nChartCount++; aChartExport.WriteChartObj( mxShape, nChartCount ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 5a76ae87ef27..8f5ac1491491 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1164,7 +1164,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream(); - ShapeExport aDML( XML_xdr, pDrawing, nullptr, &rStrm, DrawingML::DOCUMENT_XLSX ); + ShapeExport aDML(XML_xdr, pDrawing, nullptr, &rStrm, drawingml::DOCUMENT_XLSX); std::shared_ptr<oox::drawingml::URLTransformer> pURLTransformer(new ScURLTransformer(*mpDoc)); aDML.SetURLTranslator(pURLTransformer); |