[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - distro-configs/CPLinux.conf vcl/unx

[Andras Timar (via logerrit)]

 distro-configs/CPLinux.conf                |    1 +
 vcl/unx/generic/gdi/freetypetextrender.cxx |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14969915918118aeec7a18f934ef0a77d3a21eb3
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Nov 4 22:42:18 2021 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 22:44:49 2021 +0100

    [cp] --disable-skia, there's not that much point in building that for Linux
    
    Change-Id: I0ccd3e6b544609dcdb6e78ef846adaa0f4d93768

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index 72fd0b0ffd17..7e586c7410a5 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -45,3 +45,4 @@
 --enable-release-build
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-symbols
+--disable-skia
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx 
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 5f28ebdb91fe..9e47ad2d5ce0 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -148,7 +148,6 @@ void FreeTypeTextRenderImpl::GetFontMetric( 
ImplFontMetricDataRef& rxFontMetric,
 
 std::unique_ptr<GenericSalLayout> FreeTypeTextRenderImpl::GetTextLayout(int 
nFallbackLevel)
 {
-    assert(mpFreetypeFont[nFallbackLevel]);
     if (!mpFreetypeFont[nFallbackLevel])
         return nullptr;
     return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]);