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/core | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'xmloff/source/core')
-rw-r--r-- | xmloff/source/core/DocumentSettingsContext.cxx | 18 | ||||
-rw-r--r-- | xmloff/source/core/DomExport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/core/PropertySetMerger.cxx | 28 | ||||
-rw-r--r-- | xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 2 |
6 files changed, 38 insertions, 38 deletions
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index fc71a98efc85..1800cdf47a9c 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -156,10 +156,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void Characters( const OUString& rChars ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void ManipulateConfigItem(); }; @@ -177,9 +177,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class XMLConfigItemMapNamedContext : public XMLConfigBaseContext @@ -195,9 +195,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class XMLConfigItemMapIndexedContext : public XMLConfigBaseContext @@ -218,9 +218,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix, diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 450271858d19..1d7d1ae1e623 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -146,9 +146,9 @@ public: explicit DomExport( SvXMLExport& rExport ); virtual ~DomExport(); - virtual void element( const Reference<XElement>& ) SAL_OVERRIDE; - virtual void endElement( const Reference<XElement>& ) SAL_OVERRIDE; - virtual void character( const Reference<XCharacterData>& ) SAL_OVERRIDE; + virtual void element( const Reference<XElement>& ) override; + virtual void endElement( const Reference<XElement>& ) override; + virtual void character( const Reference<XCharacterData>& ) override; }; DomExport::DomExport( SvXMLExport& rExport ) : diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index 872f6d56b0c4..2dc03ee591c9 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -43,24 +43,24 @@ public: virtual ~PropertySetMergerImpl(); // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override; + virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; // XPropertyState - virtual PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< PropertyState > SAL_CALL getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) override; + virtual Sequence< PropertyState > SAL_CALL getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) override; + virtual Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; // XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw(UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties( ) throw(RuntimeException, std::exception) override; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw(UnknownPropertyException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(RuntimeException, std::exception) override; }; // Interface implementation diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 807804a52f90..10a4eda39e60 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -85,13 +85,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - 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; }; TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext ); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c0f556c9b5d0..0671e34eb9e9 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -155,18 +155,18 @@ public: } virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - const OUString& i_rValue ) SAL_OVERRIDE; + const OUString& i_rValue ) override; virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - enum ::xmloff::token::XMLTokenEnum i_eValue ) SAL_OVERRIDE; + enum ::xmloff::token::XMLTokenEnum i_eValue ) override; virtual void StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, - const bool i_bIgnoreWhitespace ) SAL_OVERRIDE; - virtual void EndElement( const bool i_bIgnoreWhitespace ) SAL_OVERRIDE; + const bool i_bIgnoreWhitespace ) override; + virtual void EndElement( const bool i_bIgnoreWhitespace ) override; - virtual void Characters( const OUString& i_rCharacters ) SAL_OVERRIDE; + virtual void Characters( const OUString& i_rCharacters ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - GetComponentContext() const SAL_OVERRIDE; + GetComponentContext() const override; private: SvXMLExport& m_rExport; ::std::stack< OUString > m_aElements; @@ -217,7 +217,7 @@ public: virtual ~SvXMLExportEventListener(); // XEventListener - virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; SvXMLExportEventListener::SvXMLExportEventListener(SvXMLExport* pTempExport) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index dd74df96989a..88579a8bfe01 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -116,7 +116,7 @@ public: virtual ~SvXMLImportEventListener(); // XEventListener - virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; SvXMLImportEventListener::SvXMLImportEventListener(SvXMLImport* pTempImport) |