diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-31 11:08:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-31 11:49:46 +0000 |
| commit | 657702108f3e06e7e90411838cd37f9e6a8b1471 (patch) | |
| tree | fead6bb6e770c84a7397d7916e62efad5d78f9f1 /oox/source/export | |
| parent | 82025e7f7af562549a900b9f1d76ed73fe4f2a58 (diff) | |
use actual UNO enums in oox
Change-Id: I7fbb3619287acde0c397ff9b4015271ec785cc46
Reviewed-on: https://gerrit.libreoffice.org/35958
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/export')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 4 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 2de77698daa4..1a970a1f877a 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -984,7 +984,7 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x strPos = "b"; break; case css::chart::ChartLegendPosition_NONE: - case css::chart::ChartLegendPosition_MAKE_FIXED_SIZE: + case css::chart::ChartLegendPosition::ChartLegendPosition_MAKE_FIXED_SIZE: // nothing break; } @@ -1019,7 +1019,7 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x pFS->singleElement(FSNS(XML_c, XML_y), XML_val, IS(y), FSEND); - SAL_WARN_IF(aPos.Anchor != 0, "oox", "unsupported anchor position"); + SAL_WARN_IF(aPos.Anchor != css::drawing::Alignment_TOP_LEFT, "oox", "unsupported anchor position"); pFS->endElement(FSNS(XML_c, XML_manualLayout)); pFS->endElement(FSNS(XML_c, XML_layout)); diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index beb7e0ea6ee2..393936cab94f 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -61,7 +61,6 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/GraphicCrop.hpp> @@ -1907,7 +1906,7 @@ sal_Int32 DrawingML::getBulletMarginIndentation (const Reference< XPropertySet > return 0; } -const char* DrawingML::GetAlignment( sal_Int32 nAlignment ) +const char* DrawingML::GetAlignment( style::ParagraphAdjust nAlignment ) { const char* sAlignment = nullptr; @@ -1957,8 +1956,9 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara sal_Int16 nLevel = -1; GET( nLevel, NumberingLevel ); - sal_Int16 nAlignment( style::ParagraphAdjust_LEFT ); - GET( nAlignment, ParaAdjust ); + sal_Int16 nTmp( (sal_Int16)style::ParagraphAdjust_LEFT ); + GET( nTmp, ParaAdjust ); + style::ParagraphAdjust nAlignment = (style::ParagraphAdjust)nTmp; bool bHasLinespacing = false; LineSpacing aLineSpacing; |