generic integers to enums

Change-Id: Ic43283b9e1666c0f2162e277dc79fc6f992ef616

dbaccess/source/filter/xml/xmlExport.cxx

@@ -1177,7 +1177,8 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
             xCollection.set( xSup->getColumns(), UNO_SET_THROW );
             awt::FontDescriptor aFont;
             _xProp->getPropertyValue(PROPERTY_FONT) >>= aFont;
-            GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,aFont.Family,aFont.Pitch,aFont.CharSet );
+            GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,static_cast<FontFamily>(aFont.Family),
+                static_cast<FontPitch>(aFont.Pitch),aFont.CharSet );
 
             m_aCurrentPropertyStates = m_xCellExportHelper->Filter(_xProp);
             if ( !m_aCurrentPropertyStates.empty() && !xCollection->hasElements() )

reportdesign/source/filter/xml/xmlExport.cxx

@@ -1150,7 +1150,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
         {
             const awt::FontDescriptor aFont = xFormat->getFontDescriptor();
             OSL_ENSURE(!aFont.Name.isEmpty(),"No Font Name !");
-            GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,aFont.Family,aFont.Pitch,aFont.CharSet );
+            GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,static_cast<FontFamily>(aFont.Family),
+                static_cast<FontPitch>(aFont.Pitch),aFont.CharSet );
         }
         catch(beans::UnknownPropertyException&)
         {

sc/source/filter/xml/xmlfonte.cxx

@@ -49,8 +49,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8
         {
             const SvxFontItem *pFont((const SvxFontItem *)pItem);
             Add( pFont->GetFamilyName(), pFont->GetStyleName(),
-                    sal::static_int_cast<sal_Int16>(pFont->GetFamily()),
-                    sal::static_int_cast<sal_Int16>(pFont->GetPitch()),
+                    pFont->GetFamily(), pFont->GetPitch(),
                     pFont->GetCharSet() );
         }
         sal_uInt32 nItems(pItemPool->GetItemCount2( nWhichId ));
@@ -60,8 +59,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8
             {
                 const SvxFontItem *pFont((const SvxFontItem *)pItem);
                 Add( pFont->GetFamilyName(), pFont->GetStyleName(),
-                     sal::static_int_cast<sal_Int16>(pFont->GetFamily()),
-                     sal::static_int_cast<sal_Int16>(pFont->GetPitch()),
+                     pFont->GetFamily(), pFont->GetPitch(),
                      pFont->GetCharSet() );
             }
         }

sw/source/filter/xml/xmlfonte.cxx

@@ -56,7 +56,7 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(
         const SvxFontItem& rFont =
             (const SvxFontItem&)rPool.GetDefaultItem( nWhichId );
         Add( rFont.GetFamilyName(), rFont.GetStyleName(),
-             static_cast< sal_uInt16 >(rFont.GetFamily()), static_cast< sal_uInt16 >(rFont.GetPitch()),
+             rFont.GetFamily(), rFont.GetPitch(),
              rFont.GetCharSet() );
         sal_uInt32 nItems = rPool.GetItemCount2( nWhichId );
         for( sal_uInt32 j = 0; j < nItems; ++j )
@@ -66,7 +66,7 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(
                 const SvxFontItem *pFont =
                             (const SvxFontItem *)pItem;
                 Add( pFont->GetFamilyName(), pFont->GetStyleName(),
-                     static_cast< sal_uInt16 >(pFont->GetFamily()), static_cast< sal_uInt16 >(pFont->GetPitch()),
+                     pFont->GetFamily(), pFont->GetPitch(),
                      pFont->GetCharSet() );
             }
         }

xmloff/inc/xmloff/XMLFontAutoStylePool.hxx

@@ -23,6 +23,7 @@
 #include "sal/config.h"
 #include "xmloff/dllapi.h"
 #include <rtl/ustring.hxx>
+#include <tools/fontenum.hxx>
 #include <xmloff/uniref.hxx>
 #include <set>
 
@@ -53,15 +54,15 @@ public:
     ::rtl::OUString Add(
             const ::rtl::OUString& rFamilyName,
             const ::rtl::OUString& rStyleName,
-            sal_Int16 nFamily,
-            sal_Int16 nPitch,
+            FontFamily nFamily,
+            FontPitch nPitch,
             rtl_TextEncoding eEnc );
 
     ::rtl::OUString Find(
             const ::rtl::OUString& rFamilyName,
             const ::rtl::OUString& rStyleName,
-            sal_Int16 nFamily,
-            sal_Int16 nPitch,
+            FontFamily nFamily,
+            FontPitch nPitch,
             rtl_TextEncoding eEnc )const;
     ::rtl::OUString Find( const ::rtl::OUString& rInternalName ) const;
 

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;

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;
             }
         }

xmloff/source/text/txtexppr.cxx

@@ -24,8 +24,6 @@
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/awt/FontFamily.hpp>
-#include <com/sun/star/awt/FontPitch.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 
@@ -43,7 +41,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::awt;
 
 void XMLTextExportPropertySetMapper::handleElementItem(
         SvXMLExport& rExp,
@@ -204,8 +201,8 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 {
     OUString sFamilyName;
     OUString sStyleName;
-    sal_Int16 nFamily = awt::FontFamily::DONTKNOW;
-    sal_Int16 nPitch = awt::FontPitch::DONTKNOW;
+    FontFamily nFamily = FAMILY_DONTKNOW;
+    FontPitch nPitch = PITCH_DONTKNOW;
     rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
 
     OUString sTmp;
@@ -216,9 +213,9 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 
     sal_Int16 nTmp = sal_Int16();
     if( pFontFamilyState && (pFontFamilyState->maValue >>= nTmp ) )
-        nFamily = nTmp;
+        nFamily = static_cast< FontFamily >( nTmp );
     if( pFontPitchState && (pFontPitchState->maValue >>= nTmp ) )
-        nPitch = nTmp;
+        nPitch = static_cast< FontPitch >( nTmp );
     if( pFontCharsetState && (pFontCharsetState->maValue >>= nTmp ) )
         eEnc = (rtl_TextEncoding)nTmp;