diff options
Diffstat (limited to 'include/svx/sdr')
24 files changed, 27 insertions, 27 deletions
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index 7b83945169d7..85c5b1159cbb 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -55,7 +55,7 @@ namespace sdr PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DContainer& rAnimatedPrimitives); // destructor - virtual ~PrimitiveAnimation(); + virtual ~PrimitiveAnimation() override; // execute event, from base class Event virtual void Trigger(sal_uInt32 nTime) override; diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index 5665b02d3eec..eab4fe79653c 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -36,7 +36,7 @@ namespace sdr public: // basic constructor and destructor primitiveAnimator(); - SVX_DLLPUBLIC virtual ~primitiveAnimator(); + SVX_DLLPUBLIC virtual ~primitiveAnimator() override; }; } // end of namespace animation } // end of namespace sdr diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 243d252a8c24..06477558f92f 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -113,7 +113,7 @@ namespace sdr public: // constructor/destructor SAL_DLLPRIVATE Scheduler(); - virtual ~Scheduler(); + virtual ~Scheduler() override; // From baseclass Timer, the timeout call virtual void Invoke() override; diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 640193123cbb..63f1247466ab 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -39,7 +39,7 @@ protected: public: // basic constructor/destructor ObjectContactPainter(); - virtual ~ObjectContactPainter(); + virtual ~ObjectContactPainter() override; }; // typedef for transferring SdrObject @@ -67,7 +67,7 @@ public: OutputDevice& rTargetDevice, const SdrObjectVector& rObjects, const SdrPage* pProcessedPage); - virtual ~ObjectContactOfObjListPainter(); + virtual ~ObjectContactOfObjListPainter() override; // Process the whole displaying virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) override; @@ -100,7 +100,7 @@ protected: public: // basic constructor ObjectContactOfPagePainter(ObjectContact& rOriginalObjectContact); - virtual ~ObjectContactOfPagePainter(); + virtual ~ObjectContactOfPagePainter() override; // set another page void SetStartPage(const SdrPage* pPage); diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index b475d511da50..a6a633eb698d 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -47,7 +47,7 @@ protected: public: // basic constructor, used from E3dObject. explicit ViewContactOfE3d(E3dObject& rObj); - virtual ~ViewContactOfE3d(); + virtual ~ViewContactOfE3d() override; // access to E3dObject const E3dObject& GetE3dObject() const diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index 6087546b7faa..a618a788955c 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -40,7 +40,7 @@ protected: public: // basic constructor, used from SdrObject. explicit ViewContactOfPageObj(SdrPageObj& rPageObj); - virtual ~ViewContactOfPageObj(); + virtual ~ViewContactOfPageObj() override; // #WIP# React on changes of the object of this ViewContact virtual void ActionChanged() override; diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 902a55f29bf0..5652449d62e4 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -37,7 +37,7 @@ public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ); - virtual ~ViewContactOfSdrMediaObj(); + virtual ~ViewContactOfSdrMediaObj() override; public: diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 2dbfdea043e8..81583a78932e 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -55,7 +55,7 @@ public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrObj(SdrObject& rObj); - virtual ~ViewContactOfSdrObj(); + virtual ~ViewContactOfSdrObj() override; // Access to possible sub-hierarchy virtual sal_uInt32 GetObjectCount() const override; diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 5892952808cd..e067fce70bda 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -37,7 +37,7 @@ protected: public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrRectObj(SdrRectObj& rTextObj); - virtual ~ViewContactOfSdrRectObj(); + virtual ~ViewContactOfSdrRectObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index 418ce1679f66..a81c4893bea2 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -31,7 +31,7 @@ class ViewContactOfTextObj : public ViewContactOfSdrObj public: // basic constructor, used from SdrObject. explicit ViewContactOfTextObj(SdrTextObj& rTextObj); - virtual ~ViewContactOfTextObj(); + virtual ~ViewContactOfTextObj() override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index eb83749cc4d6..e82e6ce30fb5 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -36,7 +36,7 @@ protected: public: // basic constructor, used from SdrObject. explicit ViewContactOfVirtObj(SdrVirtObj& rObj); - virtual ~ViewContactOfVirtObj(); + virtual ~ViewContactOfVirtObj() override; // Access to possible sub-hierarchy virtual sal_uInt32 GetObjectCount() const override; diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index dccd52ca2b5c..e9b115ee4e2e 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -42,7 +42,7 @@ protected: public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageObj(); + virtual ~ViewObjectContactOfPageObj() override; }; }} diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 9bd6e5ee516d..93332d41c917 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -44,7 +44,7 @@ protected: public: ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfSdrObj(); + virtual ~ViewObjectContactOfSdrObj() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 20255ddd9dbc..c7c1f182aa2c 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -66,7 +66,7 @@ namespace sdr sal_uInt16 nCenY2 = 0, double fShearX = 0.0, double fRotation = 0.0); - virtual ~OverlayAnimatedBitmapEx(); + virtual ~OverlayAnimatedBitmapEx() override; const BitmapEx& getBitmapEx1() const { return maBitmapEx1; } const BitmapEx& getBitmapEx2() const { return maBitmapEx2; } diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index f8cc7ef8dcee..41dccb233e49 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -54,7 +54,7 @@ namespace sdr double fAlpha = 0.0, double fShearX = 0.0, double fRotation = 0.0); - virtual ~OverlayBitmapEx(); + virtual ~OverlayBitmapEx() override; const BitmapEx& getBitmapEx() const { return maBitmapEx; } diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 2be504623dc0..47ccf96ec19f 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -89,7 +89,7 @@ namespace sdr double getDiscreteOne() const; OverlayManager(OutputDevice& rOutputDevice); - virtual ~OverlayManager(); + virtual ~OverlayManager() override; public: static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice); diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 35cb21956004..8aa49dc7b011 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -117,7 +117,7 @@ namespace sdr public: explicit OverlayObject(Color aBaseColor); - virtual ~OverlayObject(); + virtual ~OverlayObject() override; // get OverlayManager OverlayManager* getOverlayManager() const { return mpOverlayManager; } @@ -178,7 +178,7 @@ namespace sdr public: OverlayObjectWithBasePosition(const basegfx::B2DPoint& rBasePos, Color aBaseColor); - virtual ~OverlayObjectWithBasePosition(); + virtual ~OverlayObjectWithBasePosition() override; // access to basePosition const basegfx::B2DPoint& getBasePosition() const { return maBasePosition; } diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index b2713a211374..751b67bdf43f 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -44,7 +44,7 @@ namespace sdr public: OverlayObjectCell( const Color& rColor, const RangeVector& rRects); - virtual ~OverlayObjectCell(); + virtual ~OverlayObjectCell() override; }; } // end of namespace overlay diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 7cc20f481aee..bcdf90f8e5f2 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -41,7 +41,7 @@ namespace sdr public: explicit OverlayPolyPolygonStripedAndFilled( const basegfx::B2DPolyPolygon& rLinePolyPolygon); - virtual ~OverlayPolyPolygonStripedAndFilled(); + virtual ~OverlayPolyPolygonStripedAndFilled() override; // change geometry const basegfx::B2DPolyPolygon& getLinePolyPolygon() const { return maLinePolyPolygon; } diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 101e6a0c0352..2c0207b74c0a 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -41,7 +41,7 @@ namespace sdr public: explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence); - virtual ~OverlayPrimitive2DSequenceObject(); + virtual ~OverlayPrimitive2DSequenceObject() override; // data read access const drawinglayer::primitive2d::Primitive2DContainer& getSequence() const { return maSequence; } diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index b5ac1a8ca536..fe1c11e4d3f4 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -62,7 +62,7 @@ namespace sdr const Color& rColor, const std::vector< basegfx::B2DRange >& rRanges, bool bBorder); - virtual ~OverlaySelection(); + virtual ~OverlaySelection() override; // data read access const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index 3dcbc52f1151..5ef25d56426d 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -42,7 +42,7 @@ namespace sdr const basegfx::B2DPoint& rSecondPos, const basegfx::B2DPoint& rThirdPos, Color aTriangleColor); - virtual ~OverlayTriangle(); + virtual ~OverlayTriangle() override; // get second position const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 0a8e4e5682e2..5864f0e75f00 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -58,7 +58,7 @@ namespace sdr DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj); // destructor - virtual ~DefaultProperties(); + virtual ~DefaultProperties() override; void dumpAsXml(struct _xmlTextWriter * pWriter) const; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 76a7d338e0ed..a6759e1854b0 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxTableController: public sdr::SelectionController { public: SVX_DLLPRIVATE SvxTableController( SdrObjEditView* pView, const SdrObject* pObj ); - SVX_DLLPRIVATE virtual ~SvxTableController(); + SVX_DLLPRIVATE virtual ~SvxTableController() override; // from sdr::SelectionController SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override; |