diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-05 20:54:37 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-09 22:49:07 +0200 |
| commit | d672559325df3877ce1d65c137c37f36aeb61086 (patch) | |
| tree | 4d26cf0f5b652632dcf0f81ac8f1bbb035b89eee /vcl/unx/headless | |
| parent | 1a68fd84df3918631b69a29c7c3c6d5f5a57a0e3 (diff) | |
Replaced psp::width::type with FontWidth
Diffstat (limited to 'vcl/unx/headless')
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 20 | ||||
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.hxx | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 7200019db9d2..107b69bae4c6 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -1078,24 +1078,6 @@ void PspGraphics::DoGetGlyphWidths( psp::fontID aFont, // ---------------------------------------------------------------------------- -FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth) -{ - switch (eWidth) - { - case psp::width::UltraCondensed: return WIDTH_ULTRA_CONDENSED; - case psp::width::ExtraCondensed: return WIDTH_EXTRA_CONDENSED; - case psp::width::Condensed: return WIDTH_CONDENSED; - case psp::width::SemiCondensed: return WIDTH_SEMI_CONDENSED; - case psp::width::Normal: return WIDTH_NORMAL; - case psp::width::SemiExpanded: return WIDTH_SEMI_EXPANDED; - case psp::width::Expanded: return WIDTH_EXPANDED; - case psp::width::ExtraExpanded: return WIDTH_EXTRA_EXPANDED; - case psp::width::UltraExpanded: return WIDTH_ULTRA_EXPANDED; - default: break; - } - return WIDTH_DONTKNOW; -} - FontWeight PspGraphics::ToFontWeight (psp::weight::type eWeight) { switch (eWeight) @@ -1161,7 +1143,7 @@ ImplDevFontAttributes PspGraphics::Info2DevFontAttributes( const psp::FastPrintF aDFA.meFamily = ToFontFamily (rInfo.m_eFamilyStyle); aDFA.meWeight = ToFontWeight (rInfo.m_eWeight); aDFA.meItalic = ToFontItalic (rInfo.m_eItalic); - aDFA.meWidthType = ToFontWidth (rInfo.m_eWidth); + aDFA.meWidthType = rInfo.m_eWidth; aDFA.mePitch = ToFontPitch (rInfo.m_ePitch); aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL); diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index 78f36f85295e..6102b581e3f6 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 FontWidth ToFontWidth (psp::width::type eWidth); static FontWeight ToFontWeight (psp::weight::type eWeight); static FontPitch ToFontPitch (psp::pitch::type ePitch); static FontItalic ToFontItalic (psp::italic::type eItalic); |