summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml/xmlimp.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-01-22 09:55:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-22 09:37:08 +0100
commite9262376f0acbe67a544d7e391992c9943ed6d8b (patch)
tree690d30eaa5172f3188827091927e46a11708b508 /sw/source/filter/xml/xmlimp.cxx
parent6f6a64952d9aa4826e83ad94c2a6de2344cbe2de (diff)
use fastparser for XMLFontStylesContext
Change-Id: I7b273cdc0f90f2a8c9527d1f19fed97672a74741 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87175 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/xml/xmlimp.cxx')
-rw-r--r--sw/source/filter/xml/xmlimp.cxx17
1 files changed, 6 insertions, 11 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 1735a9716140..743eb5ef1325 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -235,6 +235,9 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SwXMLDocContext_Impl::c
case XML_ELEMENT(OFFICE, XML_MASTER_STYLES):
return GetSwImport().CreateMasterStylesContext();
break;
+ case XML_ELEMENT(OFFICE, XML_FONT_FACE_DECLS):
+ return GetSwImport().CreateFontDeclsContext();
+ break;
}
return nullptr;
}
@@ -242,17 +245,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SwXMLDocContext_Impl::c
SvXMLImportContextRef SwXMLDocContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList )
+ const Reference< xml::sax::XAttributeList > & /*xAttrList*/ )
{
SvXMLImportContext *pContext = nullptr;
const SvXMLTokenMap& rTokenMap = GetSwImport().GetDocElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
- case XML_TOK_DOC_FONTDECLS:
- pContext = GetSwImport().CreateFontDeclsContext( rLocalName,
- xAttrList );
- break;
case XML_TOK_DOC_META:
OSL_FAIL("XML_TOK_DOC_META: should not have come here, maybe document is invalid?");
break;
@@ -1192,14 +1191,10 @@ XMLShapeImportHelper* SwXMLImport::CreateShapeImport()
return new SvTextShapeImportHelper( *this );
}
-SvXMLImportContext *SwXMLImport::CreateFontDeclsContext(
- const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList )
+SvXMLImportContext *SwXMLImport::CreateFontDeclsContext()
{
XMLFontStylesContext *pFSContext =
- new XMLFontStylesContext( *this, XML_NAMESPACE_OFFICE,
- rLocalName, xAttrList,
- osl_getThreadTextEncoding() );
+ new XMLFontStylesContext( *this, osl_getThreadTextEncoding() );
SetFontDecls( pFSContext );
return pFSContext;
}