use actual UNO enums in vcl..xmlsecurity

Change-Id: Id862544f27ebcbe8363f93dc83192d0f0cddb5cc
Reviewed-on: https://gerrit.libreoffice.org/36041
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 10 insertions, 10 deletions

diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index 090f429df30f..4a7de4824b17 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -141,7 +141,7 @@ using namespace ::com::sun::star::uno;
 
 +(int)convertItalicStyle:(PropertyValue)property {
     int italicStyle = NSUnitalicFontMask;
-    sal_Int16 value = property.Value.get< ::css_awt::FontSlant>();
+    ::css_awt::FontSlant value = property.Value.get< ::css_awt::FontSlant>();
     if ( value == ::css_awt::FontSlant_ITALIC ) {
         italicStyle = NSItalicFontMask;
     }
@@ -279,7 +279,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
     // 'NSJustifiedTextAlignment' is deprecated: first deprecated in macOS 10.12
     // 'NSLeftTextAlignment' is deprecated: first deprecated in macOS 10.12
     // 'NSRightTextAlignment' is deprecated: first deprecated in macOS 10.12
-                switch(alignment) {
+                switch((css::style::ParagraphAdjust)alignment) {
                     case css::style::ParagraphAdjust_RIGHT : textAlignment = [NSNumber numberWithInteger:NSRightTextAlignment]    ; break;
                     case css::style::ParagraphAdjust_CENTER: textAlignment = [NSNumber numberWithInteger:NSCenterTextAlignment]   ; break;
                     case css::style::ParagraphAdjust_BLOCK : textAlignment = [NSNumber numberWithInteger:NSJustifiedTextAlignment]; break;
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index e47d69ba9594..413f470cac56 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -192,7 +192,7 @@ css::awt::FontSlant vcl::unohelper::ConvertFontSlant(FontItalic eItalic)
             eRet = css::awt::FontSlant_DONTKNOW;
             break;
         case FontItalic_FORCE_EQUAL_SIZE:
-            eRet = css::awt::FontSlant_MAKE_FIXED_SIZE;
+            eRet = css::awt::FontSlant::FontSlant_MAKE_FIXED_SIZE;
             break;
     }
     return eRet;
@@ -223,7 +223,7 @@ FontItalic vcl::unohelper::ConvertFontSlant(css::awt::FontSlant eSlant)
             //there is no vcl reverse normal
             eRet = ITALIC_NORMAL;
             break;
-        case css::awt::FontSlant_MAKE_FIXED_SIZE:
+        case css::awt::FontSlant::FontSlant_MAKE_FIXED_SIZE:
             eRet = FontItalic_FORCE_EQUAL_SIZE;
             break;
     }
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index a82d82cf2103..095254f4193e 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -216,7 +216,7 @@ SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo )
     rOStm.WriteUInt16( static_cast<sal_uInt16>(rLineInfo.mpImplLineInfo->meLineJoin) );
 
     // since version4
-    rOStm.WriteUInt16( rLineInfo.mpImplLineInfo->meLineCap );
+    rOStm.WriteUInt16( (sal_uInt16)rLineInfo.mpImplLineInfo->meLineCap );
 
     return rOStm;
 }
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 08428e876fc2..049479961bef 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -1586,7 +1586,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                     {
                         rOStm.WriteInt16( GDI_LINECAP_ACTION );
                         rOStm.WriteInt32( 6 );
-                        rOStm.WriteInt16( rInfo.GetLineCap() );
+                        rOStm.WriteInt16( (sal_Int16)rInfo.GetLineCap() );
                     }
                 }
 
@@ -1742,7 +1742,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                     {
                         rOStm.WriteInt16( GDI_LINECAP_ACTION );
                         rOStm.WriteInt32( 6 );
-                        rOStm.WriteInt16( rInfo.GetLineCap() );
+                        rOStm.WriteInt16( (sal_Int16)rInfo.GetLineCap() );
                     }
                 }
 
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 1ee48d456c17..5a1819b2319f 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -387,7 +387,7 @@ Adjust2Justification(const uno::Any& rAny)
 {
     const gchar * value = nullptr;
 
-    switch( rAny.get<short>() )
+    switch( (style::ParagraphAdjust)rAny.get<short>() )
     {
         case style::ParagraphAdjust_LEFT:
             value = "left";
@@ -419,7 +419,7 @@ Adjust2Justification(const uno::Any& rAny)
 static bool
 Justification2Adjust( uno::Any& rAny, const gchar * value )
 {
-    short nParagraphAdjust;
+    style::ParagraphAdjust nParagraphAdjust;
 
     if( strncmp( value, STRNCMP_PARAM( "left" ) ) == 0 )
         nParagraphAdjust = style::ParagraphAdjust_LEFT;
@@ -432,7 +432,7 @@ Justification2Adjust( uno::Any& rAny, const gchar * value )
     else
         return false;
 
-    rAny <<= nParagraphAdjust;
+    rAny <<= (short)nParagraphAdjust;
     return true;
 }