diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-01-09 13:22:05 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 03:48:48 +0000 |
| commit | 88a797f8ae937d4cabd6eff3e9daca74482ca217 (patch) | |
| tree | 58f84bb77d57bed12fa99a8403e6a3ba11ba66cc /vcl | |
| parent | bcc884fa879a013a3e634a13ab51663ea8f62419 (diff) | |
Revert part of commit 85ac3cd
A ctor of FontSelectPatternAttributes was moved twice, so an error
introduced under Windows
Change-Id: Id7cc8d01d643b27987f31d6c181d81ac440b6b1e
Reviewed-on: https://gerrit.libreoffice.org/21283
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/font/fontselect.cxx | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx index 82c33f56c9ec..53fd49121351 100644 --- a/vcl/source/font/fontselect.cxx +++ b/vcl/source/font/fontselect.cxx @@ -123,40 +123,6 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace // NOTE: no normalization for width/height/orientation } - -FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont, - const OUString& rSearchName, const Size& rSize, float fExactHeight ) - : maSearchName( rSearchName ) - , mnWidth( rSize.Width() ) - , mnHeight( rSize.Height() ) - , mfExactHeight( fExactHeight) - , mnOrientation( rFont.GetOrientation() ) - , meLanguage( rFont.GetLanguage() ) - , mbVertical( rFont.IsVertical() ) - , mbNonAntialiased( false ) - , mbEmbolden( false ) -{ - maTargetName = GetFamilyName(); - - rFont.GetFontAttributes( *this ); - - // normalize orientation between 0 and 3600 - if( 3600 <= (unsigned)mnOrientation ) - { - if( mnOrientation >= 0 ) - mnOrientation %= 3600; - else - mnOrientation = 3600 - (-mnOrientation % 3600); - } - - // normalize width and height - if( mnHeight < 0 ) - mnHeight = -mnHeight; - if( mnWidth < 0 ) - mnWidth = -mnWidth; -} - - FontSelectPattern::FontSelectPattern( const PhysicalFontFace& rFontData, const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) : FontSelectPatternAttributes(rFontData, rSize, fExactHeight, nOrientation, bVertical) |