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>

11 files changed, 26 insertions, 24 deletions

diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 2aac13c669a7..6a4a99f426fe 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
@@ -129,7 +130,7 @@ sal_Int16 GetFontStrikeout( sal_Int32 nToken );
 sal_Int16 GetCaseMap( sal_Int32 nToken );
 
 /** converts a paragraph align to a ParaAdjust */
-sal_Int16 GetParaAdjust( sal_Int32 nAlign );
+css::style::ParagraphAdjust GetParaAdjust( sal_Int32 nAlign );
 
 // Converts vertical adjust tokens to a TextVerticalAdjust item
 css::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 94ccc6aac24d..4ee841d33eb2 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <oox/dllapi.h>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/token/tokens.hxx>
@@ -226,7 +227,7 @@ public:
 
     static sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
 
-    static const char* GetAlignment( sal_Int32 nAlignment );
+    static const char* GetAlignment( css::style::ParagraphAdjust nAlignment );
 
     sax_fastparser::FSHelperPtr     CreateOutputStream (
                                         const OUString& sFullStream,
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 41df7b2f7948..e11298a0a04e 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -22,6 +22,7 @@
 #define INCLUDED_OOX_PPT_SLIDETRANSITION_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/presentation/AnimationSpeed.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
@@ -64,7 +65,7 @@ namespace oox { namespace ppt {
         ::sal_Int16 mnTransitionType;
         ::sal_Int16 mnTransitionSubType;
         bool  mbTransitionDirectionNormal;
-        ::sal_Int16 mnAnimationSpeed;
+        css::presentation::AnimationSpeed mnAnimationSpeed;
         ::sal_Int32 mnFadeColor;
         bool  mbMode; /**< http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */
         ::sal_Int32 mnAdvanceTime;
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index 4b869f5929cd..c85a4f84905b 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -24,6 +24,7 @@
 #include <drawingml/misccontexts.hxx>
 #include <drawingml/textcharacterproperties.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <drawingml/textfont.hxx>
 #include <drawingml/textspacing.hxx>
 #include <boost/optional.hpp>
@@ -93,8 +94,8 @@ public:
     boost::optional< sal_Int32 >&       getParaLeftMargin(){ return moParaLeftMargin; }
     boost::optional< sal_Int32 >&       getFirstLineIndentation(){ return moFirstLineIndentation; }
 
-    boost::optional< sal_Int16 >&       getParaAdjust() { return moParaAdjust; }
-    void                                setParaAdjust( sal_Int16 nParaAdjust ) { moParaAdjust = nParaAdjust; }
+    boost::optional< css::style::ParagraphAdjust >&       getParaAdjust() { return moParaAdjust; }
+    void                                setParaAdjust( css::style::ParagraphAdjust nParaAdjust ) { moParaAdjust = nParaAdjust; }
 
     void                                apply( const TextParagraphProperties& rSourceProps );
     void                                pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
@@ -123,7 +124,7 @@ protected:
     TextSpacing                     maParaBottomMargin;
     boost::optional< sal_Int32 >    moParaLeftMargin;
     boost::optional< sal_Int32 >    moFirstLineIndentation;
-    boost::optional< sal_Int16 >    moParaAdjust;
+    boost::optional< css::style::ParagraphAdjust >    moParaAdjust;
     sal_Int16                       mnLevel;
 };
 
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index 288749b7358c..725d7af84c87 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/style/CaseMap.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <osl/diagnose.h>
 #include <sax/tools/converter.hxx>
@@ -155,10 +154,10 @@ sal_Int16 GetCaseMap( sal_Int32 nToken )
 }
 
 /** converts a paragraph align to a ParaAdjust */
-sal_Int16 GetParaAdjust( sal_Int32 nAlign )
+ParagraphAdjust GetParaAdjust( sal_Int32 nAlign )
 {
     OSL_ASSERT((nAlign & sal_Int32(0xFFFF0000))==0);
-    sal_Int16 nEnum;
+    ParagraphAdjust nEnum;
     switch( nAlign )
     {
     case XML_ctr:
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;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 20e1fb761d29..b40aea5a27bb 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -413,7 +413,7 @@ static void lclDumpAnyValue( const Any& value)
             case TextVerticalAdjust_BLOCK:
                 s = "block";
                 break;
-            case TextVerticalAdjust_MAKE_FIXED_SIZE:
+            case TextVerticalAdjust::TextVerticalAdjust_MAKE_FIXED_SIZE:
                 s = "make_fixed_size";
                 break;
         }
@@ -433,7 +433,7 @@ static void lclDumpAnyValue( const Any& value)
             case TextHorizontalAdjust_BLOCK:
                 s = "block";
                 break;
-            case TextHorizontalAdjust_MAKE_FIXED_SIZE:
+            case TextHorizontalAdjust::TextHorizontalAdjust_MAKE_FIXED_SIZE:
                 s = "make_fixed_size";
                 break;
         }
@@ -839,7 +839,7 @@ static const char* lclDumpAnyValueCode( const Any& value, int level)
             case TextVerticalAdjust_BLOCK:
                 s = "block";
                 break;
-            case TextVerticalAdjust_MAKE_FIXED_SIZE:
+            case TextVerticalAdjust::TextVerticalAdjust_MAKE_FIXED_SIZE:
                 s = "make_fixed_size";
                 break;
         }
@@ -860,7 +860,7 @@ static const char* lclDumpAnyValueCode( const Any& value, int level)
             case TextHorizontalAdjust_BLOCK:
                 s = "block";
                 break;
-            case TextHorizontalAdjust_MAKE_FIXED_SIZE:
+            case TextHorizontalAdjust::TextHorizontalAdjust_MAKE_FIXED_SIZE:
                 s = "make_fixed_size";
                 break;
         }
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index bf2843500ce3..99057af10745 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -876,7 +876,7 @@ void AxFontDataModel::convertProperties( PropertyMap& rPropMap, const ControlCon
 
     // font effects
     rPropMap.setProperty( PROP_FontWeight, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_BOLD, awt::FontWeight::BOLD, awt::FontWeight::NORMAL ) );
-    rPropMap.setProperty( PROP_FontSlant, getFlagValue< sal_Int16 >( maFontData.mnFontEffects, AX_FONTDATA_ITALIC, FontSlant_ITALIC, FontSlant_NONE ) );
+    rPropMap.setProperty( PROP_FontSlant, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_ITALIC, FontSlant_ITALIC, FontSlant_NONE ) );
     rPropMap.setProperty( PROP_FontUnderline, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_UNDERLINE, maFontData.mbDblUnderline ? awt::FontUnderline::DOUBLE : awt::FontUnderline::SINGLE, awt::FontUnderline::NONE ) );
     rPropMap.setProperty( PROP_FontStrikeout, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_STRIKEOUT, awt::FontStrikeout::SINGLE, awt::FontStrikeout::NONE ) );
     rPropMap.setProperty( PROP_FontHeight, maFontData.getHeightPoints() );
@@ -913,7 +913,7 @@ void AxFontDataModel::convertFromProperties( PropertySet& rPropSet, const Contro
     float fontWeight = (float)0;
     if ( rPropSet.getProperty(fontWeight, PROP_FontWeight ) )
         setFlag( maFontData.mnFontEffects, AX_FONTDATA_BOLD, ( fontWeight == awt::FontWeight::BOLD ) );
-    sal_Int16 nSlant = FontSlant_NONE;
+    FontSlant nSlant = FontSlant_NONE;
     if ( rPropSet.getProperty( nSlant, PROP_FontSlant ) )
         setFlag( maFontData.mnFontEffects, AX_FONTDATA_ITALIC, ( nSlant == FontSlant_ITALIC ) );
 
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index 90df17fb113e..a0ac34848d79 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -20,7 +20,6 @@
 #include "oox/ppt/slidetransition.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/presentation/AnimationSpeed.hpp>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
 #include <com/sun/star/animations/XTransitionFilter.hpp>
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b0e76deae013..ef9260b8d71c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -539,7 +539,7 @@ void lcl_setSurround(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel, co
     if (nMarginTop < -35277) // Less than 1000 points.
         aWrapType.clear();
 
-    sal_Int32 nSurround = css::text::WrapTextMode_THROUGHT;
+    css::text::WrapTextMode nSurround = css::text::WrapTextMode_THROUGHT;
     if ( aWrapType == "square" || aWrapType == "tight" ||
          aWrapType == "through" )
     {
@@ -552,7 +552,7 @@ void lcl_setSurround(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel, co
     else if ( aWrapType == "topAndBottom" )
         nSurround = css::text::WrapTextMode_NONE;
 
-    rPropSet.setProperty(PROP_Surround, nSurround);
+    rPropSet.setProperty(PROP_Surround, (sal_Int32)nSurround);
 }
 
 void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel, const GraphicHelper& rGraphicHelper)