svx/source/svdraw/svdpdf.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e2b235b2d818cb2b5dc210edf26ee9fa40890732
Author:     Caolán McNamara <[email protected]>
AuthorDate: Wed Oct 22 20:30:16 2025 +0100
Commit:     Caolán McNamara <[email protected]>
CommitDate: Fri Oct 24 10:12:45 2025 +0200

    skip empty fonts
    
    Change-Id: I037ef2b00d62f1ca9bdd2acdadf88c649ec9235d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192879
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Reviewed-by: Mike Kaganski <[email protected]>

diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index cb03adbb9cde..ed9d8ec1d719 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -279,6 +279,13 @@ void ImpSdrPdfImport::CollectFonts()
                     continue;
                 }
 
+                std::vector<uint8_t> aFontData;
+                if (!pPageObject->getFontData(font, aFontData) || 
aFontData.empty())
+                {
+                    SAL_WARN("sd.filter", "that's worrying, skipping " << 
sFontName);
+                    continue;
+                }
+
                 SubSetInfo* pSubSetInfo;
 
                 SAL_INFO("sd.filter", "importing font: " << font);
@@ -299,9 +306,6 @@ void ImpSdrPdfImport::CollectFonts()
                         = maDifferentSubsetsForFont.emplace(sPostScriptName, 
aSubSetInfo).first;
                     pSubSetInfo = &result->second;
                 }
-                std::vector<uint8_t> aFontData;
-                if (!pPageObject->getFontData(font, aFontData))
-                    SAL_WARN("sd.filter", "that's worrying");
                 bool bTTF = EmbeddedFontsManager::analyzeTTF(aFontData.data(), 
aFontData.size(),
                                                              eFontWeight);
                 SAL_INFO_IF(!bTTF, "sd.filter", "not ttf/otf, converting");

Reply via email to