vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7003fe557bd2223e9af1ed0eb6c97b209686a8ab
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Sep 4 19:38:52 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Sep 5 11:20:23 2020 +0200
rhbz#1875377 if sort order is equivalent keep order fontconfig presents
there are two fonts in fedora 32/33 for regular Cantarell
/usr/share/fonts/cantarell/Cantarell-Regular.otf
and
/usr/share/fonts/cantarell/Cantarell-VF.otf
where VF is the Variable Font version. The Cantarell-Regular
ones has a CFF table and export to pdf creates a font subset
that works perfectly fine. The VF one does not have a CFF
table and the fallback case doesn't work for pdf export.
Both have the same version, use a stable sort to retain
their relative order that fontconfig presents so we use
the Cantarell-Regular version we would see if we didn't
sort by version at all.
Change-Id: I750006b980810fc59e0a152d42ae17f29f46e3b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102062
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index d8cc1db16849..65cba56e069c 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -213,7 +213,7 @@ FcFontSet* FontCfgWrapper::getFontSet()
addFontSet( FcSetSystem );
addFontSet( FcSetApplication );
-
::std::sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont());
+
std::stable_sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont());
}
return m_pFontSet;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
