diff options
| -rw-r--r-- | include/xmloff/XMLFontStylesContext.hxx | 8 | ||||
| -rw-r--r-- | xmloff/source/style/XMLFontStylesContext.cxx | 22 |
2 files changed, 0 insertions, 30 deletions
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index 3094ac191365..6768ca43b970 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -28,7 +28,6 @@ #include <xmloff/xmlstyle.hxx> struct XMLPropertyState; -class SvXMLTokenMap; class XMLFontFamilyNamePropHdl; class XMLFontFamilyPropHdl; class XMLFontPitchPropHdl; @@ -41,8 +40,6 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext final : public SvXMLStylesContext std::unique_ptr<XMLFontPitchPropHdl> pPitchHdl; std::unique_ptr<XMLFontEncodingPropHdl> pEncHdl; - std::unique_ptr<SvXMLTokenMap> pFontStyleAttrTokenMap; - rtl_TextEncoding eDfltEncoding; using SvXMLStylesContext::CreateStyleChildContext; @@ -55,11 +52,6 @@ public: ~XMLFontStylesContext() override; - const SvXMLTokenMap& GetFontStyleAttrTokenMap() const - { - return *pFontStyleAttrTokenMap; - } - bool FillProperties( const OUString& rName, ::std::vector< XMLPropertyState > &rProps, sal_Int32 nFamilyNameIdx, diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index db22711e039c..6d58300989fd 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -62,27 +62,6 @@ enum XMLFontStyleAttrTokens } -static const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap() -{ - static const SvXMLTokenMapEntry aFontStyleAttrTokenMap[] = - { - { XML_NAMESPACE_SVG, XML_FONT_FAMILY, - XML_TOK_FONT_STYLE_ATTR_FAMILY }, - { XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, - XML_TOK_FONT_STYLE_ATTR_FAMILY_GENERIC }, - { XML_NAMESPACE_STYLE, XML_FONT_ADORNMENTS, - XML_TOK_FONT_STYLE_ATTR_STYLENAME }, - { XML_NAMESPACE_STYLE, XML_FONT_PITCH, - XML_TOK_FONT_STYLE_ATTR_PITCH }, - { XML_NAMESPACE_STYLE, XML_FONT_CHARSET, - XML_TOK_FONT_STYLE_ATTR_CHARSET }, - - XML_TOKEN_MAP_END - }; - return aFontStyleAttrTokenMap; -} - - XMLFontStyleContextFontFace::XMLFontStyleContextFontFace( SvXMLImport& rImport, XMLFontStylesContext& rStyles ) : SvXMLStyleContext( rImport, XML_STYLE_FAMILY_FONT ), @@ -361,7 +340,6 @@ XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport, pFamilyHdl( new XMLFontFamilyPropHdl ), pPitchHdl( new XMLFontPitchPropHdl ), pEncHdl( new XMLFontEncodingPropHdl ), - pFontStyleAttrTokenMap( new SvXMLTokenMap(lcl_getFontStyleAttrTokenMap()) ), eDfltEncoding( eDfltEnc ) { } |