[Libreoffice-commits] core.git: vcl/inc vcl/source

[Chris Sherlock]

 vcl/inc/impfont.hxx        |    1 -
 vcl/source/gdi/metric.cxx  |    5 +----
 vcl/source/outdev/font.cxx |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 0791a91f9fe1d5d8858d79eb880fc759e2ce5271
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 13 18:01:04 2016 +1100

    vcl: remove ImplFontMetrics::mnMiscFlags as no longer used
    
    Change-Id: I4ae251107fb754835c0f70ca531fc93557d2ca31
    Reviewed-on: https://gerrit.libreoffice.org/21416
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index b3766e7..2988f4c 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -101,7 +101,6 @@ private:
     long                mnLineHeight;  // Ascent+Descent+EmphasisMark
     long                mnSlant;       // Slant
     long                mnBulletOffset;// Offset for non-printing character
-    sal_uInt16          mnMiscFlags;   // Misc Flags
     sal_uInt32          mnRefCount;    // Reference Counter
 
     bool                mbScalableFont;
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index c7f5253..dd867d8 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -33,7 +33,6 @@ ImplFontMetric::ImplFontMetric()
     mnLineHeight( 0 ),
     mnSlant( 0 ),
     mnBulletOffset( 0 ),
-    mnMiscFlags( 0 ),
     mnRefCount( 1 ),
     mbScalableFont( false ),
     mbFullstopCentered( false ),
@@ -57,9 +56,7 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const
 {
     if(    mbScalableFont     != r.mbScalableFont
         || mbFullstopCentered != r.mbFullstopCentered
-        || mbDevice           != r.mbDevice)
-        return false;
-    if( mnMiscFlags  != r.mnMiscFlags )
+        || mbDevice           != r.mbDevice) // mbDevice == built-in font flag
         return false;
     if( mnAscent     != r.mnAscent )
         return false;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index e56e07d..39ff774 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -212,7 +212,6 @@ FontMetric OutputDevice::GetFontMetric() const
          aMetric.SetKerning( maFont.GetKerning() & ~FontKerning::FontSpecific );
 
     // set remaining metric fields
-    aMetric.mpImplMetric->mnMiscFlags   = 0;
     aMetric.SetBuiltInFontFlag( pFontAttributes->IsBuiltInFont() );
     aMetric.SetScalableFlag( pFontAttributes->IsScalable() );
     aMetric.SetFullstopCenteredFlag( pFontAttributes->IsFullstopCentered() );