diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /include/svx/view3d.hxx | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'include/svx/view3d.hxx')
-rw-r--r-- | include/svx/view3d.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 74f793269335..4681121416b6 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -82,23 +82,23 @@ public: virtual ~E3dView(); // Output all marked Objects on the given OutputDevice. - virtual void DrawMarkedObj(OutputDevice& rOut) const; + virtual void DrawMarkedObj(OutputDevice& rOut) const SAL_OVERRIDE; // Access to the default attributes. E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } - virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); - virtual void CheckPossibilities(); + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; // Get/Set Event void SetMouseEvent(const MouseEvent& rNew) { aMouseEvent = rNew; } const MouseEvent& GetMouseEvent() { return aMouseEvent; } // Override getting the model, as we need to supply a Scene together with individual 3D Objects. - virtual SdrModel* GetMarkedObjModel() const; + virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; // On Paste: We need to insert the objects of the Scene, but not the Scene itself using SdrView::Paste; - virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0) SAL_OVERRIDE; // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); @@ -115,7 +115,7 @@ public: // Migration of overlay bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } - virtual void MovAction(const Point& rPnt); + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; void End3DCreation(bool bUseDefaultValuesForMirrorAxes=false); void ResetCreationActive(); |