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 /lotuswordpro/source/filter/lwpfribmark.hxx | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'lotuswordpro/source/filter/lwpfribmark.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpfribmark.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx index 0a02bb0138f5..f4e3affea5f1 100644 --- a/lotuswordpro/source/filter/lwpfribmark.hxx +++ b/lotuswordpro/source/filter/lwpfribmark.hxx @@ -75,7 +75,7 @@ public: , m_nType(0) {} virtual ~LwpFribCHBlock(){} - void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE; + void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpCHBlkMarker* GetMarker(); sal_uInt8 GetType(){return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; @@ -90,12 +90,12 @@ class LwpFribBookMark : public LwpFrib public: explicit LwpFribBookMark( LwpPara* pPara ); virtual ~LwpFribBookMark(){} - void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE; + void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpObjectID GetMarkerID(){return m_objMarker;} sal_uInt8 GetType(){return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara); - void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE; + void RegisterStyle(LwpFoundry* pFoundry) override; private: sal_uInt8 m_nType; LwpObjectID m_objMarker; @@ -108,12 +108,12 @@ class LwpFribField : public LwpFrib public: explicit LwpFribField( LwpPara* pPara ); virtual ~LwpFribField(){} - void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE; + void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpFieldMark* GetMarker(); sal_uInt8 GetType(){return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara); - void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE; + void RegisterStyle(LwpFoundry* pFoundry) override; enum{ SUBFIELD_INVALID = 0, SUBFIELD_DATETIME = 1, @@ -149,12 +149,12 @@ class LwpFribRubyMarker : public LwpFrib public: explicit LwpFribRubyMarker( LwpPara* pPara ); virtual ~LwpFribRubyMarker(){} - void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE; + void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpRubyMarker* GetMarker(); sal_uInt8 GetType(){return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara); - void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE; + void RegisterStyle(LwpFoundry* pFoundry) override; private: sal_uInt8 m_nType; LwpObjectID m_objMarker; |