diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-04-26 10:12:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-26 10:12:04 +0200 |
| commit | e2873d699b47f55c67d0ee874b49a075d52eb6fb (patch) | |
| tree | a7a350ff5d74273bc6f0598841b1f96a5b998566 /vcl | |
| parent | Remove unused FontSelectPattern constructor (diff) | |
| download | core-e2873d699b47f55c67d0ee874b49a075d52eb6fb.tar.gz core-e2873d699b47f55c67d0ee874b49a075d52eb6fb.zip | |
Revert "Remove unused FontSelectPattern constructor"
This reverts commit 44a4c577fd54de12e089e76c234f6b5f5099a3d4.
...the ctor is still used on Windows.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/outfont.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 8d159a53d2fc..19c2c3a855a3 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -161,6 +161,8 @@ class FontSelectPattern : public ImplFontAttributes public: FontSelectPattern( const Font&, const String& rSearchName, const Size&, float fExactHeight ); + FontSelectPattern( const ImplFontData&, const Size&, + float fExactHeight, int nOrientation, bool bVertical ); public: // TODO: change to private String maTargetName; // name of the font name token that is chosen diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 93e85ff29bd2..adc2bf7736fd 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2175,6 +2175,26 @@ FontSelectPattern::FontSelectPattern( const Font& rFont, mnWidth = -mnWidth; } +// ----------------------------------------------------------------------- + +FontSelectPattern::FontSelectPattern( const ImplFontData& rFontData, + const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) +: ImplFontAttributes( rFontData ), + mnWidth( rSize.Width() ), + mnHeight( rSize.Height() ), + mfExactHeight( fExactHeight ), + mnOrientation( nOrientation ), + meLanguage( 0 ), + mbVertical( bVertical ), + mbNonAntialiased( false ), + mbEmbolden( false ), + mpFontData( &rFontData ), + mpFontEntry( NULL ) +{ + maTargetName = maSearchName = maName; + // NOTE: no normalization for width/height/orientation +} + // ======================================================================= size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const |