diff options
Diffstat (limited to 'include/svx/scene3d.hxx')
-rw-r--r-- | include/svx/scene3d.hxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index f313ec29e379..7c61e7e89cc4 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -63,8 +63,8 @@ private: friend class sdr::properties::E3dSceneProperties; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; // transformations B3dCamera aCameraSet; @@ -75,12 +75,12 @@ protected: // Flag to determine if only selected objects should be drawn bool bDrawOnlySelected : 1; - virtual void NewObjectInserted(const E3dObject* p3DObj) SAL_OVERRIDE; - virtual void StructureChanged() SAL_OVERRIDE; + virtual void NewObjectInserted(const E3dObject* p3DObj) override; + virtual void StructureChanged() override; void RebuildLists(); - virtual void Notify(SfxBroadcaster &rBC, const SfxHint &rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster &rBC, const SfxHint &rHint) override; protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); @@ -93,12 +93,12 @@ public: E3dScene(E3dDefaultAttributes& rDefault); virtual ~E3dScene(); - virtual void SetBoundRectDirty() SAL_OVERRIDE; + virtual void SetBoundRectDirty() override; // access to cleanup of depth mapper void Cleanup3DDepthMapper() { ImpCleanup3DDepthMapper(); } - virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const; @@ -117,52 +117,52 @@ public: // set flag to draw only selected void SetDrawOnlySelected(bool bNew) { bDrawOnlySelected = bNew; } bool GetDrawOnlySelected() const { return bDrawOnlySelected; } - virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual void NbcMove(const Size& rSize) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcMove(const Size& rSize) override; virtual void NbcResize(const Point& rRef, const Fraction& rXFact, - const Fraction& rYFact) SAL_OVERRIDE; - virtual void RecalcSnapRect() SAL_OVERRIDE; + const Fraction& rYFact) override; + virtual void RecalcSnapRect() override; - virtual E3dScene* GetScene() const SAL_OVERRIDE; + virtual E3dScene* GetScene() const override; void SetCamera(const Camera3D& rNewCamera); const Camera3D& GetCamera() const { return aCamera; } void removeAllNonSelectedObjects(); - virtual E3dScene* Clone() const SAL_OVERRIDE; + virtual E3dScene* Clone() const override; E3dScene& operator=(const E3dScene&); - virtual SdrObjGeoData *NewGeoData() const SAL_OVERRIDE; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; - virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; + virtual SdrObjGeoData *NewGeoData() const override; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; + virtual void RestGeoData(const SdrObjGeoData& rGeo) override; - virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) SAL_OVERRIDE; - virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix) SAL_OVERRIDE; + virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) override; + virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; void RotateScene(const Point& rRef, long nAngle, double sn, double cs); // TakeObjName...() is for the display in the UI, for example "3 frames selected". - virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; - virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; + virtual OUString TakeObjNameSingul() const override; + virtual OUString TakeObjNamePlural() const override; // get transformations B3dCamera& GetCameraSet() { return aCameraSet; } const B3dCamera& GetCameraSet() const { return aCameraSet; } // break up - virtual bool IsBreakObjPossible() SAL_OVERRIDE; + virtual bool IsBreakObjPossible() override; // polygon which is built during creation - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; // create moves - virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; - virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; // true=Xor muss repainted werden - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; - virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; - virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool BegCreate(SdrDragStat& rStat) override; + virtual bool MovCreate(SdrDragStat& rStat) override; // true=Xor muss repainted werden + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; + virtual bool BckCreate(SdrDragStat& rStat) override; + virtual void BrkCreate(SdrDragStat& rStat) override; }; #endif // INCLUDED_SVX_SCENE3D_HXX |