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 /sw/source/core/inc/rootfrm.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/inc/rootfrm.hxx')
| -rw-r--r-- | sw/source/core/inc/rootfrm.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 61cac40a16cb..30fb92d92932 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -145,12 +145,12 @@ class SwRootFrm: public SwLayoutFrm void _DeleteEmptySct(); // Destroys the registered SectionFrms void _RemoveFromList( SwSectionFrm* pSct ); // Removes SectionFrms from the Delete List - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwRootFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; public: @@ -197,22 +197,22 @@ public: void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; } virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; #ifdef DBG_UTIL - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; #endif - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; Point GetNextPrevContentPos( const Point &rPoint, bool bNext ) const; - virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; + virtual Size ChgSize( const Size& aNewSize ) override; void SetIdleFlags() { |