diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-02-21 12:45:12 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-02-21 18:26:21 +0100 |
| commit | 895dc882c451bcc03236267d3ce33be218451721 (patch) | |
| tree | c1ce54188d19d0850a0cfcdc0d0019c4aa10c137 /xmloff/source/text | |
| parent | 93363ff6ba8198e83417eb805b9342e8711b8c09 (diff) | |
generic integers to enums
Change-Id: Ic43283b9e1666c0f2162e277dc79fc6f992ef616
Diffstat (limited to 'xmloff/source/text')
| -rw-r--r-- | xmloff/source/text/txtexppr.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
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 <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; |