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/inc/ndgrf.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/inc/ndgrf.hxx')
-rw-r--r-- | sw/inc/ndgrf.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index bef476592e34..7de4410e39b7 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -121,7 +121,7 @@ public: const Graphic& GetGrf(bool bWait = false) const; const GraphicObject& GetGrfObj(bool bWait = false) const; const GraphicObject* GetReplacementGrfObj() const; - virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE; + virtual SwContentNode *SplitContentNode( const SwPosition & ) override; /// isolated only way to set GraphicObject to allow more actions when doing so void SetGraphic(const Graphic& rGraphic, const OUString& rLink); @@ -130,7 +130,7 @@ public: void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } - virtual Size GetTwipSize() const SAL_OVERRIDE; + virtual Size GetTwipSize() const override; void SetTwipSize( const Size& rSz ); bool IsTransparent() const; @@ -153,7 +153,7 @@ public: void SetScaleImageMap( bool b ) { bScaleImageMap = b; } /// in ndcopy.cxx - virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; + virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override; /** Re-read in case graphic was not OK. The current one gets replaced by the new one. */ @@ -174,8 +174,8 @@ public: bool IsSelected() const; /// Communicate to graphic that node is in Undo-range. - virtual bool SavePersistentData() SAL_OVERRIDE; - virtual bool RestorePersistentData() SAL_OVERRIDE; + virtual bool SavePersistentData() override; + virtual bool RestorePersistentData() override; /// Query link-data. bool IsGrfLink() const { return refLink.Is(); } |