remove the need to explicitly specify font style for font embedding

The information can be read from the font data itself now, so
this is a bit pointless. It wasn't entirely reliable anyway,
as it is also necessary to ensure two font different font files
don't overwrite each other.

Change-Id: Ie17ab8118e1c08228beb7c749c5c8d6cf3426362

2 files changed, 8 insertions, 1 deletions

diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
index 1b16725e5a88..ad6a46d81b8e 100644
--- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
@@ -39,7 +39,7 @@ class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public UniRefBase
     XMLFontAutoStylePoolNames_Impl m_aNames;
     bool tryToEmbedFonts;
 
-    OUString embedFontFile( const OUString& fontUrl, const char* style );
+    OUString embedFontFile( const OUString& fontUrl );
 
 protected:
 
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 24f1f9799c11..750f56725aaf 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -138,6 +138,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper6<
 
     sal_uInt16  mnImportFlags;
     sal_uInt16  mnErrorFlags;
+    std::set< OUString > embeddedFontUrlsKnown;
 
 protected:
 
@@ -449,6 +450,12 @@ public:
      */
     bool isGraphicLoadOnDemandSupported() const;
 
+    /**
+        Returns true if the embedded font document URL has already been processed.
+        Otherwise returns false and consequent calls with the same URL will return true.
+    */
+    bool embeddedFontAlreadyProcessed( const OUString& url );
+
     virtual void NotifyEmbeddedFontRead() {};
 };