sc/source/filter/xml/xmlfonte.cxx | 39 +++++++++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 5 deletions(-)
New commits:
commit de8468e64bfa389b44cae6ff20d4ab9a463f5af1
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri May 23 23:20:08 2025 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat May 24 14:17:21 2025 +0200
sc: fix warning C6011: Dereferencing NULL pointer 'this->GetDocument()'
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/sc/source/filter/xml/xmlfonte.cxx(149):
error C2220: the following warning is treated as an error
C: C: C: C: C: make[1]: ***
[C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/solenv/gbuild/LinkTarget.mk:338:
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/workdir/CxxObject/sc/source/filter/xml/xmlfonte.o]
Error 2
make[1]: *** Waiting for unfinished jobs....
after
commit e61a179b4ff8ce2072c3c0780628eb38c7a43529
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Fri May 23 12:14:27 2025 +0500
tdf#166627: embed fonts everywhere we emit font data
Change-Id: Ic81b8193dec7fc9f8d2e3468ea09f9d24c4d3be1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185721
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/sc/source/filter/xml/xmlfonte.cxx
b/sc/source/filter/xml/xmlfonte.cxx
index fa321c2616ed..6c14af4ca4fc 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -142,10 +142,39 @@ XMLFontAutoStylePool*
ScXMLExport::CreateFontAutoStylePool()
return new ScXMLFontAutoStylePool_Impl(GetDocument(), *this);
}
-bool ScXMLExport::getEmbedFonts() { return GetDocument()->IsEmbedFonts(); }
-bool ScXMLExport::getEmbedOnlyUsedFonts() { return
GetDocument()->IsEmbedUsedFontsOnly(); }
-bool ScXMLExport::getEmbedLatinScript() { return
GetDocument()->IsEmbedFontScriptLatin(); }
-bool ScXMLExport::getEmbedAsianScript() { return
GetDocument()->IsEmbedFontScriptAsian(); }
-bool ScXMLExport::getEmbedComplexScript() { return
GetDocument()->IsEmbedFontScriptComplex(); }
+bool ScXMLExport::getEmbedFonts()
+{
+ if (ScDocument* pDoc = GetDocument())
+ return pDoc->IsEmbedFonts();
+ return SvXMLExport::getEmbedFonts();
+}
+
+bool ScXMLExport::getEmbedOnlyUsedFonts()
+{
+ if (ScDocument* pDoc = GetDocument())
+ return pDoc->IsEmbedUsedFontsOnly();
+ return SvXMLExport::getEmbedOnlyUsedFonts();
+}
+
+bool ScXMLExport::getEmbedLatinScript()
+{
+ if (ScDocument* pDoc = GetDocument())
+ return pDoc->IsEmbedFontScriptLatin();
+ return SvXMLExport::getEmbedLatinScript();
+}
+
+bool ScXMLExport::getEmbedAsianScript()
+{
+ if (ScDocument* pDoc = GetDocument())
+ return pDoc->IsEmbedFontScriptAsian();
+ return SvXMLExport::getEmbedAsianScript();
+}
+
+bool ScXMLExport::getEmbedComplexScript()
+{
+ if (ScDocument* pDoc = GetDocument())
+ return pDoc->IsEmbedFontScriptComplex();
+ return SvXMLExport::getEmbedComplexScript();
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
