diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /xmloff/source/transform | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'xmloff/source/transform')
41 files changed, 170 insertions, 170 deletions
diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx index 2fbf13ad9230..ecd4f8e7bd59 100644 --- a/xmloff/source/transform/ChartOASISTContext.hxx +++ b/xmloff/source/transform/ChartOASISTContext.hxx @@ -29,7 +29,7 @@ public: const OUString& rQName ); virtual ~XMLChartOASISTransformerContext(); - virtual void StartElement( 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 ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx index a75081e0e57b..4874bed8d8e6 100644 --- a/xmloff/source/transform/ChartOOoTContext.hxx +++ b/xmloff/source/transform/ChartOOoTContext.hxx @@ -29,7 +29,7 @@ public: const OUString& rQName ); virtual ~XMLChartOOoTransformerContext(); - virtual void StartElement( 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 ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index b3e18d3e7683..934bae429c89 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -44,10 +44,10 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const Reference< xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ) override; + virtual void EndElement() override; bool IsCategoryAxis() const { return m_bHasCategories;} diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx index 9e3bf812f63a..e4f72d90c6ba 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx @@ -33,8 +33,8 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; void ExportCategories(); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index 15c59a1a9841..753055d0f065 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -39,7 +39,7 @@ public: const OUString& rQName ); virtual ~XMLAxisOOoContext(); - virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ) SAL_OVERRIDE; + virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ) override; bool IsCategoryAxis() const { return m_bIsCategoryAxis;} diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 5abcfce47845..4bba5b169beb 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -39,9 +39,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void ExportContent() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; + virtual void ExportContent() override; protected: void AddContent( XMLAxisOOoContext *pContent ); diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index 33eb09fa1ca7..e721f1c77f75 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -34,9 +34,9 @@ public: virtual ~XMLControlOASISTransformerContext(); - virtual void StartElement( 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 ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx index 95eac83c9a2d..6a4f14621d7f 100644 --- a/xmloff/source/transform/ControlOOoTContext.hxx +++ b/xmloff/source/transform/ControlOOoTContext.hxx @@ -38,13 +38,13 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( 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 ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index c8e1df9a3438..4e8cb483e14e 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -34,7 +34,7 @@ public: virtual ~XMLCreateElemTransformerContext(); - virtual void StartElement( 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 ) override; }; #endif // _XMLOFF_CREATEELEMCONTEXT_HXX diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index ae17837ac944..57623fea9aa0 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -58,7 +58,7 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; void AddContent( XMLTransformerContext *pContent ); @@ -67,7 +67,7 @@ public: return !m_aChildContexts.empty(); } - virtual void ExportContent() SAL_OVERRIDE; + virtual void ExportContent() override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx index b9a5ad28db84..c47098f50e9a 100644 --- a/xmloff/source/transform/DlgOASISTContext.hxx +++ b/xmloff/source/transform/DlgOASISTContext.hxx @@ -29,7 +29,7 @@ public: const OUString& rQName ); virtual ~XMLDlgOASISTransformerContext(); - virtual void StartElement( 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 ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DLGOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx index 97e584971e8b..e42c7dee1ba9 100644 --- a/xmloff/source/transform/DocumentTContext.hxx +++ b/xmloff/source/transform/DocumentTContext.hxx @@ -41,7 +41,7 @@ public: // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( 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 ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DOCUMENTTCONTEXT_HXX diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx index 61a1895f1ed6..8bcd87eb32ab 100644 --- a/xmloff/source/transform/EventOASISTContext.hxx +++ b/xmloff/source/transform/EventOASISTContext.hxx @@ -39,7 +39,7 @@ public: XMLTransformerOASISEventMap_Impl& rMap, XMLTransformerOASISEventMap_Impl* pMap2 ); - virtual void StartElement( 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 ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx index 38b730ace3f6..4af2a3940af9 100644 --- a/xmloff/source/transform/EventOOoTContext.hxx +++ b/xmloff/source/transform/EventOOoTContext.hxx @@ -40,14 +40,14 @@ public: OUString& rNewName, XMLTransformerOOoEventMap_Impl& rMap ); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index 52ff8e99aa23..ffeab6a8e2c2 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -49,9 +49,9 @@ public: // This method is called for all characters that are contained in the // current element. - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual void ExportContent() SAL_OVERRIDE; + virtual void ExportContent() override; const OUString& GetTextContent() const { return m_aCharacters; } }; diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx index 91275550ddb8..d92d4e14bbb8 100644 --- a/xmloff/source/transform/FormPropOASISTContext.hxx +++ b/xmloff/source/transform/FormPropOASISTContext.hxx @@ -37,8 +37,8 @@ public: virtual ~XMLFormPropOASISTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index e7a9629e7896..816895700b7d 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -50,13 +50,13 @@ public: virtual ~XMLFormPropValueTContext_Impl(); - virtual void StartElement( 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 ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const override; bool IsVoid() const { return m_bIsVoid; } const OUString& GetTextContent() const { return m_aCharacters; } diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx index ef8bf1dd3a7c..8dbd5cf02f09 100644 --- a/xmloff/source/transform/FormPropOOoTContext.hxx +++ b/xmloff/source/transform/FormPropOOoTContext.hxx @@ -50,10 +50,10 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx index b4b4a2855ae4..a96b9f16ea04 100644 --- a/xmloff/source/transform/FrameOASISTContext.hxx +++ b/xmloff/source/transform/FrameOASISTContext.hxx @@ -45,13 +45,13 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( 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 ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index 2e5b9654ce71..9b8ebab9767b 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -35,15 +35,15 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( 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 ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 78b7f3c05d19..3b22ec379c38 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -58,21 +58,21 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( 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 ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions // that require virtual methods. The default is to do nothing. - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_IGNORETCONTEXT_HXX diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 738ccd456550..6f29b8e577b0 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -44,21 +44,21 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( 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 ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions // that require virtual methods. The default is to do nothing. - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; XMLParagraphTransformerContext::XMLParagraphTransformerContext( @@ -111,7 +111,7 @@ public: ::xmloff::token::XMLTokenEnum eToken ); virtual ~XMLPersTextContentRNGTransformTContext(); - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; XMLPersTextContentRNGTransformTContext::XMLPersTextContentRNGTransformTContext( diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index 114d16a366b3..e2d43f2442ef 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -47,13 +47,13 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( 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 ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; #endif // _XMLOFF_MERGEELEMCONTEXT_HXX diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index 0994f3357c3e..5189037c9ef8 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -52,16 +52,16 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions // that require virtual methods. The default is to do nothing. - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_METATCONTEXT_HXX diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 75b5759ffc49..10fc28674596 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -50,18 +50,18 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XUnoTunnel - 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; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // methods that are not contained in any interface void SetValueByIndex( sal_Int16 i, const OUString& rValue ); diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx index 90b032a0c2f5..e86b9bfd72ff 100644 --- a/xmloff/source/transform/NotesTContext.hxx +++ b/xmloff/source/transform/NotesTContext.hxx @@ -39,12 +39,12 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_NOTESTCONTEXT_HXX diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 0f6fdae1f96c..52100214c4d3 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1098,8 +1098,8 @@ public: virtual ~XMLDocumentTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; XMLDocumentTransformerContext_Impl::XMLDocumentTransformerContext_Impl( @@ -1239,8 +1239,8 @@ public: virtual ~XMLBodyTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; XMLBodyTransformerContext_Impl::XMLBodyTransformerContext_Impl( @@ -1297,7 +1297,7 @@ public: virtual ~XMLTabStopOOoTContext_Impl(); - virtual void StartElement( 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 ) override; }; XMLTabStopOOoTContext_Impl::XMLTabStopOOoTContext_Impl( @@ -1395,7 +1395,7 @@ public: virtual ~XMLTrackedChangesOOoTContext_Impl(); - virtual void StartElement( 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 ) override; }; XMLTrackedChangesOOoTContext_Impl::XMLTrackedChangesOOoTContext_Impl( @@ -1465,8 +1465,8 @@ public: virtual ~XMLTableOOoTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; XMLTableOOoTransformerContext_Impl::XMLTableOOoTransformerContext_Impl( diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index 085b9f991184..045f0e80803b 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -42,9 +42,9 @@ protected: virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, const OUString& rQName, - bool bPersistent=false ) SAL_OVERRIDE; + bool bPersistent=false ) override; - virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ) SAL_OVERRIDE; + virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ) override; public: OOo2OasisTransformer( const sal_Char *pImplName=0, @@ -61,44 +61,44 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE + virtual void SAL_CALL acquire( ) throw () override { XMLTransformerBase::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { XMLTransformerBase::release(); }; // 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) SAL_OVERRIDE; + 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) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel - 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; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + 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) override; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; 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); // ::com::sun::star::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString GetEventName( const OUString& rName, - bool bForm = false ) SAL_OVERRIDE; + bool bForm = false ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_OOO2OASIS_HXX diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 100b063c6c0b..178fddacafee 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1152,8 +1152,8 @@ public: virtual ~XMLTableTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; XMLTableTransformerContext_Impl::XMLTableTransformerContext_Impl( @@ -1250,13 +1250,13 @@ public: virtual ~XMLBodyOASISTransformerContext_Impl(); - virtual void StartElement( 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 ) override; virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; XMLBodyOASISTransformerContext_Impl::XMLBodyOASISTransformerContext_Impl( @@ -1306,7 +1306,7 @@ public: virtual ~XMLTabStopOASISTContext_Impl(); - virtual void StartElement( 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 ) override; }; XMLTabStopOASISTContext_Impl::XMLTabStopOASISTContext_Impl( @@ -1436,10 +1436,10 @@ public: virtual ~XMLConfigItemTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; XMLConfigItemTContext_Impl::XMLConfigItemTContext_Impl( @@ -1546,7 +1546,7 @@ public: virtual ~XMLTrackedChangesOASISTContext_Impl(); - virtual void StartElement( 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 ) override; }; XMLTrackedChangesOASISTContext_Impl::XMLTrackedChangesOASISTContext_Impl( diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index 4bf6e29a0a1f..5f5acf8f91c7 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -36,9 +36,9 @@ protected: virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, const OUString& rQName, - bool bPersistent=false ) SAL_OVERRIDE; + bool bPersistent=false ) override; - virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ) SAL_OVERRIDE; + virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ) override; public: Oasis2OOoTransformer () throw(); @@ -47,15 +47,15 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel - 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; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString GetEventName( const OUString& rName, - bool bForm ) SAL_OVERRIDE; + bool bForm ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_OASIS2OOO_HXX diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index c7e1a4a42a9c..61b26bd2ed4d 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -73,25 +73,25 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( 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 ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions // that require virtual methods. The default is to do nothing. - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; // This method is called for all characters that are contained in the // current element. - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual bool IsPersistent() const SAL_OVERRIDE; - virtual void Export() SAL_OVERRIDE; - virtual void ExportContent() SAL_OVERRIDE; + virtual bool IsPersistent() const override; + virtual void Export() override; + virtual void ExportContent() override; const OUString& GetExportQName() const { return m_aElemQName; } diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index 0d488e1c6c55..8cca8b1763d3 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -37,13 +37,13 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - 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 ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; + virtual void Characters( const OUString& rChars ) override; - virtual bool IsPersistent() const SAL_OVERRIDE; - virtual void Export() SAL_OVERRIDE; + virtual bool IsPersistent() const override; + virtual void Export() override; }; XMLPersTextTContext_Impl::XMLPersTextTContext_Impl( diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx index 0dfacec2108d..b9dc6d76308d 100644 --- a/xmloff/source/transform/PersMixedContentTContext.hxx +++ b/xmloff/source/transform/PersMixedContentTContext.hxx @@ -50,7 +50,7 @@ public: ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; virtual ~XMLPersMixedContentTContext(); }; diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx index dda94f83cee0..d366884a5901 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.hxx +++ b/xmloff/source/transform/ProcAddAttrTContext.hxx @@ -39,7 +39,7 @@ public: virtual ~XMLProcAddAttrTransformerContext(); - virtual void StartElement( 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 ) override; }; #endif // _XMLOFF_PROCADDATTRCONTEXT_HXX diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx index 7dd83b9ad71e..d9049a965595 100644 --- a/xmloff/source/transform/ProcAttrTContext.hxx +++ b/xmloff/source/transform/ProcAttrTContext.hxx @@ -46,8 +46,8 @@ public: virtual ~XMLProcAttrTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; #endif // _XMLOFF_PROCATTRCONTEXT_HXX diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx index 9bb825521c35..75889b516388 100644 --- a/xmloff/source/transform/RenameElemTContext.hxx +++ b/xmloff/source/transform/RenameElemTContext.hxx @@ -55,8 +55,8 @@ public: // EndElement instead if this is required. virtual ~XMLRenameElemTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; #endif // _XMLOFF_RENAMEELEMCONTEXT_HXX diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 2715fa575822..ded0dd78fee7 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -86,9 +86,9 @@ public: virtual ~XMLPropertiesTContext_Impl(); - virtual void StartElement( 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 ) override; - virtual void Export() SAL_OVERRIDE; + virtual void Export() override; static XMLPropType GetPropType( const OUString& rLocalName ); diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index 91549bc9d710..de207fcba04c 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -49,15 +49,15 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; + virtual void Characters( const OUString& rChars ) override; - virtual void ExportContent() SAL_OVERRIDE; + virtual void ExportContent() override; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const override; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); }; diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 0a2057ef5ee2..a3c1a99795ff 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -159,9 +159,9 @@ public: void AddAttribute( sal_uInt16 nPrefix, XMLTokenEnum eToken, const OUString &sValue ); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ) override; - virtual void Export() SAL_OVERRIDE; + virtual void Export() override; }; XMLTypedPropertiesOOoTContext_Impl::XMLTypedPropertiesOOoTContext_Impl( @@ -242,17 +242,17 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const Reference< XAttributeList >& rAttrList ) SAL_OVERRIDE; + const Reference< XAttributeList >& rAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual void Export() SAL_OVERRIDE; + virtual void Export() override; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const override; }; XMLTypedPropertiesOOoTContext_Impl diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx index 5142f465a47b..e59595eaaa2e 100644 --- a/xmloff/source/transform/StyleOOoTContext.hxx +++ b/xmloff/source/transform/StyleOOoTContext.hxx @@ -50,12 +50,12 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual bool IsPersistent() const SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; + virtual void Characters( const OUString& rChars ) override; + virtual bool IsPersistent() const override; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index 6520e6528dd2..b3672a7724a2 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -83,36 +83,36 @@ public: // ::com::sun::star::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL comment(const OUString& sComment) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL allowLineBreak() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL unknown(const OUString& sString) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) 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) SAL_OVERRIDE; + 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) override; // C++ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & GetDocHandler() { return m_xHandler; } |