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>

6 files changed, 5 insertions, 9 deletions

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index ad30e3d67629..894056d70d94 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -9,7 +9,6 @@
 
 #include <memory>
 #include <sstream>
-#include <config_test.h>
 
 #include <swmodeltestbase.hxx>
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 6036ba18882b..852e63114769 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -9,7 +9,6 @@
 
 #include <memory>
 #include <sstream>
-#include <config_test.h>
 
 #include <swmodeltestbase.hxx>
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 8cff697d4ca8..4b3a9cf3b7d5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <memory>
-#include <config_test.h>
 
 #ifdef MACOSX
 #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a80aff6ce770..6f86c484bd42 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <memory>
-#include <config_test.h>
+#include <config_features.h>
 
 #ifdef MACOSX
 #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
@@ -559,7 +559,7 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, "groupshape-child-rotation
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().X);
     CPPUNIT_ASSERT_EQUAL(sal_Int32(-5741), xShape->getPosition().Y);
 
-#if ! TEST_FONTS_MISSING
+#if HAVE_MORE_FONTS
     xShape.set(xGroupShape->getByIndex(4), uno::UNO_QUERY);
     // This was 887, i.e. border distances were included in the height.
     CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape->getSize().Height);
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 001c188be2fc..7b34c98c3dd3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <memory>
-#include <config_test.h>
 
 #ifdef MACOSX
 #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index d5a84b2b1ded..295f39b7dc11 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -46,7 +46,7 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 
-#include <config_test.h>
+#include <config_features.h>
 
 #include <bordertest.hxx>
 
@@ -613,7 +613,7 @@ DECLARE_WW8EXPORT_TEST(testLayoutHanging, "fdo68967.doc")
     // This must not hang in layout
 }
 
-#if !TEST_FONTS_MISSING
+#if HAVE_MORE_FONTS
 DECLARE_WW8EXPORT_TEST(testfdo68963, "fdo68963.doc")
 {
     // The problem was that the text was not displayed.
@@ -1294,7 +1294,7 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, "comment-export.odt")
 }
 
 #if !defined(MACOSX) && !defined(_WIN32)
-#if !TEST_FONTS_MISSING
+#if HAVE_MORE_FONTS
 DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
 {
     //emulate table "keep with next" -do not split table