tdf#137643 alternative solution to activate embedded fonts in one batch

Change-Id: Ib5ffb2b8a31f237d5d2e465bf3f777590e0bfade
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104947
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index bfc2cbeb028f..48d4425edee1 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -74,7 +74,7 @@ namespace xmloff {
 namespace xmloff::token {
     class FastTokenHandler;
 }
-
+class EmbeddedFontsHelper;
 class ProgressBarHelper;
 class SvXMLNamespaceMap;
 class SvXMLImport_Impl;
@@ -246,6 +246,10 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
 
     css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
 
+    // tdf#69060 & tdf#137643 import embedded fonts and activate them in a
+    // batch in EmbeddedFontsHelper's dtor
+    std::unique_ptr<EmbeddedFontsHelper> mxEmbeddedFontHelper;
+
 protected:
     bool                        mbIsFormsSupported;
     bool                        mbIsTableShapeSupported;
@@ -582,7 +586,13 @@ public:
     */
     bool embeddedFontAlreadyProcessed( const OUString& url );
 
+    // see EmbeddedFontsHelper::addEmbeddedFont
+    bool addEmbeddedFont( const css::uno::Reference< css::io::XInputStream >& stream,
+        const OUString& fontName, const char* extra,
+        std::vector< unsigned char > key, bool eot);
+
     virtual void NotifyEmbeddedFontRead() {};
+
     // something referencing a macro/script was imported
     void NotifyMacroEventRead();