From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: First batch of adding SAL_OVERRRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a --- xmloff/inc/AttributeContainerHandler.hxx | 6 +- xmloff/inc/DomBuilderContext.hxx | 8 +- xmloff/inc/MetaExportComponent.hxx | 12 +- xmloff/inc/MetaImportComponent.hxx | 4 +- xmloff/inc/PageMasterImportContext.hxx | 8 +- xmloff/inc/SchXMLExport.hxx | 10 +- xmloff/inc/SchXMLImport.hxx | 4 +- xmloff/inc/StyleMap.hxx | 2 +- xmloff/inc/XMLBackgroundImageContext.hxx | 4 +- xmloff/inc/XMLBasicExportFilter.hxx | 16 +- xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx | 4 +- .../inc/XMLBitmapRepeatOffsetPropertyHandler.hxx | 4 +- xmloff/inc/XMLChartPropertySetMapper.hxx | 12 +- xmloff/inc/XMLChartStyleContext.hxx | 6 +- xmloff/inc/XMLClipPropertyHandler.hxx | 6 +- xmloff/inc/XMLElementPropertyContext.hxx | 2 +- xmloff/inc/XMLEmbeddedObjectImportContext.hxx | 8 +- xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx | 4 +- .../inc/XMLFootnoteConfigurationImportContext.hxx | 6 +- xmloff/inc/XMLImageMapContext.hxx | 4 +- .../XMLIndexBibliographyConfigurationContext.hxx | 6 +- xmloff/inc/XMLIsPercentagePropertyHandler.hxx | 4 +- xmloff/inc/XMLLineNumberingImportContext.hxx | 6 +- xmloff/inc/XMLNumberStylesImport.hxx | 4 +- xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx | 4 +- xmloff/inc/XMLRectangleMembersHandler.hxx | 4 +- xmloff/inc/XMLReplacementImageContext.hxx | 4 +- xmloff/inc/XMLScriptContextFactory.hxx | 2 +- xmloff/inc/XMLScriptExportHandler.hxx | 2 +- xmloff/inc/XMLShapePropertySetContext.hxx | 4 +- xmloff/inc/XMLStarBasicContextFactory.hxx | 2 +- xmloff/inc/XMLStarBasicExportHandler.hxx | 2 +- xmloff/inc/XMLStringBufferImportContext.hxx | 6 +- xmloff/inc/XMLTextColumnsContext.hxx | 4 +- xmloff/inc/XMLTextColumnsPropertyHandler.hxx | 6 +- xmloff/inc/XMLTextHeaderFooterContext.hxx | 4 +- xmloff/inc/animationimport.hxx | 4 +- xmloff/inc/animimp.hxx | 2 +- xmloff/inc/txtfldi.hxx | 178 ++++++++++----------- xmloff/inc/txtvfldi.hxx | 32 ++-- xmloff/inc/xmltabi.hxx | 4 +- xmloff/inc/xmlversion.hxx | 16 +- 42 files changed, 215 insertions(+), 215 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx index d434d943581b..72fb4823b2ee 100644 --- a/xmloff/inc/AttributeContainerHandler.hxx +++ b/xmloff/inc/AttributeContainerHandler.hxx @@ -30,10 +30,10 @@ class XMLAttributeContainerHandler : public XMLPropertyHandler public: virtual ~XMLAttributeContainerHandler(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index a263b9d32fa1..8de8e46686b7 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -77,14 +77,14 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ); + const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; virtual void StartElement( - const com::sun::star::uno::Reference& xAttrList ); + const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx index ad827ed238b5..69cbb77949b9 100644 --- a/xmloff/inc/MetaExportComponent.hxx +++ b/xmloff/inc/MetaExportComponent.hxx @@ -40,18 +40,18 @@ public: protected: // export the events off all autotexts virtual sal_uInt32 exportDoc( - enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ); + enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; // accept XDocumentProperties in addition to XModel - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // override - virtual void _ExportMeta(); + virtual void _ExportMeta() SAL_OVERRIDE; // methods without content: - virtual void _ExportAutoStyles(); - virtual void _ExportMasterStyles(); - virtual void _ExportContent(); + virtual void _ExportAutoStyles() SAL_OVERRIDE; + virtual void _ExportMasterStyles() SAL_OVERRIDE; + virtual void _ExportContent() SAL_OVERRIDE; }; // global functions to support the component diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx index 2a1a997d3258..7738f044d849 100644 --- a/xmloff/inc/MetaImportComponent.hxx +++ b/xmloff/inc/MetaImportComponent.hxx @@ -48,11 +48,11 @@ protected: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index bafdbb9a9f97..1cea7db10a2e 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -30,7 +30,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: @@ -46,14 +46,14 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; //text grid enhancement - virtual void SetDefaults(); + virtual void SetDefaults() SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx index 194e061a60e9..779135c8b4d7 100644 --- a/xmloff/inc/SchXMLExport.hxx +++ b/xmloff/inc/SchXMLExport.hxx @@ -43,12 +43,12 @@ private: SchXMLExportHelper maExportHelper; protected: - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; - virtual void _ExportStyles( bool bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportMasterStyles(); - virtual void _ExportContent(); + virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE; + virtual void _ExportAutoStyles() SAL_OVERRIDE; + virtual void _ExportMasterStyles() SAL_OVERRIDE; + virtual void _ExportContent() SAL_OVERRIDE; public: // #110680# diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index 16fa7f394000..173788a92a37 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -165,7 +165,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; public: // #110680# @@ -179,7 +179,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index d80ba954b519..2c1be800e2b6 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -80,7 +80,7 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index f92d4ee678be..3fb3ca15f4ce 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -65,9 +65,9 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx index 60b5dfd7acfd..e88751dde04f 100644 --- a/xmloff/inc/XMLBasicExportFilter.hxx +++ b/xmloff/inc/XMLBasicExportFilter.hxx @@ -40,22 +40,22 @@ public: // XDocumentHandler virtual void SAL_CALL startDocument() - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument() - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endElement( const OUString& aName ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& aChars ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx index d7ac07542943..2809e0e6be8b 100644 --- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx @@ -41,13 +41,13 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx index 693e769701ed..c1a77469db2d 100644 --- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx @@ -43,13 +43,13 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index c84aabc7a982..7885d9a3dce4 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -36,7 +36,7 @@ private: public: virtual ~XMLChartPropHdlFactory(); - virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const; + virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const SAL_OVERRIDE; }; class XMLChartPropertySetMapper : public XMLPropertySetMapper @@ -60,7 +60,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const; + ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; private: /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set @@ -68,14 +68,14 @@ private: SvXMLExport& rExport, const XMLPropertyState& rProperty, sal_uInt16 nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; /// this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set virtual void handleSpecialItem( SvXMLAttributeList& rAttrList, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; public: XMLChartExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, @@ -103,11 +103,11 @@ public: ::std::vector< XMLPropertyState >& rProperties, const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ) const; + const SvXMLNamespaceMap& rNamespaceMap ) const SAL_OVERRIDE; virtual void finished( ::std::vector< XMLPropertyState >& rProperties, - sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; + sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx index 23114a709ed7..c199e90adb94 100644 --- a/xmloff/inc/XMLChartStyleContext.hxx +++ b/xmloff/inc/XMLChartStyleContext.hxx @@ -32,7 +32,7 @@ protected: /// is called when an attribute at the (auto)style element is found virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -47,13 +47,13 @@ public: /// is called after all styles have been read to apply styles void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; /// necessary for property context (element-property symbol-image) virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx index 2fe39d3047b0..4206f2e596f4 100644 --- a/xmloff/inc/XMLClipPropertyHandler.hxx +++ b/xmloff/inc/XMLClipPropertyHandler.hxx @@ -32,9 +32,9 @@ public: XMLClipPropertyHandler( bool bODF11 ); virtual ~XMLClipPropertyHandler(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index edefaef7ffdf..95b60dc6c4fb 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -48,7 +48,7 @@ public: virtual ~XMLElementPropertyContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 52bd62f09508..61f22c250221 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -53,13 +53,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; sal_Bool SetComponent( ::com::sun::star::uno::Reference< diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx index d98fd5a5dc4d..bc14d9f2f3ff 100644 --- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx +++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx @@ -41,13 +41,13 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 84022a1ecd9f..d3be3f77f19a 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -79,14 +79,14 @@ public: /// parse attributes virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; /// for footnotes, also parse begin and end notices virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; /// get token map for attributes const SvXMLTokenMap& GetFtnConfigAttrTokenMap(); @@ -95,7 +95,7 @@ public: /* Move code from to , because at this time all styles it references have been set. (#i40579#) */ - virtual void Finish( bool bOverwrite); + virtual void Finish( bool bOverwrite) SAL_OVERRIDE; /// set configuration at document void ProcessSettings( diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index 4294331a75f4..61105225f8f2 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -60,9 +60,9 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index 068fe0115650..b5f095c454e9 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -81,15 +81,15 @@ protected: virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; - virtual void CreateAndInsert( sal_Bool bOverwrite ); + virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; void ProcessAttribute( sal_uInt16 nPrefix, diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx index 6af26b385b08..1941a0ef0a25 100644 --- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx +++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx @@ -34,11 +34,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index eef1219bb61c..6f80607819f3 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -96,19 +96,19 @@ protected: virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; void ProcessAttribute( enum LineNumberingToken eToken, const OUString& sValue); - virtual void CreateAndInsert(sal_Bool bOverwrite); + virtual void CreateAndInsert(sal_Bool bOverwrite) SAL_OVERRIDE; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; void ProcessAttribute( const OUString& sLocalName, diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 17bccd5f52e5..1a13fc0201be 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -56,10 +56,10 @@ public: SvXMLStylesContext& rStyles); virtual ~SdXMLNumberFormatImportContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; sal_Int32 GetDrawKey() const { return mnKey; } }; diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx index 995c95287896..2e92c694f472 100644 --- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx +++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx @@ -36,11 +36,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx index db1f886f7488..ae7df5829781 100644 --- a/xmloff/inc/XMLRectangleMembersHandler.hxx +++ b/xmloff/inc/XMLRectangleMembersHandler.hxx @@ -43,13 +43,13 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index 08ba7c2333d1..0560f1dac159 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -51,12 +51,12 @@ public: ::com::sun::star::beans::XPropertySet >& rPropSet ); virtual ~XMLReplacementImageContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx index cbfe7c53a299..6002b373ac30 100644 --- a/xmloff/inc/XMLScriptContextFactory.hxx +++ b/xmloff/inc/XMLScriptContextFactory.hxx @@ -52,7 +52,7 @@ public: /// the event name (as understood by the API) const OUString & rApiEventName, /// the event type name (as registered) - const OUString & rLanguage); + const OUString & rLanguage) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx index 36380943893f..cef00247ecc1 100644 --- a/xmloff/inc/XMLScriptExportHandler.hxx +++ b/xmloff/inc/XMLScriptExportHandler.hxx @@ -45,7 +45,7 @@ public: const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, - sal_Bool bUseWhitespace); + sal_Bool bUseWhitespace) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx index 66b8823398dc..215a4bc5ae6e 100644 --- a/xmloff/inc/XMLShapePropertySetContext.hxx +++ b/xmloff/inc/XMLShapePropertySetContext.hxx @@ -41,14 +41,14 @@ public: virtual ~XMLShapePropertySetContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, - const XMLPropertyState& rProp); + const XMLPropertyState& rProp) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx index 9ce7aa60e869..9e1489d5200c 100644 --- a/xmloff/inc/XMLStarBasicContextFactory.hxx +++ b/xmloff/inc/XMLStarBasicContextFactory.hxx @@ -53,7 +53,7 @@ public: /// the event name (as understood by the API) const OUString& rApiEventName, /// the event type name (as registered) - const OUString& rLanguage); + const OUString& rLanguage) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx index 5d983c5d290c..97c47dfea81a 100644 --- a/xmloff/inc/XMLStarBasicExportHandler.hxx +++ b/xmloff/inc/XMLStarBasicExportHandler.hxx @@ -49,7 +49,7 @@ public: const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, - sal_Bool bUseWhitespace); + sal_Bool bUseWhitespace) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index eded4ea65c70..332dc2d4baf8 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -50,12 +50,12 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; virtual void Characters( - const OUString& rChars ); + const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index ba4f6be5f33f..55221a786a76 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -62,9 +62,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx index 386d7bf8beaa..20fa2b24dfa5 100644 --- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx +++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx @@ -32,17 +32,17 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const; + const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 421e4ba3c077..494388c69e0f 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -61,9 +61,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx index 8b7f38b780b2..f8a905cfe8d8 100644 --- a/xmloff/inc/animationimport.hxx +++ b/xmloff/inc/animationimport.hxx @@ -49,10 +49,10 @@ public: AnimationsImportHelperImpl* mpImpl = NULL ); virtual ~AnimationNodeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps ); }; diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index 68fe07ff4b99..13fc95ed4dff 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -41,7 +41,7 @@ public: virtual ~XMLAnimationsContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 91ca606eab76..f8282b9d9543 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -137,15 +137,15 @@ public: virtual ~XMLTextFieldImportContext(); /// process character data: will be collected in member sContentBuffer - virtual void Characters( const OUString& sContent ); + virtual void Characters( const OUString& sContent ) SAL_OVERRIDE; /// parses attributes and calls ProcessAttribute virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; /// create XTextField and insert into document; calls PrepareTextField - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; /// create the appropriate field context from /// (for use in paragraph import) @@ -215,16 +215,16 @@ protected: /// start element virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** inherit sender field because of fixed attribute in ProcessAttributes */ @@ -250,12 +250,12 @@ protected: /// start element virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext @@ -282,12 +282,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; class XMLTimeFieldImportContext : public XMLTextFieldImportContext @@ -322,12 +322,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import date fields (); @@ -345,7 +345,7 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; }; /** import page continuation fields () */ @@ -371,12 +371,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import page number fields () */ @@ -405,12 +405,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** superclass for database fields: handle database and table names */ @@ -452,19 +452,19 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; /// handle database-location children virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; }; /** import database name fields () */ @@ -480,7 +480,7 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; }; /** import database next fields () */ @@ -509,12 +509,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import database select fields () */ @@ -534,12 +534,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import database display number fields () */ @@ -562,12 +562,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import docinfo fields with only fixed attribute */ @@ -597,12 +597,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); }; @@ -632,12 +632,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import revision field () */ @@ -658,7 +658,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import user docinfo field () */ @@ -684,10 +684,10 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import hidden paragraph fields () */ @@ -710,12 +710,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import conditional text fields () */ @@ -747,12 +747,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import conditional text fields () */ @@ -780,12 +780,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import file name fields () */ @@ -809,12 +809,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import document template name fields () */ @@ -835,12 +835,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import chapter fields () */ @@ -863,12 +863,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import count fields () */ @@ -893,12 +893,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); }; @@ -924,12 +924,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import page variable fields () */ @@ -952,12 +952,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import macro fields () */ @@ -989,16 +989,16 @@ protected: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import reference fields () */ @@ -1030,16 +1030,16 @@ protected: /// start element virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import dde field declaration container () */ @@ -1058,7 +1058,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; }; /** import dde field declaration () */ @@ -1083,7 +1083,7 @@ public: // create fieldmaster virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; }; /** import dde fields () */ @@ -1103,15 +1103,15 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// create textfield, attach master, and insert into document - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; /// empty method virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import sheet name fields (Calc) dde fields () */ @@ -1129,12 +1129,12 @@ public: protected: /// no attributes -> empty method virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// no attributes -> empty method virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import hyperlinks as URL fields (Calc, Impress, Draw) () */ @@ -1159,12 +1159,12 @@ public: protected: /// no attributes -> empty method virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// no attributes -> empty method virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import bibliography info fields () */ @@ -1186,16 +1186,16 @@ protected: /// process attributes (fill aValues) virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; /// empty method; all attributes are handled in StartElement virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// convert aValues into sequence and set property virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; static const sal_Char* MapBibliographyFieldName(const OUString& sName); }; @@ -1234,18 +1234,18 @@ public: protected: /// process attributes virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// set properties virtual void PrepareField( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet); + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet) SAL_OVERRIDE; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; /** Import a script field () */ @@ -1272,12 +1272,12 @@ public: protected: /// process attributes virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// set properties virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import measure fields () */ @@ -1296,12 +1296,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** dropdown field (filter legacy) */ @@ -1333,17 +1333,17 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference& xAttrList ); + const ::com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import header fields () */ @@ -1360,12 +1360,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import footer fields () */ @@ -1382,12 +1382,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /** import footer fields () */ @@ -1404,12 +1404,12 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext @@ -1430,12 +1430,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 27b6605cc155..e6469403cad5 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -196,12 +196,12 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; // various accessor methods: inline OUString GetName() { return sName; } @@ -234,7 +234,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -257,7 +257,7 @@ public: protected: virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; /*** import text input fields () */ @@ -278,7 +278,7 @@ public: protected: virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -324,7 +324,7 @@ protected: /// create XTextField, attach master and insert into document; /// also calls PrepareTextField - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; /// find appropriate field master sal_Bool FindFieldMaster( @@ -353,7 +353,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -379,7 +379,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -415,7 +415,7 @@ public: virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -447,12 +447,12 @@ protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -484,7 +484,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; }; /** @@ -557,12 +557,12 @@ protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE; }; @@ -597,10 +597,10 @@ protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ); + const OUString& sAttrValue ) SAL_OVERRIDE; /// create, prepare and insert database field master and database field - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index 65ae7359ed59..d7e7752e04a6 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -43,9 +43,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 14228a2ac0fc..93ec3c6ecdcd 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -44,10 +44,10 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler ); virtual ~XMLVersionListExport() {} - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); - void _ExportAutoStyles() {} - void _ExportMasterStyles () {} - void _ExportContent() {} + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) SAL_OVERRIDE; + void _ExportAutoStyles() SAL_OVERRIDE {} + void _ExportMasterStyles () SAL_OVERRIDE {} + void _ExportContent() SAL_OVERRIDE {} }; class XMLVersionListImport : public SvXMLImport @@ -62,7 +62,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: @@ -93,7 +93,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; @@ -120,8 +120,8 @@ public: class XMLVersionListPersistence : public ::cppu::WeakImplHelper1< ::com::sun::star::document::XDocumentRevisionListPersistence > { public: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif -- cgit