[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac vcl/unx

[Andras Timar (via logerrit)]

 configure.ac                               |    2 +-
 vcl/unx/generic/gdi/freetypetextrender.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dadcf15b93ea7a20024f551327fed2744887a52f
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jan 31 20:18:41 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jan 31 20:20:00 2023 +0100

    Bump version to 22.05.10.1
    
    Change-Id: I27a9ff61800178a2d1cdea300abb6d1cf704f81d

diff --git a/configure.ac b/configure.ac
index 046d9199e452..41095d2aed24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[22.05.9.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.10.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx 
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index ea8474e69fee..1a63f9d63076 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -149,7 +149,7 @@ void FreeTypeTextRenderImpl::GetFontMetric( 
ImplFontMetricDataRef& rxFontMetric,
 
 std::unique_ptr<GenericSalLayout> FreeTypeTextRenderImpl::GetTextLayout(int 
nFallbackLevel)
 {
-    assert(mpFreetypeFont[nFallbackLevel]);
+    //assert(mpFreetypeFont[nFallbackLevel]);
     if (!mpFreetypeFont[nFallbackLevel])
         return nullptr;
     return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]);