summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/xmloff/xmlimp.hxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx2
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.hxx2
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx2
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx2
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx6
8 files changed, 10 insertions, 10 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 48d4425edee1..f55ccf46149b 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -591,7 +591,7 @@ public:
const OUString& fontName, const char* extra,
std::vector< unsigned char > key, bool eot);
- virtual void NotifyEmbeddedFontRead() {};
+ virtual void NotifyContainsEmbeddedFont() {}
// something referencing a macro/script was imported
void NotifyMacroEventRead();
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index e88fe74dd9f2..84b50188b7b6 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1875,7 +1875,7 @@ const ScXMLEditAttributeMap& ScXMLImport::GetEditAttributeMap() const
return *mpEditAttrMap;
}
-void ScXMLImport::NotifyEmbeddedFontRead()
+void ScXMLImport::NotifyContainsEmbeddedFont()
{
if (pDoc)
pDoc->SetEmbedFonts(true);
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index be25dc026062..910617027beb 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -453,7 +453,7 @@ public:
ScEditEngineDefaulter* GetEditEngine();
const ScXMLEditAttributeMap& GetEditAttributeMap() const;
- virtual void NotifyEmbeddedFontRead() override;
+ virtual void NotifyContainsEmbeddedFont() override;
};
#endif
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index 9b90f94fd419..ce415aeb41e5 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -84,7 +84,7 @@ XMLFontAutoStylePool* SwXMLExport::CreateFontAutoStylePool()
return new SwXMLFontAutoStylePool_Impl( *this, !blockFontEmbedding );
}
-void SwXMLImport::NotifyEmbeddedFontRead()
+void SwXMLImport::NotifyContainsEmbeddedFont()
{
getDoc()->getIDocumentSettingAccess().set( DocumentSettingId::EMBED_FONTS, true );
}
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 060186339e46..3be18e1b5bfd 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -173,7 +173,7 @@ public:
css::uno::Reference<css::document::XDocumentProperties>
GetDocumentProperties() const;
- virtual void NotifyEmbeddedFontRead() override;
+ virtual void NotifyContainsEmbeddedFont() override;
const SwDoc* getDoc() const;
SwDoc* getDoc();
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index fcd4871fcf85..60db53160082 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -684,7 +684,7 @@ OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, bool& rbFixed, OUS
return aDecl.maStrText;
}
-void SdXMLImport::NotifyEmbeddedFontRead()
+void SdXMLImport::NotifyContainsEmbeddedFont()
{
uno::Reference< lang::XMultiServiceFactory > xFac( GetModel(), uno::UNO_QUERY );
if( xFac.is() )
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index c64fac494330..fe87aafe1c32 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -178,7 +178,7 @@ public:
OUString GetFooterDecl( const OUString& rName ) const;
OUString GetDateTimeDecl( const OUString& rName, bool& rbFixed, OUString& rDateTimeFormat );
- virtual void NotifyEmbeddedFontRead() override;
+ virtual void NotifyContainsEmbeddedFont() override;
};
#endif // _SDXMLIMP_HXX
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 8f4019985beb..c98bbc212e4c 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -311,7 +311,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url, bo
{
if( GetImport().embeddedFontAlreadyProcessed( url ))
{
- GetImport().NotifyEmbeddedFontRead();
+ GetImport().NotifyContainsEmbeddedFont();
return;
}
OUString fontName = font.familyName();
@@ -327,7 +327,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url, bo
inputStream.set( storage->openStreamElement( url.copy( url.indexOf( '/' ) + 1 ), ::embed::ElementModes::READ ),
UNO_QUERY_THROW );
if (GetImport().addEmbeddedFont(inputStream, fontName, "?", std::vector< unsigned char >(), eot))
- GetImport().NotifyEmbeddedFontRead();
+ GetImport().NotifyContainsEmbeddedFont();
inputStream->closeInput();
}
else
@@ -339,7 +339,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const ::css::uno::Seque
const uno::Reference< io::XInputStream > xInput( new comphelper::SequenceInputStream( rData ) );
const OUString fontName = font.familyName();
if (GetImport().addEmbeddedFont(xInput, fontName, "?", std::vector< unsigned char >(), eot))
- GetImport().NotifyEmbeddedFontRead();
+ GetImport().NotifyContainsEmbeddedFont();
xInput->closeInput();
}