diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-27 05:30:30 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-27 06:26:17 +0200 |
| commit | bcf295f9ca05f5b8d40ef2747b46dfb5564a74a9 (patch) | |
| tree | 020f1ab3baef11d2c3eb2a50225aefb3be9bfa9a /oox | |
| parent | 38a5e500b1b9ff135d190e65413cd519ae8c89be (diff) | |
support axis text properties during OOXML export, tdf#90532
Change-Id: Ied2b21154e31754f8b8461c349fe0e52ce7455e8
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 21 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 6 |
2 files changed, 24 insertions, 3 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 263db8d7e122..c8fb4c9e2693 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2306,6 +2306,25 @@ void ChartExport::exportShapeProps( Reference< XPropertySet > xPropSet ) pFS->endElement( FSNS( XML_c, XML_spPr ) ); } +void ChartExport::exportTextProps(Reference<XPropertySet> xPropSet) +{ + FSHelperPtr pFS = GetFS(); + pFS->startElement(FSNS(XML_c, XML_txPr), FSEND); + + pFS->startElement(FSNS(XML_c, XML_bodyPr), FSEND); + pFS->endElement(FSNS(XML_c, XML_bodyPr)); + + pFS->startElement(FSNS(XML_a, XML_p), FSEND); + pFS->startElement(FSNS(XML_a, XML_pPr), FSEND); + + WriteRunProperties(xPropSet, false, XML_defRPr); + + pFS->endElement(FSNS(XML_a, XML_pPr)); + pFS->endElement(FSNS(XML_a, XML_p)); + + pFS->endElement(FSNS(XML_c, XML_txPr)); +} + void ChartExport::InitPlotArea( ) { Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY); @@ -2680,6 +2699,8 @@ void ChartExport::_exportAxis( // shape properties exportShapeProps( xAxisProp ); + exportTextProps(xAxisProp); + pFS->singleElement( FSNS( XML_c, XML_crossAx ), XML_val, I32S( rAxisIdPair.nCrossAx ), FSEND ); diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 7ba4f1fa8119..4f0621dd79d0 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1167,7 +1167,7 @@ void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32 WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) ); } -void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsField ) +void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsField, sal_Int32 nElement /*= XML_rPr*/ ) { Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY ); Reference< XPropertyState > rXPropState( rRun, UNO_QUERY ); @@ -1318,7 +1318,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel } } - mpFS->startElementNS( XML_a, XML_rPr, + mpFS->startElementNS( XML_a, nElement, XML_b, bold, XML_i, italic, XML_lang, usLanguage.isEmpty() ? NULL : USS( usLanguage ), @@ -1405,7 +1405,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel } } - mpFS->endElementNS( XML_a, XML_rPr ); + mpFS->endElementNS( XML_a, nElement ); } const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsField ) |