From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f --- sw/source/filter/xml/wrtxml.hxx | 6 +++--- sw/source/filter/xml/xmlbrshi.hxx | 4 ++-- sw/source/filter/xml/xmlexp.hxx | 34 +++++++++++++++++----------------- sw/source/filter/xml/xmlfmt.cxx | 30 +++++++++++++++--------------- sw/source/filter/xml/xmlfmte.cxx | 2 +- sw/source/filter/xml/xmlimp.cxx | 8 ++++---- sw/source/filter/xml/xmlimp.hxx | 24 ++++++++++++------------ sw/source/filter/xml/xmlitem.hxx | 2 +- sw/source/filter/xml/xmliteme.cxx | 4 ++-- sw/source/filter/xml/xmlitemi.cxx | 10 +++++----- sw/source/filter/xml/xmltbli.cxx | 14 +++++++------- sw/source/filter/xml/xmltbli.hxx | 6 +++--- sw/source/filter/xml/xmltext.cxx | 4 ++-- sw/source/filter/xml/xmltexte.hxx | 10 +++++----- sw/source/filter/xml/xmltexti.hxx | 30 +++++++++++++++--------------- 15 files changed, 94 insertions(+), 94 deletions(-) (limited to 'sw/source/filter/xml') diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index bfba14f14ae3..2ec718bb533f 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -43,15 +43,15 @@ class SwXMLWriter : public StgWriter using StgWriter::Write; protected: - virtual sal_uLong WriteStorage(); - virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ); + virtual sal_uLong WriteStorage() SAL_OVERRIDE; + virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) SAL_OVERRIDE; public: SwXMLWriter( const OUString& rBaseURL ); virtual ~SwXMLWriter(); - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE; private: diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 8264496fdd11..ddf1140fff67 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -69,9 +69,9 @@ 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; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; const SvxBrushItem& GetItem() const { return *pItem; } }; diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 0414747767a9..c69263e81437 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -88,16 +88,16 @@ class SwXMLExport : public SvXMLExport SwXMLTableInfo_Impl& rTblInfo, sal_uInt16 nHeaderRows = 0 ); - virtual void _ExportMeta(); - virtual void _ExportFontDecls(); - virtual void _ExportStyles( bool bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportMasterStyles(); - virtual void SetBodyAttributes(); - virtual void _ExportContent(); - virtual void GetViewSettings(com::sun::star::uno::Sequence& aProps); - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence& aProps); - virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ); + virtual void _ExportMeta() SAL_OVERRIDE; + virtual void _ExportFontDecls() SAL_OVERRIDE; + virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE; + virtual void _ExportAutoStyles() SAL_OVERRIDE; + virtual void _ExportMasterStyles() SAL_OVERRIDE; + virtual void SetBodyAttributes() SAL_OVERRIDE; + virtual void _ExportContent() SAL_OVERRIDE; + virtual void GetViewSettings(com::sun::star::uno::Sequence& aProps) SAL_OVERRIDE; + virtual void GetConfigurationSettings(com::sun::star::uno::Sequence& aProps) SAL_OVERRIDE; + virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) SAL_OVERRIDE; // string constants for table cell export const OUString sNumberFormat; @@ -109,11 +109,11 @@ private: void DeleteTableLines(); protected: - virtual XMLTextParagraphExport* CreateTextParagraphExport(); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); - virtual XMLPageExport* CreatePageExport(); - virtual XMLShapeExport* CreateShapeExport(); - virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); + virtual XMLTextParagraphExport* CreateTextParagraphExport() SAL_OVERRIDE; + virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE; + virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE; + virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE; + virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; public: SwXMLExport( @@ -122,7 +122,7 @@ public: virtual ~SwXMLExport(); - 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; inline const SvXMLUnitConverter& GetTwipUnitConverter() const; @@ -141,7 +141,7 @@ public: // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; const SwDoc* getDoc() const; SwDoc* getDoc(); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 98a2f5501b86..da2aab803750 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -264,7 +264,7 @@ class SwXMLTextStyleContext_Impl : public XMLTextStyleContext protected: - virtual uno::Reference < style::XStyle > Create(); + virtual uno::Reference < style::XStyle > Create() SAL_OVERRIDE; public: @@ -280,9 +280,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext ); @@ -440,7 +440,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; const SwXMLImport& GetSwImport() const { return (const SwXMLImport&)GetImport(); } @@ -458,11 +458,11 @@ public: sal_uInt16 nFamily); virtual ~SwXMLItemSetStyleContext_Impl(); - virtual void CreateAndInsert( sal_Bool bOverwrite ); + virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // The item set may be empty! SfxItemSet *GetItemSet() { return pItemSet; } @@ -722,17 +722,17 @@ protected: virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // HACK virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( - sal_uInt16 nFamily ) const; + sal_uInt16 nFamily ) const SAL_OVERRIDE; virtual uno::Reference < container::XNameContainer > - GetStylesContainer( sal_uInt16 nFamily ) const; - virtual OUString GetServiceName( sal_uInt16 nFamily ) const; + GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE; // HACK public: @@ -746,9 +746,9 @@ public: sal_Bool bAuto ); virtual ~SwXMLStylesContext_Impl(); - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext ); @@ -920,7 +920,7 @@ void SwXMLStylesContext_Impl::EndElement() class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext { protected: - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } const SwXMLImport& GetSwImport() const @@ -935,7 +935,7 @@ public: const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLMasterStylesContext_Impl(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext ); diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 03e7b9c5a00d..008ffc21e289 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -263,7 +263,7 @@ protected: const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const; + ) const SAL_OVERRIDE; public: SwXMLAutoStylePoolP( SvXMLExport& rExport ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 2f3d39ecd43a..60d7be7aea03 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -122,7 +122,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, @@ -169,7 +169,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport, @@ -260,7 +260,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl( @@ -321,7 +321,7 @@ public: TYPEINFO_OVERRIDE(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl( diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 3f1a920ca728..1369894ff601 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -100,11 +100,11 @@ 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; - virtual XMLTextImportHelper* CreateTextImport(); + virtual XMLTextImportHelper* CreateTextImport() SAL_OVERRIDE; - virtual XMLShapeImportHelper* CreateShapeImport(); + virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; public: SwXMLImport( @@ -117,16 +117,16 @@ public: virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument(void) - 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; // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void InsertStyles( sal_Bool bAuto ); void FinishStyles(); @@ -176,18 +176,18 @@ public: OUString *pParent=0 ) const; virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); - virtual void SetViewSettings(const com::sun::star::uno::Sequence& aViewProps); - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence& aConfigProps); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; + virtual void SetViewSettings(const com::sun::star::uno::Sequence& aViewProps) SAL_OVERRIDE; + virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence& aConfigProps) SAL_OVERRIDE; virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, - const com::sun::star::uno::Sequence& _rSettings); + const com::sun::star::uno::Sequence& _rSettings) SAL_OVERRIDE; SvStorage *GetPackage() { return &xPackage; } void SetProgressValue( sal_Int32 nValue ); // initialize XForms - virtual void initXForms(); + virtual void initXForms() SAL_OVERRIDE; // get the document properties, but only if they actually need importing ::com::sun::star::uno::Reference< diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 4e2ccdc55bad..c5f7651c347d 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -50,7 +50,7 @@ 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; // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 538412e1fa0f..cb1976b5de20 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -76,7 +76,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const SfxItemSet *pSet = NULL ) const; + const SfxItemSet *pSet = NULL ) const SAL_OVERRIDE; virtual void handleElementItem( SvXMLExport& rExport, @@ -84,7 +84,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet& rSet, - sal_uInt16 nFlags ) const; + sal_uInt16 nFlags ) const SAL_OVERRIDE; inline void SetAbsWidth( sal_uInt32 nAbs ); }; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index dec2c5c33a14..d3a425fe6fe6 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -70,19 +70,19 @@ public: SfxItemSet& rSet, const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ); + const SvXMLNamespaceMap& rNamespaceMap ) SAL_OVERRIDE; virtual bool handleNoItem(SvXMLItemMapEntry const& rEntry, SfxItemSet & rSet, OUString const& rValue, SvXMLUnitConverter const& rUnitConverter, - SvXMLNamespaceMap const& rNamespaceMap); + SvXMLNamespaceMap const& rNamespaceMap) SAL_OVERRIDE; virtual void finished(SfxItemSet & rSet, - SvXMLUnitConverter const& rUnitConverter) const; + SvXMLUnitConverter const& rUnitConverter) const SAL_OVERRIDE; - virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); + virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) SAL_OVERRIDE; private: void Reset(); @@ -261,7 +261,7 @@ public: const ::uno::Reference< xml::sax::XAttributeList > & xAttrList, SfxItemSet& rItemSet, const SvXMLItemMapEntry& rEntry, - const SvXMLUnitConverter& rUnitConv ); + const SvXMLUnitConverter& rUnitConv ) SAL_OVERRIDE; }; SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl( diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index c72031d7a01f..289725d56fe7 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -436,8 +436,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual void EndElement(); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -844,7 +844,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -901,9 +901,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -1022,7 +1022,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -1082,7 +1082,7 @@ public: ~SwXMLDDETableContext_Impl(); virtual void StartElement( - const Reference & xAttrList); + const Reference & xAttrList) SAL_OVERRIDE; OUString& GetConnectionName() { return sConnectionName; } OUString& GetDDEApplication() { return sDDEApplication; } diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 28d6725056b4..874dac575686 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -150,7 +150,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; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } @@ -187,10 +187,10 @@ public: const SwStartNode *InsertTableSection(const SwStartNode *pPrevSttNd = 0, OUString const* pStringValueStyleName = 0); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > GetXTextContent() const; + ::com::sun::star::text::XTextContent > GetXTextContent() const SAL_OVERRIDE; void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; } }; diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index d04345bba744..4c2785be5045 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -36,11 +36,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // The body element's text:global attribute can be ignored, because // we must have the correct object shell already. - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport, diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 109c089dc872..99ff8608e618 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -48,21 +48,21 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport protected: virtual void exportStyleContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; virtual void _collectTextEmbeddedAutoStyles( const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; virtual void _exportTextEmbedded( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) SAL_OVERRIDE; virtual void exportTable( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rTextContent, - sal_Bool bAutoStyles, sal_Bool bProgress ); + sal_Bool bAutoStyles, sal_Bool bProgress ) SAL_OVERRIDE; public: SwXMLTextParagraphExport( @@ -73,7 +73,7 @@ public: virtual void setTextEmbeddedGraphicURL( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet, - OUString& rStreamName ) const; + OUString& rStreamName ) const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 4210cc1e6c87..1cd0357ce7d4 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -33,7 +33,7 @@ protected: SvXMLImport& rImport, 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: SwXMLTextImportHelper( @@ -53,14 +53,14 @@ public: const OUString& rHRef, const OUString& rStyleName, const OUString& rTblName, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, const OUString& rHRef, const OUString& rStyleName, const OUString& rTblName, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( @@ -68,14 +68,14 @@ public: const OUString &rCode, sal_Bool bMayScript, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( const OUString &rMimeType, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> @@ -83,13 +83,13 @@ public: const OUString &rName, const OUString &rHRef, const OUString &rStyleName, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual void endAppletOrPlugin( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, - ::std::map < const OUString, OUString > &rParamMap); + ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE; - virtual sal_Bool IsInHeaderFooter() const; + virtual sal_Bool IsInHeaderFooter() const SAL_OVERRIDE; // redlining helper methods // (here is the real implementation) @@ -99,22 +99,22 @@ public: const OUString& rAuthor, /// name of the author const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time - sal_Bool bMergeLastPara); /// merge last paragraph + sal_Bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call virtual void RedlineSetCursor( const OUString& rId, /// ID used to RedlineAdd() call sal_Bool bStart, /// start or end Cursor - sal_Bool bIsOutsideOfParagraph); + sal_Bool bIsOutsideOfParagraph) SAL_OVERRIDE; virtual void RedlineAdjustStartNodeCursor( - sal_Bool bStart); - virtual void SetShowChanges( sal_Bool bShowChanges ); - virtual void SetRecordChanges( sal_Bool bRecordChanges ); + sal_Bool bStart) SAL_OVERRIDE; + virtual void SetShowChanges( sal_Bool bShowChanges ) SAL_OVERRIDE; + virtual void SetRecordChanges( sal_Bool bRecordChanges ) SAL_OVERRIDE; virtual void SetChangesProtectionKey( - const ::com::sun::star::uno::Sequence & rKey ); + const ::com::sun::star::uno::Sequence & rKey ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX -- cgit v1.2.3