sd/source/filter/eppt/pptx-epptooxml.cxx | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
New commits: commit 91e95057a70c3d89a2dd482da3a6443e5d4cd729 Author: Julien Nabet <[email protected]> AuthorDate: Wed Jun 25 21:32:17 2025 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Thu Jun 26 12:48:31 2025 +0200 tdf#167214: fix crash on save on PPTX with failed embedded fonts Change-Id: I80dd19161393284983e6f0018e35d0dfd22eefc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187005 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187031 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 06c4addd3671..80c41260545b 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -596,18 +596,21 @@ private: { SfxStyleSheet* pStyleSheet = pTextObject->getSdrPageFromSdrObject()->GetTextStyleSheetForObject(pTextObject); - auto aItemSet = pStyleSheet->GetItemSet(); - if (const SvxFontItem* pItem = aItemSet.GetItemIfSet(EE_CHAR_FONTINFO, false)) + if (pStyleSheet) { - addFontItem(pItem); - } - if (const SvxFontItem* pItem = aItemSet.GetItemIfSet(EE_CHAR_FONTINFO_CJK, false)) - { - addFontItem(pItem); - } - if (const SvxFontItem* pItem = aItemSet.GetItemIfSet(EE_CHAR_FONTINFO_CTL, false)) - { - addFontItem(pItem); + auto aItemSet = pStyleSheet->GetItemSet(); + if (const SvxFontItem* pItem = aItemSet.GetItemIfSet(EE_CHAR_FONTINFO, false)) + { + addFontItem(pItem); + } + if (const SvxFontItem* pItem = aItemSet.GetItemIfSet(EE_CHAR_FONTINFO_CJK, false)) + { + addFontItem(pItem); + } + if (const SvxFontItem* pItem = aItemSet.GetItemIfSet(EE_CHAR_FONTINFO_CTL, false)) + { + addFontItem(pItem); + } } }
