diff options
| -rw-r--r-- | include/xmloff/XMLFontStylesContext.hxx | 12 | ||||
| -rw-r--r-- | xmloff/source/style/XMLFontStylesContext.cxx | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index e00a3866df20..d671e654880a 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <xmloff/dllapi.h> +#include <memory> #include <vector> #include <xmloff/xmlstyle.hxx> @@ -35,12 +36,12 @@ class XMLFontEncodingPropHdl; class XMLOFF_DLLPUBLIC XMLFontStylesContext : public SvXMLStylesContext { - XMLFontFamilyNamePropHdl *pFamilyNameHdl; - XMLFontFamilyPropHdl *pFamilyHdl; - XMLFontPitchPropHdl *pPitchHdl; - XMLFontEncodingPropHdl *pEncHdl; + std::unique_ptr<XMLFontFamilyNamePropHdl> pFamilyNameHdl; + std::unique_ptr<XMLFontFamilyPropHdl> pFamilyHdl; + std::unique_ptr<XMLFontPitchPropHdl> pPitchHdl; + std::unique_ptr<XMLFontEncodingPropHdl> pEncHdl; - SvXMLTokenMap *pFontStyleAttrTokenMap; + std::unique_ptr<SvXMLTokenMap> pFontStyleAttrTokenMap; rtl_TextEncoding eDfltEncoding; @@ -57,7 +58,6 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, rtl_TextEncoding eDfltEnc ); - virtual ~XMLFontStylesContext(); const SvXMLTokenMap& GetFontStyleAttrTokenMap() const { diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 2d5469d3d282..28fb855b6b8d 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -377,15 +377,6 @@ XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport, { } -XMLFontStylesContext::~XMLFontStylesContext() -{ - delete pFamilyNameHdl; - delete pFamilyHdl; - delete pPitchHdl; - delete pEncHdl; - delete pFontStyleAttrTokenMap; -} - bool XMLFontStylesContext::FillProperties( const OUString& rName, ::std::vector< XMLPropertyState > &rProps, sal_Int32 nFamilyNameIdx, |