diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-19 09:58:25 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-19 10:03:09 +0100 |
commit | 9818c3b6d2b0f2793a6106ba80267d3c54956489 (patch) | |
tree | 86c25ebcd806aa967c63a69dfd96ce4713796607 /sw | |
parent | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (diff) |
RTF export: add SAL_OVERRIDE where overriding non-pure-virtual methods
Change-Id: I3b94f3a9e42f43fc290ac0da27446316545466b6
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 8 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.hxx | 23 |
3 files changed, 16 insertions, 17 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 1d66350b8179..83fb58c399a7 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -65,9 +65,9 @@ public: /// Called after we end outputting the attributes. virtual void EndRunProperties( const SwRedlineData* pRedlineData ); - virtual void WritePostitFieldStart(); + virtual void WritePostitFieldStart() SAL_OVERRIDE; - virtual void WritePostitFieldEnd(); + virtual void WritePostitFieldEnd() SAL_OVERRIDE; /// Output text (inside a run). virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); @@ -185,10 +185,10 @@ public: virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ); /// Start of the abstract numbering definition instance. - virtual void StartAbstractNumbering( sal_uInt16 nId ); + virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE; /// End of the abstract numbering definition instance. - virtual void EndAbstractNumbering(); + virtual void EndAbstractNumbering() SAL_OVERRIDE; /// All the numbering level information. virtual void NumberingLevel( sal_uInt8 nLevel, diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 1b15c5183d89..e071e5c621f2 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -123,7 +123,7 @@ protected: virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt); /// Output SwTxtNode is depending on outline export mode - virtual void OutputTextNode( const SwTxtNode& ); + virtual void OutputTextNode( const SwTxtNode& ) SAL_OVERRIDE; /// Output SwGrfNode virtual void OutputGrfNode( const SwGrfNode& ); diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index 12eafbf122b2..edf5a7d92e38 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTFSdrEXPORT_HXX_ -#define _RTFSdrEXPORT_HXX_ +#ifndef _RTFSDREXPORT_HXX_ +#define _RTFSDREXPORT_HXX_ #include <filter/msfilter/escherex.hxx> #include <editeng/outlobj.hxx> @@ -66,26 +66,25 @@ protected: /// /// Returns the element's tag number, -1 means we wrote nothing. using EscherEx::StartShape; - virtual sal_Int32 StartShape(); + sal_Int32 StartShape(); /// End the shape. /// /// The parameter is just what we got from StartShape(). using EscherEx::EndShape; - virtual void EndShape( sal_Int32 nShapeElement ); + void EndShape( sal_Int32 nShapeElement ); - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); + virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) SAL_OVERRIDE; private: - virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ); - virtual void CloseContainer(); + virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) SAL_OVERRIDE; + virtual void CloseContainer() SAL_OVERRIDE; - using EscherEx::EnterGroup; - virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ); - virtual void LeaveGroup(); + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ) SAL_OVERRIDE; + virtual void LeaveGroup() SAL_OVERRIDE; - virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ); + virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) SAL_OVERRIDE; private: /// Add starting and ending point of a line to the m_pShapeAttrList. @@ -100,6 +99,6 @@ private: void impl_writeGraphic(); }; -#endif // _RTFSdrEXPORT_HXX_ +#endif // _RTFSDREXPORT_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |