Move HAVE_MORE_FONTS into an extra config header
No need to recompile most of LibreOffice, because the --with-fonts configure flag changed. This preprocessor define is just used by unit tests anyway. Change-Id: Ia2eae7d0c74e59e034fdd8513504a34e51ab428e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128197 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
@@ -128,11 +128,6 @@
|
||||
*/
|
||||
#define HAVE_FEATURE_POPPLER 0
|
||||
|
||||
/*
|
||||
* Whether extra fonts are available
|
||||
*/
|
||||
#define HAVE_MORE_FONTS 0
|
||||
|
||||
/*
|
||||
* Whether the automatic online updater is available
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
#ifndef CONFIG_FONTS_H
|
||||
#define CONFIG_FONTS_H
|
||||
|
||||
/*
|
||||
* Whether extra fonts are available
|
||||
*/
|
||||
#define HAVE_MORE_FONTS 0
|
||||
|
||||
#endif
|
||||
@@ -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])
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <config_features.h>
|
||||
#include <config_fonts.h>
|
||||
|
||||
#include <test/bootstrapfixture.hxx>
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <sal/config.h>
|
||||
#include <config_features.h>
|
||||
#include <config_fonts.h>
|
||||
|
||||
#include <test/bootstrapfixture.hxx>
|
||||
#include <test/xmltesttools.hxx>
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
#include <officecfg/Office/Common.hxx>
|
||||
#include <config_features.h>
|
||||
#include <config_fonts.h>
|
||||
|
||||
#include <sfx2/sfxmodelfactory.hxx>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <config_features.h>
|
||||
#include <config_fonts.h>
|
||||
#include <vcl/print.hxx>
|
||||
|
||||
#include <test/bootstrapfixture.hxx>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <config_features.h>
|
||||
#include <config_fonts.h>
|
||||
|
||||
#include <ostream>
|
||||
#include <vector>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user