diff options
28 files changed, 33 insertions, 41 deletions
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx index ca993b17efee..5a63435ed31f 100644 --- a/include/xmloff/DocumentSettingsContext.hxx +++ b/include/xmloff/DocumentSettingsContext.hxx @@ -28,7 +28,7 @@ struct XMLDocumentSettingsContext_Data; -class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext +class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext final : public SvXMLImportContext { ::std::unique_ptr< XMLDocumentSettingsContext_Data > m_pData; diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx index 1a5609c4042e..b5fba6722a93 100644 --- a/include/xmloff/NamedBoolPropertyHdl.hxx +++ b/include/xmloff/NamedBoolPropertyHdl.hxx @@ -26,7 +26,7 @@ /** PropertyHandler for a named xml bool type: */ -class SAL_DLLPUBLIC_RTTI XMLNamedBoolPropertyHdl : public XMLPropertyHandler +class XMLOFF_DLLPUBLIC XMLNamedBoolPropertyHdl final : public XMLPropertyHandler { private: const OUString maTrueStr; diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx index 9ee9e00cf71a..6e14b764db90 100644 --- a/include/xmloff/SchXMLExportHelper.hxx +++ b/include/xmloff/SchXMLExportHelper.hxx @@ -35,7 +35,7 @@ class SchXMLExportHelper_Impl; the latter case you have to provide a table address mapper if the cell addressing set at the document is not in XML format. */ -class XMLOFF_DLLPUBLIC SchXMLExportHelper : public salhelper::SimpleReferenceObject +class XMLOFF_DLLPUBLIC SchXMLExportHelper final : public salhelper::SimpleReferenceObject { public: SchXMLExportHelper( SvXMLExport& rExport, diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index eff5af9dfd2a..9cdb3f0566ee 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -54,7 +54,7 @@ class SvXMLImport; converts table addresses in XML format to the appropriate application format. */ -class SchXMLImportHelper : public salhelper::SimpleReferenceObject +class SchXMLImportHelper final : public salhelper::SimpleReferenceObject { private: css::uno::Reference< css::chart::XChartDocument > mxChartDoc; diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx index 5552958feefc..12fca72171e3 100644 --- a/include/xmloff/WordWrapPropertyHdl.hxx +++ b/include/xmloff/WordWrapPropertyHdl.hxx @@ -26,7 +26,7 @@ PropertyHandler for a named xml bool type: */ class SvXMLImport; -class XMLWordWrapPropertyHdl : public XMLPropertyHandler +class XMLWordWrapPropertyHdl final : public XMLPropertyHandler { private: SvXMLImport* const mpImport; diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index 0c3e4ac2075d..ff302064bdf6 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } -class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext +class XMLOFF_DLLPUBLIC XMLBase64ImportContext final : public SvXMLImportContext { css::uno::Reference< css::io::XOutputStream > xOut; OUString sBase64CharsLeft; diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx index b8d5e7c0dfd5..e3d3577f1ac3 100644 --- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -class XMLEmbeddedObjectExportFilter : public cppu::WeakImplHelper< +class XMLEmbeddedObjectExportFilter final : public cppu::WeakImplHelper< css::xml::sax::XExtendedDocumentHandler, css::lang::XServiceInfo, css::lang::XInitialization> diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index 8e33ed2a67db..7759a57d81e5 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -34,7 +34,7 @@ class XMLFontFamilyPropHdl; class XMLFontPitchPropHdl; class XMLFontEncodingPropHdl; -class XMLOFF_DLLPUBLIC XMLFontStylesContext : public SvXMLStylesContext +class XMLOFF_DLLPUBLIC XMLFontStylesContext final : public SvXMLStylesContext { std::unique_ptr<XMLFontFamilyNamePropHdl> pFamilyNameHdl; std::unique_ptr<XMLFontFamilyPropHdl> pFamilyHdl; @@ -45,8 +45,6 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext : public SvXMLStylesContext rtl_TextEncoding const eDfltEncoding; -protected: - virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index a52e2745a9b4..791d429238c1 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -24,7 +24,7 @@ #include <xmloff/dllapi.h> #include <xmloff/prstylei.hxx> -class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext +class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle final : public XMLPropStyleContext { public: diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index 830da64c1838..f44449e1a41b 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -23,14 +23,12 @@ #include <xmloff/dllapi.h> #include <xmloff/XMLShapeStyleContext.hxx> -class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext +class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext final : public XMLShapeStyleContext { bool bAutoUpdate : 1; SvXMLImportContextRef xEventContext; -protected: - virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) override; diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx index b50f5ae53dff..8c7d478cb698 100644 --- a/include/xmloff/animationexport.hxx +++ b/include/xmloff/animationexport.hxx @@ -36,7 +36,7 @@ namespace xmloff { class AnimationsExporterImpl; -class XMLOFF_DLLPUBLIC AnimationsExporter : public salhelper::SimpleReferenceObject +class XMLOFF_DLLPUBLIC AnimationsExporter final : public salhelper::SimpleReferenceObject { std::unique_ptr<AnimationsExporterImpl> mpImpl; diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx index 1c8035658cbf..2722869c5ea5 100644 --- a/include/xmloff/animexp.hxx +++ b/include/xmloff/animexp.hxx @@ -30,7 +30,7 @@ class AnimExpImpl; class SvXMLExport; class XMLShapeExport; -class XMLAnimationsExporter : public salhelper::SimpleReferenceObject +class XMLAnimationsExporter final : public salhelper::SimpleReferenceObject { std::unique_ptr<AnimExpImpl> mpImpl; diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx index 4b2895a01d8e..d7993062f60f 100644 --- a/include/xmloff/attrlist.hxx +++ b/include/xmloff/attrlist.hxx @@ -32,7 +32,7 @@ struct SvXMLAttributeList_Impl; -class XMLOFF_DLLPUBLIC SvXMLAttributeList : public ::cppu::WeakImplHelper< +class XMLOFF_DLLPUBLIC SvXMLAttributeList final : public ::cppu::WeakImplHelper< css::xml::sax::XAttributeList, css::util::XCloneable, css::lang::XUnoTunnel> diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index 51f95986af0d..1a767ff50781 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -36,7 +36,7 @@ namespace xmloff //= ORotationAngleHandler - class SAL_DLLPUBLIC_RTTI ORotationAngleHandler : public XMLPropertyHandler + class XMLOFF_DLLPUBLIC ORotationAngleHandler final : public XMLPropertyHandler { public: ORotationAngleHandler(); @@ -48,7 +48,7 @@ namespace xmloff //= OFontWidthHandler - class SAL_DLLPUBLIC_RTTI OFontWidthHandler : public XMLPropertyHandler + class XMLOFF_DLLPUBLIC OFontWidthHandler final : public XMLPropertyHandler { public: OFontWidthHandler(); @@ -60,7 +60,7 @@ namespace xmloff //= OControlBorderHandlerBase - class SAL_DLLPUBLIC_RTTI OControlBorderHandler : public XMLPropertyHandler + class XMLOFF_DLLPUBLIC OControlBorderHandler final : public XMLPropertyHandler { public: enum BorderFacet @@ -81,7 +81,7 @@ namespace xmloff //= OControlTextEmphasisHandler - class OControlTextEmphasisHandler : public XMLPropertyHandler + class OControlTextEmphasisHandler final : public XMLPropertyHandler { public: OControlTextEmphasisHandler(); @@ -93,7 +93,7 @@ namespace xmloff //= ImageScaleModeHandler - class XMLOFF_DLLPUBLIC ImageScaleModeHandler : public XMLConstantsPropertyHandler + class XMLOFF_DLLPUBLIC ImageScaleModeHandler final : public XMLConstantsPropertyHandler { public: ImageScaleModeHandler(); diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx index e134604eae70..cad4a5638933 100644 --- a/include/xmloff/fasttokenhandler.hxx +++ b/include/xmloff/fasttokenhandler.hxx @@ -69,7 +69,7 @@ private: struct StaticTokenMap : public rtl::Static< TokenMap, StaticTokenMap > {}; -class XMLOFF_DLLPUBLIC FastTokenHandler : public cppu::WeakImplHelper< +class XMLOFF_DLLPUBLIC FastTokenHandler final : public cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >, public sax_fastparser::FastTokenHandlerBase { diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 01a2bd2f468e..8800c709aacd 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -48,13 +48,12 @@ namespace xmloff /** provides functionality for exporting a complete form layer. */ - class XMLOFF_DLLPUBLIC OFormLayerXMLExport + class XMLOFF_DLLPUBLIC OFormLayerXMLExport final :public ::salhelper::SimpleReferenceObject { // impl class std::unique_ptr<OFormLayerXMLExport_Impl> m_pImpl; - protected: virtual ~OFormLayerXMLExport() override; public: diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 1835528873fe..7c77bea0816b 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -44,7 +44,7 @@ namespace xmloff class OFormLayerXMLImport_Impl; /** allows you to import a <form:form> element */ - class XMLOFF_DLLPUBLIC OFormLayerXMLImport + class XMLOFF_DLLPUBLIC OFormLayerXMLImport final :public ::salhelper::SimpleReferenceObject { std::unique_ptr<OFormLayerXMLImport_Impl> m_pImpl; diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index 234b5e4dda2a..140dacdbb446 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -38,7 +38,7 @@ const sal_uInt16 XML_NAMESPACE_NONE = USHRT_MAX-1; const sal_uInt16 XML_NAMESPACE_UNKNOWN = USHRT_MAX; const sal_uInt16 XML_NAMESPACE_UNKNOWN_FLAG = 0x8000; -class NameSpaceEntry : public salhelper::SimpleReferenceObject +class NameSpaceEntry final : public salhelper::SimpleReferenceObject { public: // sName refers to the full namespace name diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 1d05c691018f..4412d26e07d6 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -131,7 +131,7 @@ enum SdXML3DLightAttrTokenMap // dr3d:3dlight context -class SdXML3DLightContext: public SvXMLImportContext +class SdXML3DLightContext final : public SvXMLImportContext { // local parameters which need to be read sal_Int32 maDiffuseColor; diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index 598fdeb6ef78..d8f037efe56a 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -52,7 +52,7 @@ struct XMLTableInfo std::vector< OUString > maDefaultRowCellStyles; }; -class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject +class XMLOFF_DLLPUBLIC XMLTableExport final : public salhelper::SimpleReferenceObject { public: XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExportPropertyMapper >& xCellExportPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef ); diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index 47883b2a1b9a..f1d911616118 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -38,7 +38,7 @@ class SvXMLStyleContext; typedef std::map< OUString, OUString > XMLTableTemplate; typedef std::map < OUString, std::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; -class XMLOFF_DLLPUBLIC XMLTableImport : public salhelper::SimpleReferenceObject +class XMLOFF_DLLPUBLIC XMLTableImport final : public salhelper::SimpleReferenceObject { friend class XMLTableImportContext; diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx index 377a032edb19..bfbd40f6aba0 100644 --- a/include/xmloff/txtimppr.hxx +++ b/include/xmloff/txtimppr.hxx @@ -23,7 +23,7 @@ #include <xmloff/xmlimppr.hxx> #include <memory> -class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyMapper +class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper final : public SvXMLImportPropertyMapper { sal_Int32 nSizeTypeIndex; sal_Int32 nWidthTypeIndex; @@ -46,7 +46,6 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyM std::unique_ptr<XMLPropertyState>* ppNewFontPitch, std::unique_ptr<XMLPropertyState>* ppNewFontCharSet ) const; -protected: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx index f6c48e4435f8..c05619bf44ee 100644 --- a/include/xmloff/txtprmap.hxx +++ b/include/xmloff/txtprmap.hxx @@ -218,7 +218,7 @@ enum class TextPropMap { CELL = 11 }; -class XMLOFF_DLLPUBLIC XMLTextPropertySetMapper : public XMLPropertySetMapper +class XMLOFF_DLLPUBLIC XMLTextPropertySetMapper final : public XMLPropertySetMapper { public: XMLTextPropertySetMapper( TextPropMap nType, bool bForExport ); diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx index 4880f74fde7c..2773af3f86db 100644 --- a/include/xmloff/unoatrcn.hxx +++ b/include/xmloff/unoatrcn.hxx @@ -36,7 +36,7 @@ extern css::uno::Reference< css::uno::XInterface > SvUnoAttributeContainer_CreateInstance(); -class XMLOFF_DLLPUBLIC SvUnoAttributeContainer: +class XMLOFF_DLLPUBLIC SvUnoAttributeContainer final : public ::cppu::WeakAggImplHelper3< css::lang::XServiceInfo, css::lang::XUnoTunnel, diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 0007f6dd5086..69ba1099fefc 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -112,7 +112,7 @@ namespace o3tl template<> struct typed_flags<SvXMLImportFlags> : is_typed_flags<SvXMLImportFlags, 0xffff> {}; } -class SvXMLImportFastNamespaceHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastNamespaceHandler > +class SvXMLImportFastNamespaceHandler final : public ::cppu::WeakImplHelper< css::xml::sax::XFastNamespaceHandler > { private: struct NamespaceDefine @@ -133,7 +133,7 @@ public: virtual OUString SAL_CALL getNamespaceURI( const OUString& rNamespacePrefix ) override; }; -class XMLOFF_DLLPUBLIC SvXMLLegacyToFastDocHandler : public ::cppu::WeakImplHelper< +class XMLOFF_DLLPUBLIC SvXMLLegacyToFastDocHandler final : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler, css::document::XImporter > { diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index af269e00ec78..c2424bbf0e60 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -47,7 +47,7 @@ class SvXMLExport; office:meta must <em>not</em> be written. </p> */ -class XMLOFF_DLLPUBLIC SvXMLMetaExport : public cppu::WeakImplHelper< +class XMLOFF_DLLPUBLIC SvXMLMetaExport final : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { private: diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index 0ba540415f69..8a3d08681096 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace container { class XIn class SvxXMLListLevelStyleContext_Impl; typedef std::vector<rtl::Reference<SvxXMLListLevelStyleContext_Impl>> SvxXMLListStyle_Impl; -class XMLOFF_DLLPUBLIC SvxXMLListStyleContext +class XMLOFF_DLLPUBLIC SvxXMLListStyleContext final : public SvXMLStyleContext { css::uno::Reference< css::container::XIndexReplace > xNumRules; @@ -43,8 +43,6 @@ class XMLOFF_DLLPUBLIC SvxXMLListStyleContext bool bConsecutive : 1; bool const bOutline : 1; -protected: - SAL_DLLPRIVATE virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) override; diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx index 16fdc20e0d13..94034fe5cce0 100644 --- a/include/xmloff/xmlscripti.hxx +++ b/include/xmloff/xmlscripti.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XModel; }}}} -class XMLOFF_DLLPUBLIC XMLScriptContext : public SvXMLImportContext +class XMLOFF_DLLPUBLIC XMLScriptContext final : public SvXMLImportContext { private: css::uno::Reference< css::frame::XModel > m_xModel; |