diff options
-rw-r--r-- | config_host/config_features.h.in | 5 | ||||
-rw-r--r-- | config_host/config_fonts.h.in | 9 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 1 | ||||
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 1 | ||||
-rw-r--r-- | emfio/qa/cppunit/emf/EmfImportTest.cxx | 1 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_export_test.cxx | 1 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_filters_test.cxx | 1 | ||||
-rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter4.cxx | 1 | ||||
-rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 1 | ||||
-rw-r--r-- | vcl/qa/cppunit/FontFeatureTest.cxx | 1 | ||||
-rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 1 | ||||
-rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 1 | ||||
-rw-r--r-- | vcl/qa/cppunit/svm/svmtest.cxx | 1 |
21 files changed, 28 insertions, 5 deletions
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index db4f7e1b28ae..86a5c6a9c6d9 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -129,11 +129,6 @@ #define HAVE_FEATURE_POPPLER 0 /* - * Whether extra fonts are available - */ -#define HAVE_MORE_FONTS 0 - -/* * Whether the automatic online updater is available */ #define HAVE_FEATURE_UPDATE_MAR 0 diff --git a/config_host/config_fonts.h.in b/config_host/config_fonts.h.in new file mode 100644 index 000000000000..edb828128658 --- /dev/null +++ b/config_host/config_fonts.h.in @@ -0,0 +1,9 @@ +#ifndef CONFIG_FONTS_H +#define CONFIG_FONTS_H + +/* + * Whether extra fonts are available + */ +#define HAVE_MORE_FONTS 0 + +#endif diff --git a/configure.ac b/configure.ac index 88e75bf7ffa9..01867a3e66f9 100644 --- a/configure.ac +++ b/configure.ac @@ -14543,6 +14543,7 @@ AC_CONFIG_HEADERS([config_host/config_feature_desktop.h]) AC_CONFIG_HEADERS([config_host/config_feature_opencl.h]) AC_CONFIG_HEADERS([config_host/config_firebird.h]) AC_CONFIG_HEADERS([config_host/config_folders.h]) +AC_CONFIG_HEADERS([config_host/config_fonts.h]) AC_CONFIG_HEADERS([config_host/config_fuzzers.h]) AC_CONFIG_HEADERS([config_host/config_gio.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index c1b1cc34cbf9..3f3d59b8673d 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -52,6 +52,7 @@ #include <comphelper/scopeguard.hxx> #include <cairo.h> #include <config_features.h> +#include <config_fonts.h> #include <config_mpl.h> #include <tools/json_writer.hxx> #include <o3tl/unit_conversion.hxx> diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 8bdd43d926f1..7c76acb3c952 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -8,6 +8,7 @@ */ #include <config_features.h> +#include <config_fonts.h> #include <test/bootstrapfixture.hxx> diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index c9d5d17179ef..c436a53ab8e7 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -9,6 +9,7 @@ #include <sal/config.h> #include <config_features.h> +#include <config_fonts.h> #include <test/bootstrapfixture.hxx> #include <test/xmltesttools.hxx> diff --git a/sc/qa/unit/subsequent_export_test.cxx b/sc/qa/unit/subsequent_export_test.cxx index 158323215660..872d5122a686 100644 --- a/sc/qa/unit/subsequent_export_test.cxx +++ b/sc/qa/unit/subsequent_export_test.cxx @@ -13,6 +13,7 @@ #include <officecfg/Office/Common.hxx> #include <config_features.h> +#include <config_fonts.h> #include <sfx2/sfxmodelfactory.hxx> diff --git a/sc/qa/unit/subsequent_filters_test.cxx b/sc/qa/unit/subsequent_filters_test.cxx index 39bf4cd443f6..ddd06d672317 100644 --- a/sc/qa/unit/subsequent_filters_test.cxx +++ b/sc/qa/unit/subsequent_filters_test.cxx @@ -16,6 +16,7 @@ #include <test/bootstrapfixture.hxx> #include <osl/file.hxx> #include <config_features.h> +#include <config_fonts.h> #include <vcl/svapp.hxx> #include <sfx2/docfilt.hxx> diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index f3719b886bad..8cc905aed45b 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -10,6 +10,7 @@ #include <sal/config.h> #include <config_features.h> +#include <config_fonts.h> #include <vcl/print.hxx> #include <test/bootstrapfixture.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index b9a9c884589c..740c814430fc 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <config_features.h> +#include <config_fonts.h> #include <unotools/tempfile.hxx> #include <comphelper/configuration.hxx> #include <officecfg/Office/Writer.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index a16de671a6ba..5a1589007609 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/text/XTextTable.hpp> #include <config_features.h> +#include <config_fonts.h> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index efc541eeaf26..2b1d603b2fb5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -10,6 +10,7 @@ #include <swmodeltestbase.hxx> #include <config_features.h> +#include <config_fonts.h> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index baf7d12383b7..f66748c3ebff 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -10,6 +10,7 @@ #include <memory> #include <string_view> #include <config_features.h> +#include <config_fonts.h> #ifdef MACOSX #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 191d7895a9d5..0b8c5b190ea3 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -11,6 +11,7 @@ #include <swmodeltestbase.hxx> #include <config_features.h> +#include <config_fonts.h> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontUnderline.hpp> diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 0e9c604badc7..9eb628549a79 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -125,6 +125,7 @@ #include <editeng/unolingu.hxx> #include <vcl/scheduler.hxx> #include <config_features.h> +#include <config_fonts.h> #include <sfx2/watermarkitem.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index 0101e246a42d..3ad3f9f08382 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -128,6 +128,7 @@ #include <editeng/unolingu.hxx> #include <vcl/scheduler.hxx> #include <config_features.h> +#include <config_fonts.h> #include <sfx2/watermarkitem.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 19dffc946001..5e316eff4202 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/text/XPageCursor.hpp> #include <config_features.h> +#include <config_fonts.h> #include <editeng/ulspitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx b/vcl/qa/cppunit/FontFeatureTest.cxx index bd8595902449..091654b8a87a 100644 --- a/vcl/qa/cppunit/FontFeatureTest.cxx +++ b/vcl/qa/cppunit/FontFeatureTest.cxx @@ -9,6 +9,7 @@ #include <test/bootstrapfixture.hxx> #include <config_features.h> +#include <config_fonts.h> #include <cppunit/TestAssert.h> #include <vcl/font/Feature.hxx> diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 21e1e58f96ac..c281e63eb7ff 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -8,6 +8,7 @@ */ #include <config_features.h> +#include <config_fonts.h> #include <ostream> #include <vector> diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 7c6e273bf173..386a85eefe21 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -14,6 +14,7 @@ #include <type_traits> #include <config_features.h> +#include <config_fonts.h> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx index 7b2fcc8cf4cc..06690512b1f1 100644 --- a/vcl/qa/cppunit/svm/svmtest.cxx +++ b/vcl/qa/cppunit/svm/svmtest.cxx @@ -31,6 +31,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <config_features.h> +#include <config_fonts.h> #include <vcl/skia/SkiaHelper.hxx> using namespace css; |