From 895dc882c451bcc03236267d3ce33be218451721 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 21 Feb 2013 12:45:12 +0100 Subject: generic integers to enums Change-Id: Ic43283b9e1666c0f2162e277dc79fc6f992ef616 --- dbaccess/source/filter/xml/xmlExport.cxx | 3 ++- reportdesign/source/filter/xml/xmlExport.cxx | 3 ++- sc/source/filter/xml/xmlfonte.cxx | 6 ++---- sw/source/filter/xml/xmlfonte.cxx | 4 ++-- xmloff/inc/xmloff/XMLFontAutoStylePool.hxx | 9 ++++---- xmloff/source/style/XMLFontAutoStylePool.cxx | 32 ++++++++++++++-------------- xmloff/source/style/xmlnume.cxx | 8 +++---- xmloff/source/text/txtexppr.cxx | 11 ++++------ 8 files changed, 37 insertions(+), 39 deletions(-) diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index ca5bb8c5b0c6..4410d851446b 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/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(aFont.Family), + static_cast(aFont.Pitch),aFont.CharSet ); m_aCurrentPropertyStates = m_xCellExportHelper->Filter(_xProp); if ( !m_aCurrentPropertyStates.empty() && !xCollection->hasElements() ) diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index df6a24eae2ee..7a41d84c36a5 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1150,7 +1150,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const ReferencegetFontDescriptor(); 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(aFont.Family), + static_cast(aFont.Pitch),aFont.CharSet ); } catch(beans::UnknownPropertyException&) { diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 0caca5501dab..4092bfa18dfd 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/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(pFont->GetFamily()), - sal::static_int_cast(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(pFont->GetFamily()), - sal::static_int_cast(pFont->GetPitch()), + pFont->GetFamily(), pFont->GetPitch(), pFont->GetCharSet() ); } } diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index 60e9dca5137a..1f1dd574de06 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/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() ); } } diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx index 8ed243daa321..a4c64250aaaa 100644 --- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx +++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include +#include #include #include @@ -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; 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; } } diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 56e36e7663f9..c2c042a89644 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include @@ -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; -- cgit