diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-06 22:13:21 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-09 22:49:08 +0200 |
| commit | 51c39a3f4a98bc2fefd1fbffaf7be6b233d6c6c6 (patch) | |
| tree | 8a91c1348efa2ff86a428d131f0fc623e00fb053 /vcl/unx/headless | |
| parent | d672559325df3877ce1d65c137c37f36aeb61086 (diff) | |
Replaced psp::weight::type with FontWeight/finished psp::width::type cleanup
Diffstat (limited to 'vcl/unx/headless')
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 23 | ||||
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.hxx | 1 |
2 files changed, 2 insertions, 22 deletions
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 107b69bae4c6..253c5c8832d9 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -730,7 +730,7 @@ sal_uInt16 PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel } int nWeight = (int)pEntry->meWeight; int nRealWeight = (int)m_pPrinterGfx->GetFontMgr().getFontWeight( nID ); - if( nRealWeight <= (int)psp::weight::Medium && nWeight > (int)WEIGHT_MEDIUM ) + if( nRealWeight <= (int)WEIGHT_MEDIUM && nWeight > (int)WEIGHT_MEDIUM ) { bArtBold = true; } @@ -1078,25 +1078,6 @@ void PspGraphics::DoGetGlyphWidths( psp::fontID aFont, // ---------------------------------------------------------------------------- -FontWeight PspGraphics::ToFontWeight (psp::weight::type eWeight) -{ - switch (eWeight) - { - case psp::weight::Thin: return WEIGHT_THIN; - case psp::weight::UltraLight: return WEIGHT_ULTRALIGHT; - case psp::weight::Light: return WEIGHT_LIGHT; - case psp::weight::SemiLight: return WEIGHT_SEMILIGHT; - case psp::weight::Normal: return WEIGHT_NORMAL; - case psp::weight::Medium: return WEIGHT_MEDIUM; - case psp::weight::SemiBold: return WEIGHT_SEMIBOLD; - case psp::weight::Bold: return WEIGHT_BOLD; - case psp::weight::UltraBold: return WEIGHT_ULTRABOLD; - case psp::weight::Black: return WEIGHT_BLACK; - default: break; - } - return WEIGHT_DONTKNOW; -} - FontPitch PspGraphics::ToFontPitch (psp::pitch::type ePitch) { switch (ePitch) @@ -1141,7 +1122,7 @@ ImplDevFontAttributes PspGraphics::Info2DevFontAttributes( const psp::FastPrintF aDFA.maName = rInfo.m_aFamilyName; aDFA.maStyleName = rInfo.m_aStyleName; aDFA.meFamily = ToFontFamily (rInfo.m_eFamilyStyle); - aDFA.meWeight = ToFontWeight (rInfo.m_eWeight); + aDFA.meWeight = rInfo.m_eWeight; aDFA.meItalic = ToFontItalic (rInfo.m_eItalic); aDFA.meWidthType = rInfo.m_eWidth; aDFA.mePitch = ToFontPitch (rInfo.m_ePitch); diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index 6102b581e3f6..eadc04129632 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -79,7 +79,6 @@ public: Ucs2UIntMap& rUnicodeEnc ); static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& ); static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& ); - static FontWeight ToFontWeight (psp::weight::type eWeight); static FontPitch ToFontPitch (psp::pitch::type ePitch); static FontItalic ToFontItalic (psp::italic::type eItalic); static FontFamily ToFontFamily (psp::family::type eFamily); |