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 /include/xmloff/txtstyli.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/xmloff/txtstyli.hxx')
| -rw-r--r-- | include/xmloff/txtstyli.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index dba063d56d36..e616573407b6 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -59,7 +59,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; public: @@ -76,7 +76,7 @@ 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; const OUString& GetListStyle() const { return sListStyleName; } // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#) @@ -90,14 +90,14 @@ public: const OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; } const OUString& GetDataStyleName() const { return sDataStyleName; } - virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; - virtual void SetDefaults() SAL_OVERRIDE; + virtual void CreateAndInsert( bool bOverwrite ) override; + virtual void Finish( bool bOverwrite ) override; + virtual void SetDefaults() override; // override FillPropertySet, so we can get at the combined characters virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySet > & rPropSet ) override; inline bool HasCombinedCharactersLetter() { return bHasCombinedCharactersLetter; } |