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 /include/svx/view3d.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
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 072e3776d4a9..b786c820ae9f 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -82,25 +82,25 @@ public: virtual ~E3dView(); // Output all marked Objects on the given OutputDevice. - virtual void DrawMarkedObj(OutputDevice& rOut) const SAL_OVERRIDE; + virtual void DrawMarkedObj(OutputDevice& rOut) const 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) SAL_OVERRIDE; - virtual void CheckPossibilities() SAL_OVERRIDE; + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL) override; + virtual void CheckPossibilities() 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 SAL_OVERRIDE; + virtual SdrModel* GetMarkedObjModel() const 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, SdrInsertFlags nOptions, - const OUString& rSrcShellID, const OUString& rDestShellID ) SAL_OVERRIDE; + const OUString& rSrcShellID, const OUString& rDestShellID ) override; // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); @@ -117,7 +117,7 @@ public: // Migration of overlay bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } - virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; + virtual void MovAction(const Point& rPnt) override; void End3DCreation(bool bUseDefaultValuesForMirrorAxes=false); void ResetCreationActive(); |