diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-24 08:47:57 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-25 21:08:24 +0200 |
| commit | 2ec032e01f03ae22ead30be77b8e89b861504128 (patch) | |
| tree | 15c640e5f6df523b063d09fc1e51bd196014f197 | |
| parent | 6583b2fb941d90fd4701d3635458cd44d759dc93 (diff) | |
Initialize the font list before querying it
And the vcl_fontmetric test must depend on more_fonts. This way
there should never be a missing font, so just assert on it.
Change-Id: If3b71d7c3e52f1beeda73197c56f5efc6a83dbb4
Reviewed-on: https://gerrit.libreoffice.org/74717
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
| -rw-r--r-- | vcl/CppunitTest_vcl_fontmetric.mk | 2 | ||||
| -rw-r--r-- | vcl/qa/cppunit/FontFeatureTest.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/CppunitTest_vcl_fontmetric.mk b/vcl/CppunitTest_vcl_fontmetric.mk index 70e2386e5f50..5496a75c14f9 100644 --- a/vcl/CppunitTest_vcl_fontmetric.mk +++ b/vcl/CppunitTest_vcl_fontmetric.mk @@ -50,4 +50,6 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_fontmetric,\ harfbuzz \ )) +$(eval $(call gb_CppunitTest_use_more_fonts,vcl_fontmetric)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx b/vcl/qa/cppunit/FontFeatureTest.cxx index 96785f75f42c..eba092140450 100644 --- a/vcl/qa/cppunit/FontFeatureTest.cxx +++ b/vcl/qa/cppunit/FontFeatureTest.cxx @@ -35,16 +35,13 @@ public: void FontFeatureTest::testGetFontFeatures() { -// "Linux Libertine G" is a font bundled with LO, but sometimes the -// bundled fonts aren't available so we need to disable test in that case #if HAVE_MORE_FONTS ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT); aVDev->SetOutputSizePixel(Size(10, 10)); OUString aFontName("Linux Libertine G"); - if (aVDev->IsFontAvailable(aFontName)) - return; // Can't test this because the font is not available, so exit + CPPUNIT_ASSERT(aVDev->IsFontAvailable(aFontName)); vcl::Font aFont = aVDev->GetFont(); aFont.SetFamilyName(aFontName); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index d73d987a56d7..22fd7b4e0d9c 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -90,6 +90,7 @@ int OutputDevice::GetDevFontCount() const bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const { + ImplInitFontList(); PhysicalFontFamily* pFound = mxFontCollection->FindFontFamily( rFontName ); return (pFound != nullptr); } |