vcl: Create accessor and mutator for builtin font flag in FontMetric

Accessor and mutator created for builtin font flag, removed the
existing bit field.

See commit description in 8bfccd3a71d911b6d ("vcl: Create accessor
and mutator for font scaling in FontMetric") for reasoning behind
patch.

Unit tests
- check to ensure that can set builtin font flag
- check equality operator on FontMetric after setting builtin font
flag

Change-Id: Iac3f4270f86d10f9dcd0bb6e3951c0e983a4f22f
Reviewed-on: https://gerrit.libreoffice.org/21414
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

1 files changed, 19 insertions, 2 deletions

diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx
index 1428cfb3ffbb..f434ae04487c 100644
--- a/vcl/qa/cppunit/fontmetric.cxx
+++ b/vcl/qa/cppunit/fontmetric.cxx
@@ -23,11 +23,13 @@ public:
 
     void testScalableFlag();
     void testFullstopCenteredFlag();
+    void testBuiltInFontFlag();
     void testEqualityOperator();
 
     CPPUNIT_TEST_SUITE(VclFontMetricTest);
     CPPUNIT_TEST(testScalableFlag);
     CPPUNIT_TEST(testFullstopCenteredFlag);
+    CPPUNIT_TEST(testBuiltInFontFlag);
     CPPUNIT_TEST(testEqualityOperator);
     CPPUNIT_TEST_SUITE_END();
 };
@@ -44,7 +46,6 @@ void VclFontMetricTest::testScalableFlag()
     CPPUNIT_ASSERT_MESSAGE( "Scalable flag should be true", aFontMetric.IsScalable() );
 }
 
-
 void VclFontMetricTest::testFullstopCenteredFlag()
 {
     // default constructor should set scalable flag to false
@@ -57,6 +58,17 @@ void VclFontMetricTest::testFullstopCenteredFlag()
     CPPUNIT_ASSERT_MESSAGE( "Fullstop centered flag should be true", aFontMetric.IsFullstopCentered() );
 }
 
+void VclFontMetricTest::testBuiltInFontFlag()
+{
+    // default constructor should set scalable flag to false
+    FontMetric aFontMetric;
+
+    CPPUNIT_ASSERT_MESSAGE( "Built-in font flag should be false after default constructor called", !aFontMetric.IsBuiltInFont() );
+
+    aFontMetric.SetBuiltInFontFlag(true);
+
+    CPPUNIT_ASSERT_MESSAGE( "Built-in font flag should be true", aFontMetric.IsBuiltInFont() );
+}
 
 void VclFontMetricTest::testEqualityOperator()
 {
@@ -71,7 +83,12 @@ void VclFontMetricTest::testEqualityOperator()
     aLhs.SetFullstopCenteredFlag(true);
     aRhs.SetFullstopCenteredFlag(true);
 
-    CPPUNIT_ASSERT_MESSAGE( "Fullstop centered flag set same", aLhs == aRhs );
+    CPPUNIT_ASSERT_MESSAGE( "Scalable font flag set same", aLhs == aRhs );
+
+    aLhs.SetBuiltInFontFlag(true);
+    aRhs.SetBuiltInFontFlag(true);
+
+    CPPUNIT_ASSERT_MESSAGE( "Scalable font flag set same", aLhs == aRhs );
 }