generic integers to enums

Change-Id: Ic43283b9e1666c0f2162e277dc79fc6f992ef616

2 files changed, 20 insertions, 20 deletions

diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 0f92d66c41e9..9163ef593476 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -44,8 +44,8 @@ class XMLFontAutoStylePoolEntry_Impl
     OUString    sName;
     OUString    sFamilyName;
     OUString    sStyleName;
-    sal_Int16   nFamily;
-    sal_Int16   nPitch;
+    FontFamily  nFamily;
+    FontPitch   nPitch;
     rtl_TextEncoding eEnc;
 
 public:
@@ -54,22 +54,22 @@ public:
             const ::rtl::OUString& rName,
             const ::rtl::OUString& rFamilyName,
             const ::rtl::OUString& rStyleName,
-            sal_Int16 nFamily,
-            sal_Int16 nPitch,
+            FontFamily nFamily,
+            FontPitch nPitch,
             rtl_TextEncoding eEnc );
 
     inline XMLFontAutoStylePoolEntry_Impl(
             const ::rtl::OUString& rFamilyName,
             const ::rtl::OUString& rStyleName,
-            sal_Int16 nFamily,
-            sal_Int16 nPitch,
+            FontFamily nFamily,
+            FontPitch nPitch,
             rtl_TextEncoding eEnc );
 
     const OUString& GetName() const { return sName; }
     const OUString& GetFamilyName() const { return sFamilyName; }
     const OUString& GetStyleName() const { return sStyleName; }
-    sal_Int16 GetFamily() const {   return nFamily; }
-    sal_Int16 GetPitch() const { return nPitch; }
+    FontFamily GetFamily() const {   return nFamily; }
+    FontPitch GetPitch() const { return nPitch; }
     rtl_TextEncoding GetEncoding() const { return eEnc; }
 };
 
@@ -78,8 +78,8 @@ inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl(
         const ::rtl::OUString& rName,
         const ::rtl::OUString& rFamilyName,
         const ::rtl::OUString& rStyleName,
-        sal_Int16 nFam,
-        sal_Int16 nP,
+        FontFamily nFam,
+        FontPitch nP,
         rtl_TextEncoding eE ) :
     sName( rName ),
     sFamilyName( rFamilyName ),
@@ -93,8 +93,8 @@ inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl(
 inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl(
         const ::rtl::OUString& rFamilyName,
         const ::rtl::OUString& rStyleName,
-        sal_Int16 nFam,
-        sal_Int16 nP,
+        FontFamily nFam,
+        FontPitch nP,
         rtl_TextEncoding eE ) :
     sFamilyName( rFamilyName ),
     sStyleName( rStyleName ),
@@ -149,8 +149,8 @@ XMLFontAutoStylePool::~XMLFontAutoStylePool()
 OUString XMLFontAutoStylePool::Add(
             const OUString& rFamilyName,
             const OUString& rStyleName,
-            sal_Int16 nFamily,
-            sal_Int16 nPitch,
+            FontFamily nFamily,
+            FontPitch nPitch,
             rtl_TextEncoding eEnc )
 {
     OUString sPoolName;
@@ -203,8 +203,8 @@ OUString XMLFontAutoStylePool::Add(
 ::rtl::OUString XMLFontAutoStylePool::Find(
             const OUString& rFamilyName,
             const OUString& rStyleName,
-            sal_Int16 nFamily,
-            sal_Int16 nPitch,
+            FontFamily nFamily,
+            FontPitch nPitch,
             rtl_TextEncoding eEnc ) const
 {
     OUString sName;
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 6c94cbd222b5..4a6bd2b66c3b 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -118,8 +118,8 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
 
     sal_Unicode cBullet = 0xf095;
     OUString sBulletFontName, sBulletFontStyleName ;
-    sal_Int16 eBulletFontFamily = FAMILY_DONTKNOW;
-    sal_Int16 eBulletFontPitch = PITCH_DONTKNOW;
+    FontFamily eBulletFontFamily = FAMILY_DONTKNOW;
+    FontPitch eBulletFontPitch = PITCH_DONTKNOW;
     rtl_TextEncoding eBulletFontEncoding = RTL_TEXTENCODING_DONTKNOW;
 
     OUString sImageURL;
@@ -177,8 +177,8 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
             {
                 sBulletFontName = rFDesc.Name;
                 sBulletFontStyleName = rFDesc.StyleName;
-                eBulletFontFamily = (sal_Int16)rFDesc.Family;
-                eBulletFontPitch = (sal_Int16)rFDesc.Pitch;
+                eBulletFontFamily = static_cast< FontFamily >( rFDesc.Family );
+                eBulletFontPitch = static_cast< FontPitch >( rFDesc.Pitch );
                 eBulletFontEncoding = (rtl_TextEncoding)rFDesc.CharSet;
             }
         }