diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 14:18:28 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 14:18:28 +1100 |
| commit | b1297e4410a7a258b686380243db936b8a24e982 (patch) | |
| tree | 31d8619b674ca71e32f46d0985887c3ebdf4f9d8 /vcl | |
| parent | bd667840ef661ed6d9dde6151ce6f6bcd37e5668 (diff) | |
vcl: move mnOrientation down header file
ImplFont::mnOrientation is actually a font metric, it really should
be moved to ImplFontMetric so added a TODO.
Change-Id: If0f39be16a782692a0da68c674fc87c474dd6468
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/impfont.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/font/font.cxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 155f8f6dac06..3a7ff26c4b30 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -121,7 +121,6 @@ private: FontStrikeout meStrikeout; FontRelief meRelief; FontEmphasisMark meEmphasisMark; - short mnOrientation; FontKerning meKerning; Size maSize; rtl_TextEncoding meCharSet; @@ -149,6 +148,9 @@ private: mbRotatable:1, // is "rotatable" even a word?!? I'll keep it for consistency for now mbDevice:1; + // TODO: metric data, should be migrated to ImplFontMetric + short mnOrientation; + int mnQuality; }; diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 2cbc7f2fd60f..4d41ed4f687e 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -851,7 +851,6 @@ ImplFont::ImplFont() : meStrikeout( STRIKEOUT_NONE ), meRelief( RELIEF_NONE ), meEmphasisMark( EMPHASISMARK_NONE ), - mnOrientation( 0 ), meKerning( FontKerning::NONE ), meCharSet( RTL_TEXTENCODING_DONTKNOW ), maLanguageTag( LANGUAGE_DONTKNOW ), @@ -869,6 +868,7 @@ ImplFont::ImplFont() : mbSubsettable( false ), mbRotatable( false ), mbDevice( false ), + mnOrientation( 0 ), mnQuality( 0 ) {} @@ -887,7 +887,6 @@ ImplFont::ImplFont( const ImplFont& rImplFont ) : meStrikeout( rImplFont.meStrikeout ), meRelief( rImplFont.meRelief ), meEmphasisMark( rImplFont.meEmphasisMark ), - mnOrientation( rImplFont.mnOrientation ), meKerning( rImplFont.meKerning ), maSize( rImplFont.maSize ), meCharSet( rImplFont.meCharSet ), @@ -907,6 +906,7 @@ ImplFont::ImplFont( const ImplFont& rImplFont ) : mbSubsettable( rImplFont.mbSubsettable ), mbRotatable( rImplFont.mbRotatable ), mbDevice( rImplFont.mbDevice ), + mnOrientation( rImplFont.mnOrientation ), mnQuality( rImplFont.mnQuality ) {} |