diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /svx/inc/sdr | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'svx/inc/sdr')
52 files changed, 73 insertions, 73 deletions
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 9de11ad95123..283b7990fcf1 100644 --- a/svx/inc/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx @@ -49,7 +49,7 @@ namespace sdr // basic constructor, used from SdrPageView. explicit ObjectContactOfPageView(SdrPageWindow& rPageWindow); - virtual ~ObjectContactOfPageView(); + virtual ~ObjectContactOfPageView() override; // LazyInvalidate request. This is used from the VOCs to mark that they // got invalidated by an ActionChanged() call. An active view needs to remember diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx index 137f6c90d78f..02e28560221d 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx @@ -32,7 +32,7 @@ namespace sdr public: // basic constructor, used from SdrObject. ViewContactOfE3dCube(E3dCubeObj& rCubeObj); - virtual ~ViewContactOfE3dCube(); + virtual ~ViewContactOfE3dCube() override; // access to SdrObject const E3dCubeObj& GetE3dCubeObj() const diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx index 1f4c977d41de..a3c92b29d0c0 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx @@ -33,7 +33,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfE3dExtrude(E3dExtrudeObj& rExtrude); - virtual ~ViewContactOfE3dExtrude(); + virtual ~ViewContactOfE3dExtrude() override; // access to SdrObject const E3dExtrudeObj& GetE3dExtrudeObj() const diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx index aaf3e3f82d5d..fa8c3e2acd38 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx @@ -33,7 +33,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfE3dLathe(E3dLatheObj& rLathe); - virtual ~ViewContactOfE3dLathe(); + virtual ~ViewContactOfE3dLathe() override; // access to SdrObject const E3dLatheObj& GetE3dLatheObj() const diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx index a8343edc4646..3458db1becc0 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx @@ -32,7 +32,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfE3dPolygon(E3dPolygonObj& rPolygon); - virtual ~ViewContactOfE3dPolygon(); + virtual ~ViewContactOfE3dPolygon() override; // access to SdrObject const E3dPolygonObj& GetE3dPolygonObj() const diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx index 490e0ec937cf..2b71810ac7a7 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx @@ -33,7 +33,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfE3dSphere(E3dSphereObj& rSphere); - virtual ~ViewContactOfE3dSphere(); + virtual ~ViewContactOfE3dSphere() override; // access to SdrObject const E3dSphereObj& GetE3dSphereObj() const diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index cd0cff073504..a64d392cdcdf 100644 --- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx @@ -60,7 +60,7 @@ namespace sdr // basic constructor, destructor explicit ViewContactOfGraphic(SdrGrafObj& rGrafObj); - virtual ~ViewContactOfGraphic(); + virtual ~ViewContactOfGraphic() override; // #i102380# void flushGraphicObjects(); diff --git a/svx/inc/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx index d0678818b97d..48c113dbaf20 100644 --- a/svx/inc/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx @@ -45,7 +45,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfGroup(SdrObjGroup& rGroup); - virtual ~ViewContactOfGroup(); + virtual ~ViewContactOfGroup() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx index 1639472ec6fb..fec21ed720d6 100644 --- a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -50,7 +50,7 @@ namespace sdr explicit ViewContactOfMasterPageDescriptor(sdr::MasterPageDescriptor& rDescriptor); // The destructor. - virtual ~ViewContactOfMasterPageDescriptor(); + virtual ~ViewContactOfMasterPageDescriptor() override; // access to MasterPageDescriptor sdr::MasterPageDescriptor& GetMasterPageDescriptor() const diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx index 97e53f4f7a4c..ddd6c6793efe 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -40,7 +40,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrCaptionObj(SdrCaptionObj& rCaptionObj); - virtual ~ViewContactOfSdrCaptionObj(); + virtual ~ViewContactOfSdrCaptionObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx index ce614da05bee..d48ba3b172bb 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx @@ -40,7 +40,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrCircObj(SdrCircObj& rCircObj); - virtual ~ViewContactOfSdrCircObj(); + virtual ~ViewContactOfSdrCircObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx index 59768a62744c..89b72ef1f3b6 100644 --- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx @@ -40,7 +40,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrEdgeObj(SdrEdgeObj& rEdgeObj); - virtual ~ViewContactOfSdrEdgeObj(); + virtual ~ViewContactOfSdrEdgeObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx index 9373585a4c5b..2b5dd31c2eac 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -40,7 +40,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrMeasureObj(SdrMeasureObj& rMeasureObj); - virtual ~ViewContactOfSdrMeasureObj(); + virtual ~ViewContactOfSdrMeasureObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx index 9f93f2c6906a..35d9db98b340 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -43,7 +43,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrObjCustomShape(SdrObjCustomShape& rCustomShape); - virtual ~ViewContactOfSdrObjCustomShape(); + virtual ~ViewContactOfSdrObjCustomShape() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx index d4222faac3a8..8d94c6115aa6 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx @@ -51,7 +51,7 @@ public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrOle2Obj(SdrOle2Obj& rOle2Obj); - virtual ~ViewContactOfSdrOle2Obj(); + virtual ~ViewContactOfSdrOle2Obj() override; // helper for creating a OLE sequence for this object. It takes care od attributes, needed // scaling (e.g. for EmptyPresObj's), the correct graphic and other stuff. It is used from diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx index 9ff6cfa65828..2342b78aae84 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx @@ -36,7 +36,7 @@ protected: public: explicit ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfPageSubObject(); + virtual ~ViewContactOfPageSubObject() override; virtual ViewContact* GetParentContact() const override; const SdrPage& getPage() const; @@ -50,7 +50,7 @@ protected: public: explicit ViewContactOfPageBackground(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfPageBackground(); + virtual ~ViewContactOfPageBackground() override; }; class ViewContactOfPageShadow : public ViewContactOfPageSubObject @@ -61,7 +61,7 @@ protected: public: explicit ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfPageShadow(); + virtual ~ViewContactOfPageShadow() override; }; class ViewContactOfPageFill : public ViewContactOfPageSubObject @@ -72,7 +72,7 @@ protected: public: explicit ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfPageFill(); + virtual ~ViewContactOfPageFill() override; }; class ViewContactOfMasterPage : public ViewContactOfPageSubObject @@ -83,7 +83,7 @@ protected: public: explicit ViewContactOfMasterPage(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfMasterPage(); + virtual ~ViewContactOfMasterPage() override; }; class ViewContactOfOuterPageBorder : public ViewContactOfPageSubObject @@ -94,7 +94,7 @@ protected: public: explicit ViewContactOfOuterPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfOuterPageBorder(); + virtual ~ViewContactOfOuterPageBorder() override; }; class ViewContactOfInnerPageBorder : public ViewContactOfPageSubObject @@ -105,7 +105,7 @@ protected: public: explicit ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfInnerPageBorder(); + virtual ~ViewContactOfInnerPageBorder() override; }; /** @@ -123,7 +123,7 @@ protected: public: explicit ViewContactOfPageHierarchy(ViewContactOfSdrPage& rParentViewContactOfSdrPage); - virtual ~ViewContactOfPageHierarchy(); + virtual ~ViewContactOfPageHierarchy() override; virtual sal_uInt32 GetObjectCount() const override; virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override; @@ -139,7 +139,7 @@ protected: public: ViewContactOfGrid(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); - virtual ~ViewContactOfGrid(); + virtual ~ViewContactOfGrid() override; bool getFront() const { return mbFront; } }; @@ -154,7 +154,7 @@ protected: public: ViewContactOfHelplines(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); - virtual ~ViewContactOfHelplines(); + virtual ~ViewContactOfHelplines() override; bool getFront() const { return mbFront; } }; @@ -193,7 +193,7 @@ public: // basic constructor, used from SdrPage. explicit ViewContactOfSdrPage(SdrPage& rObj); - virtual ~ViewContactOfSdrPage(); + virtual ~ViewContactOfSdrPage() override; // Access to possible sub-hierarchy virtual sal_uInt32 GetObjectCount() const override; diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx index 35f8e6862e85..bda545795f76 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx @@ -40,7 +40,7 @@ namespace sdr public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrPathObj(SdrPathObj& rTextObj); - virtual ~ViewContactOfSdrPathObj(); + virtual ~ViewContactOfSdrPathObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index 19a5b2aeaa5f..424481e67b86 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -52,7 +52,7 @@ namespace sdr { namespace contact { } explicit ViewContactOfUnoControl( SdrUnoObj& _rUnoObject ); - virtual ~ViewContactOfUnoControl(); + virtual ~ViewContactOfUnoControl() override; /** retrieves a temporary XControl instance, whose parent is the given window @seealso SdrUnoObj::GetTemporaryControlForWindow diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx index ac573bf2271f..957b2665b2a7 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx @@ -52,7 +52,7 @@ namespace sdr public: ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfE3d(); + virtual ~ViewObjectContactOfE3d() override; // access to the local primitive sequence. This will ensure that the list is // current in comparing the local list content with a fresh created incarnation diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx index ae1a40910bdb..f30603be9959 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -37,7 +37,7 @@ namespace sdr public: // basic constructor. ViewObjectContactOfE3dScene(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfE3dScene(); + virtual ~ViewObjectContactOfE3dScene() override; // process this primitive: Eventually also recursively travel an existing hierarchy, // e.g. for group objects, scenes or pages. This method will test geometrical visibility. diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx index 89c03e490304..75ecbf65dc2a 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx @@ -58,7 +58,7 @@ namespace sdr public: ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfGraphic(); + virtual ~ViewObjectContactOfGraphic() override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx index 751931cbd039..416ca0fb633b 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx @@ -31,7 +31,7 @@ namespace sdr public: // basic constructor. ViewObjectContactOfGroup(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfGroup(); + virtual ~ViewObjectContactOfGroup() override; // This method recursively paints the draw hierarchy. virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 5aee57dcd714..35775fdaeb36 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -34,7 +34,7 @@ namespace sdr { public: ViewObjectContactOfMasterPageDescriptor(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfMasterPageDescriptor(); + virtual ~ViewObjectContactOfMasterPageDescriptor() override; // access to MasterPageDescriptor sdr::MasterPageDescriptor& GetMasterPageDescriptor() const; diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 9feef60759d9..efe62f09f7c2 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -40,7 +40,7 @@ namespace sdr ViewObjectContactOfSdrMediaObj( ObjectContact& rObjectContact, ViewContact& rViewContact, const ::avmedia::MediaItem& rMediaItem ); - virtual ~ViewObjectContactOfSdrMediaObj(); + virtual ~ViewObjectContactOfSdrMediaObj() override; public: diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 4f724b36ce56..31ad144b65f2 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -36,7 +36,7 @@ protected: public: ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfSdrOle2Obj(); + virtual ~ViewObjectContactOfSdrOle2Obj() override; }; }} diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx index 86a45e8d6317..e267b6179467 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -35,7 +35,7 @@ namespace sdr public: ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageSubObject(); + virtual ~ViewObjectContactOfPageSubObject() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const override; @@ -54,7 +54,7 @@ namespace sdr public: ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageBackground(); + virtual ~ViewObjectContactOfPageBackground() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -70,7 +70,7 @@ namespace sdr protected: public: ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfMasterPage(); + virtual ~ViewObjectContactOfMasterPage() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -88,7 +88,7 @@ namespace sdr public: ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageFill(); + virtual ~ViewObjectContactOfPageFill() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -103,7 +103,7 @@ namespace sdr { public: ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageShadow(); + virtual ~ViewObjectContactOfPageShadow() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -118,7 +118,7 @@ namespace sdr { public: ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfOuterPageBorder(); + virtual ~ViewObjectContactOfOuterPageBorder() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -133,7 +133,7 @@ namespace sdr { public: ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfInnerPageBorder(); + virtual ~ViewObjectContactOfInnerPageBorder() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -148,7 +148,7 @@ namespace sdr { public: ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageHierarchy(); + virtual ~ViewObjectContactOfPageHierarchy() override; virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; }; @@ -166,7 +166,7 @@ namespace sdr public: ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageGrid(); + virtual ~ViewObjectContactOfPageGrid() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -184,7 +184,7 @@ namespace sdr public: ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageHelplines(); + virtual ~ViewObjectContactOfPageHelplines() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; @@ -199,7 +199,7 @@ namespace sdr { public: ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfSdrPage(); + virtual ~ViewObjectContactOfSdrPage() override; virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; }; diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index c9c1abbff6df..7872e7655163 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -89,7 +89,7 @@ namespace sdr { namespace contact { void onControlChangedOrModified( ImplAccess ) { impl_onControlChangedOrModified(); } protected: - virtual ~ViewObjectContactOfUnoControl(); + virtual ~ViewObjectContactOfUnoControl() override; // support for Primitive2D virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; @@ -108,7 +108,7 @@ namespace sdr { namespace contact { { public: UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact ); - virtual ~UnoControlPrintOrPreviewContact(); + virtual ~UnoControlPrintOrPreviewContact() override; private: UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) = delete; diff --git a/svx/inc/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx index 74a5069a0a9a..c2db22950e86 100644 --- a/svx/inc/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx @@ -35,7 +35,7 @@ namespace sdr public: explicit OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos); - virtual ~OverlayCrosshairStriped(); + virtual ~OverlayCrosshairStriped() override; // react on stripe definition change virtual void stripeDefinitionHasChanged() override; diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx index 09e18aa79a20..5e916bfe568e 100644 --- a/svx/inc/sdr/overlay/overlayhandle.hxx +++ b/svx/inc/sdr/overlay/overlayhandle.hxx @@ -34,7 +34,7 @@ public: Color& rFillColor, float fTransparency = 0.0f); - virtual ~OverlayHandle(); + virtual ~OverlayHandle() override; }; }} // end of namespace sdr::overlay diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx index a5bc4283698d..7329dcf40459 100644 --- a/svx/inc/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/sdr/overlay/overlayhelpline.hxx @@ -41,7 +41,7 @@ namespace sdr explicit OverlayHelplineStriped( const basegfx::B2DPoint& rBasePos, SdrHelpLineKind eNewKind = SdrHelpLineKind::Point); - virtual ~OverlayHelplineStriped(); + virtual ~OverlayHelplineStriped() override; // dat read access SdrHelpLineKind getKind() const { return meKind; } diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx index 6fb4f0c95ae7..ba5acb35504d 100644 --- a/svx/inc/sdr/overlay/overlayline.hxx +++ b/svx/inc/sdr/overlay/overlayline.hxx @@ -40,7 +40,7 @@ namespace sdr OverlayLineStriped( const basegfx::B2DPoint& rBasePos, const basegfx::B2DPoint& rSecondPos); - virtual ~OverlayLineStriped(); + virtual ~OverlayLineStriped() override; // change second position const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 5eae9d6cb599..5528315fe20f 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -63,7 +63,7 @@ namespace sdr OverlayManagerBuffered( OutputDevice& rOutputDevice, bool bRefreshWithPreRendering = false); - virtual ~OverlayManagerBuffered(); + virtual ~OverlayManagerBuffered() override; public: static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice, diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx index de6d320ceb90..2cab78012114 100644 --- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx @@ -48,7 +48,7 @@ namespace sdr const basegfx::B2DPoint& rSecondPos, bool bExtendedLines = false, bool bShowBounds = true); - virtual ~OverlayRollingRectangleStriped(); + virtual ~OverlayRollingRectangleStriped() override; // change second position const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx index 262cf7749d7c..87ec2975b8ae 100644 --- a/svx/inc/sdr/properties/attributeproperties.hxx +++ b/svx/inc/sdr/properties/attributeproperties.hxx @@ -61,7 +61,7 @@ namespace sdr virtual BaseProperties& Clone(SdrObject& rObj) const override; // destructor - virtual ~AttributeProperties(); + virtual ~AttributeProperties() override; // set a new StyleSheet and broadcast virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx index 973741ecedfe..13bb57ff3d6a 100644 --- a/svx/inc/sdr/properties/captionproperties.hxx +++ b/svx/inc/sdr/properties/captionproperties.hxx @@ -44,7 +44,7 @@ namespace sdr CaptionProperties(const CaptionProperties& rProps, SdrObject& rObj); // destructor - virtual ~CaptionProperties(); + virtual ~CaptionProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx index ec06c55cf459..df8ae4c472dc 100644 --- a/svx/inc/sdr/properties/circleproperties.hxx +++ b/svx/inc/sdr/properties/circleproperties.hxx @@ -44,7 +44,7 @@ namespace sdr CircleProperties(const CircleProperties& rProps, SdrObject& rObj); // destructor - virtual ~CircleProperties(); + virtual ~CircleProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx index 821d7ea3fb18..95de994a0085 100644 --- a/svx/inc/sdr/properties/connectorproperties.hxx +++ b/svx/inc/sdr/properties/connectorproperties.hxx @@ -44,7 +44,7 @@ namespace sdr ConnectorProperties(const ConnectorProperties& rProps, SdrObject& rObj); // destructor - virtual ~ConnectorProperties(); + virtual ~ConnectorProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 3f1cc40cd54a..ba93dad7339a 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -72,7 +72,7 @@ namespace sdr CustomShapeProperties(const CustomShapeProperties& rProps, SdrObject& rObj); // destructor - virtual ~CustomShapeProperties(); + virtual ~CustomShapeProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index a26dd4b0815a..b5d6bd67d2ec 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx @@ -42,7 +42,7 @@ namespace sdr E3dCompoundProperties(const E3dCompoundProperties& rProps, SdrObject& rObj); // destructor - virtual ~E3dCompoundProperties(); + virtual ~E3dCompoundProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx index e846203b90db..c8156ac3695f 100644 --- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx @@ -41,7 +41,7 @@ namespace sdr E3dExtrudeProperties(const E3dExtrudeProperties& rProps, SdrObject& rObj); // destructor - virtual ~E3dExtrudeProperties(); + virtual ~E3dExtrudeProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx index 7ed1c77952c7..5c7cc4ff1780 100644 --- a/svx/inc/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx @@ -41,7 +41,7 @@ namespace sdr E3dLatheProperties(const E3dLatheProperties& rProps, SdrObject& rObj); // destructor - virtual ~E3dLatheProperties(); + virtual ~E3dLatheProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx index 34f554b1cfa5..07006c0afda5 100644 --- a/svx/inc/sdr/properties/e3dproperties.hxx +++ b/svx/inc/sdr/properties/e3dproperties.hxx @@ -44,7 +44,7 @@ namespace sdr E3dProperties(const E3dProperties& rProps, SdrObject& rObj); // destructor - virtual ~E3dProperties(); + virtual ~E3dProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index bd415df1fc69..54f4981d8de1 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -41,7 +41,7 @@ namespace sdr E3dSceneProperties(const E3dSceneProperties& rProps, SdrObject& rObj); // destructor - virtual ~E3dSceneProperties(); + virtual ~E3dSceneProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx index 0a08f57c3abd..c7e5068d08cd 100644 --- a/svx/inc/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx @@ -41,7 +41,7 @@ namespace sdr E3dSphereProperties(const E3dSphereProperties& rProps, SdrObject& rObj); // destructor - virtual ~E3dSphereProperties(); + virtual ~E3dSphereProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index 453e3572be76..d8c1f3e18499 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -56,7 +56,7 @@ namespace sdr EmptyProperties(const EmptyProperties& rProps, SdrObject& rObj); // destructor - virtual ~EmptyProperties(); + virtual ~EmptyProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx index 768ef386dfc4..aeb8b6585a98 100644 --- a/svx/inc/sdr/properties/graphicproperties.hxx +++ b/svx/inc/sdr/properties/graphicproperties.hxx @@ -44,7 +44,7 @@ namespace sdr GraphicProperties(const GraphicProperties& rProps, SdrObject& rObj); // destructor - virtual ~GraphicProperties(); + virtual ~GraphicProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index 615efffd3015..50d3fb16e652 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -53,7 +53,7 @@ namespace sdr GroupProperties(const GroupProperties& rProps, SdrObject& rObj); // destructor - virtual ~GroupProperties(); + virtual ~GroupProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx index 908aa2128c86..e7dae195176c 100644 --- a/svx/inc/sdr/properties/measureproperties.hxx +++ b/svx/inc/sdr/properties/measureproperties.hxx @@ -44,7 +44,7 @@ namespace sdr MeasureProperties(const MeasureProperties& rProps, SdrObject& rObj); // destructor - virtual ~MeasureProperties(); + virtual ~MeasureProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx index 00cdb4045ed3..047af50289bc 100644 --- a/svx/inc/sdr/properties/oleproperties.hxx +++ b/svx/inc/sdr/properties/oleproperties.hxx @@ -38,7 +38,7 @@ namespace sdr OleProperties(const OleProperties& rProps, SdrObject& rObj); // destructor - virtual ~OleProperties(); + virtual ~OleProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index 5df093a2617f..1c4eee7c8cd4 100644 --- a/svx/inc/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx @@ -47,7 +47,7 @@ namespace sdr PageProperties(const PageProperties& rProps, SdrObject& rObj); // destructor - virtual ~PageProperties(); + virtual ~PageProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx index 9e50b549f0f3..376b494eac93 100644 --- a/svx/inc/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/sdr/properties/rectangleproperties.hxx @@ -41,7 +41,7 @@ namespace sdr RectangleProperties(const RectangleProperties& rProps, SdrObject& rObj); // destructor - virtual ~RectangleProperties(); + virtual ~RectangleProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx index a7f88280706d..b2c73f4d0a00 100644 --- a/svx/inc/sdr/properties/textproperties.hxx +++ b/svx/inc/sdr/properties/textproperties.hxx @@ -55,7 +55,7 @@ namespace sdr TextProperties(const TextProperties& rProps, SdrObject& rObj); // destructor - virtual ~TextProperties(); + virtual ~TextProperties() override; // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; |