diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-07-07 16:07:05 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-07-07 22:27:35 +0200 |
| commit | 4fe073b563336c1b8bfb97a9addc8fb7a8145858 (patch) | |
| tree | 79f5a32c902a9de7a4aaaf61f5ebbb639b072f4f /vcl | |
| parent | 614804f034a114544dc14047e72ca18a946fbae3 (diff) | |
Drop TEST_FONTS_MISSING for HAVE_MORE_FONTS
TEST_FONTS_MISSING is just adding confusion since it tests for hardcoded
font names, while what we really want (most of time) is to check whether
bundled fonts are enabled or not, and HAVE_MORE_FONTS just does that.
Change-Id: I1b00d359c37fa49584ca27c319d6d0e937c3b20b
Reviewed-on: https://gerrit.libreoffice.org/57136
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/FontFeatureTest.cxx | 6 | ||||
| -rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 12 | ||||
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 1 |
3 files changed, 9 insertions, 10 deletions
diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx b/vcl/qa/cppunit/FontFeatureTest.cxx index b37cac87a283..879411ac5d1c 100644 --- a/vcl/qa/cppunit/FontFeatureTest.cxx +++ b/vcl/qa/cppunit/FontFeatureTest.cxx @@ -8,7 +8,7 @@ */ #include <test/bootstrapfixture.hxx> -#include <config_test.h> +#include <config_features.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> @@ -38,7 +38,7 @@ 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 !TEST_FONTS_MISSING +#if HAVE_MORE_FONTS ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT); aVDev->SetOutputSizePixel(Size(10, 10)); @@ -114,7 +114,7 @@ void FontFeatureTest::testGetFontFeatures() CPPUNIT_ASSERT_EQUAL(sal_uInt32(2), rParameter2.getCode()); CPPUNIT_ASSERT(!rParameter2.getDescription().isEmpty()); } -#endif // !TEST_FONTS_MISSING +#endif // HAVE_MORE_FONTS } void FontFeatureTest::testParseFeature() diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index cf1027f0810c..7a8389ffc427 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -7,11 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <config_test.h> +#include <config_features.h> #include <ostream> #include <vector> -#if !defined(_WIN32) && !TEST_FONTS_MISSING +#if !defined(_WIN32) && HAVE_MORE_FONTS static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec); #endif @@ -25,7 +25,7 @@ static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& #include <osl/file.hxx> #include <osl/process.h> -#if !defined(_WIN32) && !TEST_FONTS_MISSING +#if !defined(_WIN32) && HAVE_MORE_FONTS static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec) { rStream << "{ "; @@ -42,7 +42,7 @@ class VclComplexTextTest : public test::BootstrapFixture public: VclComplexTextTest() : BootstrapFixture(true, false) {} -#if !TEST_FONTS_MISSING +#if HAVE_MORE_FONTS /// Play with font measuring etc. void testArabic(); #endif @@ -51,7 +51,7 @@ public: #endif CPPUNIT_TEST_SUITE(VclComplexTextTest); -#if !TEST_FONTS_MISSING +#if HAVE_MORE_FONTS CPPUNIT_TEST(testArabic); #endif #if defined(_WIN32) @@ -60,7 +60,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -#if !TEST_FONTS_MISSING +#if HAVE_MORE_FONTS void VclComplexTextTest::testArabic() { const unsigned char pOneTwoThreeUTF8[] = { diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 849e87b90f4a..628964bce664 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -8,7 +8,6 @@ */ #include <config_features.h> -#include <config_test.h> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> |