vcl/unx/generic/gdi/cairotextrender.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 26049777aed944c57d51f6baa132c742edaa4ac3
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Nov 7 20:39:45 2017 +0000
ofz speed up fuzzers a tad
Change-Id: I4ed35408e3640d2b141218599cd895c09da1e2b0
Reviewed-on: https://gerrit.libreoffice.org/44427
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
index d868ff701049..b7cc4207dff1 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -20,6 +20,7 @@
#include <unx/cairotextrender.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <unotools/configmgr.hxx>
#include <vcl/settings.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svapp.hxx>
@@ -392,7 +393,8 @@ void CairoTextRender::GetDevFontList(
PhysicalFontCollection* pFontCollection )
rGC.AnnounceFonts( pFontCollection );
// register platform specific font substitutions if available
- SalGenericInstance::RegisterFontSubstitutors( pFontCollection );
+ if (!utl::ConfigManager::IsAvoidConfig())
+ SalGenericInstance::RegisterFontSubstitutors( pFontCollection );
}
void FontConfigFontOptions::cairo_font_options_substitute(FcPattern* pPattern)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
