diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 19:51:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 19:52:10 +0100 |
| commit | 86d734c03bcb57d11347404e2cbc7586981bc6e4 (patch) | |
| tree | a9b4d1e3094232c473188118a68ed62445cd5f79 | |
| parent | 4bdd78dc3122bdc1eaf85f05fc3cb1cb9afedf7d (diff) | |
vcl: re-add FontSelectPattern ctor needed on WNT
(was removed in 875c997c7da116402509d0bd75e8c15a66a40529)
Change-Id: I84836056acb3b40bada837347d296d2b60c9a1e3
| -rw-r--r-- | vcl/inc/outfont.hxx | 5 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 1bf500d41fc4..42d552b01ede 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -191,6 +191,11 @@ class FontSelectPattern : public FontSelectPatternAttributes public: FontSelectPattern( const Font&, const String& rSearchName, const Size&, float fExactHeight ); +#ifdef WNT +// ifdeffed to prevent it going into unusedcode.easy + FontSelectPattern( const PhysicalFontFace&, const Size&, + float fExactHeight, int nOrientation, bool bVertical ); +#endif public: // TODO: change to private const PhysicalFontFace* mpFontData; // a matching PhysicalFontFace object diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 94a737d8dab8..c5de8ea437b3 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2172,6 +2172,16 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace // NOTE: no normalization for width/height/orientation } +#ifdef WNT +FontSelectPattern::FontSelectPattern( const PhysicalFontFace& rFontData, + const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) + : FontSelectPatternAttributes(rFontData, rSize, fExactHeight, nOrientation, bVertical) + , mpFontData( &rFontData ) + , mpFontEntry( NULL ) +{ +} +#endif + void FontSelectPattern::copyAttributes(const FontSelectPatternAttributes &rAttributes) { static_cast<FontSelectPatternAttributes&>(*this) = rAttributes; |