svx/inc/GalleryControl.hxx | 3 -
svx/inc/dragmt3d.hxx | 4 -
svx/inc/extrusiondepthdialog.hxx | 2
svx/inc/galbrws2.hxx | 2
svx/inc/galobj.hxx | 6 +-
svx/inc/palettes.hxx | 6 +-
svx/inc/sdr/contact/viewcontactofe3dcube.hxx | 4 -
svx/inc/sdr/contact/viewcontactofe3dextrude.hxx | 4 -
svx/inc/sdr/contact/viewcontactofe3dlathe.hxx | 4 -
svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx | 3 -
svx/inc/sdr/contact/viewcontactofe3dsphere.hxx | 4 -
svx/inc/sdr/contact/viewcontactofgraphic.hxx | 5 --
svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx | 4 -
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx | 5 --
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 21 ++------
svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx | 3 -
svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx | 3 -
svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx | 24
++++------
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 2
svx/inc/sdr/overlay/overlaycrosshair.hxx | 3 -
svx/inc/sdr/overlay/overlayrectangle.hxx | 2
svx/inc/sdr/overlay/overlaytools.hxx | 18 ++-----
svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx | 4 -
svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx | 3 -
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 19 ++-----
svx/inc/sdr/properties/captionproperties.hxx | 3 -
svx/inc/sdr/properties/circleproperties.hxx | 3 -
svx/inc/sdr/properties/connectorproperties.hxx | 3 -
svx/inc/sdr/properties/customshapeproperties.hxx | 3 -
svx/inc/sdr/properties/e3dextrudeproperties.hxx | 3 -
svx/inc/sdr/properties/e3dlatheproperties.hxx | 3 -
svx/inc/sdr/properties/e3dsceneproperties.hxx | 3 -
svx/inc/sdr/properties/e3dsphereproperties.hxx | 3 -
svx/inc/sdr/properties/graphicproperties.hxx | 3 -
svx/inc/sdr/properties/groupproperties.hxx | 3 -
svx/inc/sdr/properties/measureproperties.hxx | 3 -
svx/inc/sdr/properties/oleproperties.hxx | 3 -
svx/inc/sdr/properties/pageproperties.hxx | 3 -
svx/inc/sxmsitm.hxx | 2
svx/inc/sxmtaitm.hxx | 2
svx/inc/sxroaitm.hxx | 2
svx/inc/uiobject.hxx | 4 -
svx/inc/unomlstr.hxx | 2
53 files changed, 92 insertions(+), 143 deletions(-)
New commits:
commit ead7c4f85ff70104808ab9c1e5d68c00b709a538
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 10 15:11:22 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jan 11 07:39:49 2020 +0100
loplugin:finalclasses in svx
Change-Id: I1048585a88c93a67a945914046108d2b8434419e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86547
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 4356c59415d0..4ed3dd7ec7b7 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -34,7 +34,7 @@ class Splitter;
namespace svx { namespace sidebar {
-class SVX_DLLPUBLIC GalleryControl : public vcl::Window
+class SVX_DLLPUBLIC GalleryControl final : public vcl::Window
{
public:
GalleryControl( vcl::Window* pParentWindow );
@@ -55,7 +55,6 @@ private:
DECL_LINK(SplitHdl, Splitter*, void);
-protected:
virtual ~GalleryControl() override;
virtual void dispose() override;
};
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index de34016e37de..9009bdff06c9 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -83,7 +83,7 @@ public:
};
// Derivative of SdrDragMethod for spinning 3D objects
-class E3dDragRotate : public E3dDragMethod
+class E3dDragRotate final : public E3dDragMethod
{
basegfx::B3DPoint maGlobalCenter;
@@ -99,7 +99,7 @@ public:
};
// Derivative of SdrDragMethod for moving 3D sub-objects
-class E3dDragMove : public E3dDragMethod
+class E3dDragMove final : public E3dDragMethod
{
SdrHdlKind meWhatDragHdl;
Point maScaleFixPos;
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 183bc9b6a603..e7f2e07a514b 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -24,7 +24,7 @@
namespace svx {
-class ExtrusionDepthDialog : public weld::GenericDialogController
+class ExtrusionDepthDialog final : public weld::GenericDialogController
{
std::unique_ptr<weld::MetricSpinButton> m_xMtrDepth;
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 5a669c3805e4..d37ddad93e65 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -56,7 +56,7 @@ namespace o3tl
}
-class GalleryToolBox : public ToolBox
+class GalleryToolBox final : public ToolBox
{
private:
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 68b988f2c0a5..f9aa1ffa9558 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -84,7 +84,7 @@ public:
BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
};
-class SgaObjectSound : public SgaObject
+class SgaObjectSound final : public SgaObject
{
private:
@@ -107,7 +107,7 @@ public:
class FmFormModel;
-class SgaObjectSvDraw : public SgaObject
+class SgaObjectSvDraw final : public SgaObject
{
using SgaObject::CreateThumb;
@@ -159,7 +159,7 @@ public:
virtual SgaObjKind GetObjKind() const override { return
SgaObjKind::Animation; }
};
-class SgaObjectINet : public SgaObjectAnim
+class SgaObjectINet final : public SgaObjectAnim
{
public:
diff --git a/svx/inc/palettes.hxx b/svx/inc/palettes.hxx
index fe88af7f2b5a..635724719e9c 100644
--- a/svx/inc/palettes.hxx
+++ b/svx/inc/palettes.hxx
@@ -29,7 +29,7 @@ typedef std::vector< NamedColor > ColorList;
// ASE = Adobe Swatch Exchange
-class PaletteASE : public Palette
+class PaletteASE final : public Palette
{
bool mbValidPalette;
OUString const maFPath;
@@ -51,7 +51,7 @@ public:
// GPL - this is *not* GNU Public License, but is the Gimp PaLette
-class PaletteGPL : public Palette
+class PaletteGPL final : public Palette
{
bool mbLoadedPalette;
bool mbValidPalette;
@@ -77,7 +77,7 @@ public:
// SOC - Star Office Color-table
-class PaletteSOC : public Palette
+class PaletteSOC final : public Palette
{
bool mbLoadedPalette;
OUString const maFPath;
diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
index 02e28560221d..8b45f78869ab 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
@@ -27,7 +27,7 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfE3dCube : public ViewContactOfE3d
+ class ViewContactOfE3dCube final : public ViewContactOfE3d
{
public:
// basic constructor, used from SdrObject.
@@ -40,7 +40,7 @@ namespace sdr
return static_cast<const E3dCubeObj&>(GetE3dObject());
}
- protected:
+ private:
// This method is responsible for creating the graphical
visualisation data which is
// stored in the local primitive list. Default creates a yellow
replacement rectangle.
virtual drawinglayer::primitive3d::Primitive3DContainer
createViewIndependentPrimitive3DContainer() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
index a3c92b29d0c0..d5a070986696 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfE3dExtrude : public ViewContactOfE3d
+ class ViewContactOfE3dExtrude final : public ViewContactOfE3d
{
public:
// basic constructor, used from SdrObject.
@@ -41,7 +41,7 @@ namespace sdr
return static_cast<const E3dExtrudeObj&>(GetE3dObject());
}
- protected:
+ private:
// This method is responsible for creating the graphical
visualisation data which is
// stored in the local primitive list. Default creates a yellow
replacement rectangle.
virtual drawinglayer::primitive3d::Primitive3DContainer
createViewIndependentPrimitive3DContainer() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
index fa8c3e2acd38..65ef74141a92 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfE3dLathe : public ViewContactOfE3d
+ class ViewContactOfE3dLathe final : public ViewContactOfE3d
{
public:
// basic constructor, used from SdrObject.
@@ -41,7 +41,7 @@ namespace sdr
return static_cast<const E3dLatheObj&>(GetE3dObject());
}
- protected:
+ private:
// This method is responsible for creating the graphical
visualisation data which is
// stored in the local primitive list. Default creates a yellow
replacement rectangle.
virtual drawinglayer::primitive3d::Primitive3DContainer
createViewIndependentPrimitive3DContainer() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
index 3458db1becc0..2dfc5f5789f3 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -27,7 +27,7 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfE3dPolygon : public ViewContactOfE3d
+ class ViewContactOfE3dPolygon final : public ViewContactOfE3d
{
public:
// basic constructor, used from SdrObject.
@@ -40,7 +40,6 @@ namespace sdr
return static_cast<const E3dPolygonObj&>(GetE3dObject());
}
- protected:
// This method is responsible for creating the graphical
visualisation data which is
// stored in the local primitive list. Default creates a yellow
replacement rectangle.
virtual drawinglayer::primitive3d::Primitive3DContainer
createViewIndependentPrimitive3DContainer() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
index 2b71810ac7a7..ad4262657d3e 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfE3dSphere : public ViewContactOfE3d
+ class ViewContactOfE3dSphere final : public ViewContactOfE3d
{
public:
// basic constructor, used from SdrObject.
@@ -41,7 +41,7 @@ namespace sdr
return static_cast<const E3dSphereObj&>(GetE3dObject());
}
- protected:
+ private:
// This method is responsible for creating the graphical
visualisation data which is
// stored in the local primitive list. Default creates a yellow
replacement rectangle.
virtual drawinglayer::primitive3d::Primitive3DContainer
createViewIndependentPrimitive3DContainer() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx
b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
index e24cc273af93..22083324e97a 100644
--- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
@@ -30,7 +30,7 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfGraphic : public ViewContactOfTextObj
+ class ViewContactOfGraphic final : public ViewContactOfTextObj
{
private:
// helpers for constructing various primitive visualisations in
various states
@@ -41,7 +41,6 @@ namespace sdr
const basegfx::B2DHomMatrix& rObjectMatrix,
const drawinglayer::attribute::SdrLineFillShadowTextAttribute&
rAttribute) const;
- protected:
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
@@ -65,7 +64,7 @@ namespace sdr
bool visualisationUsesPresObj() const;
bool visualisationUsesDraft() const;
- protected:
+ private:
// This method is responsible for creating the graphical
visualisation data
// ONLY based on model data
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
index 6cbca13205fa..20d9646e1006 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
@@ -28,14 +28,14 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfSdrCaptionObj : public ViewContactOfSdrRectObj
+ class ViewContactOfSdrCaptionObj final : public ViewContactOfSdrRectObj
{
public:
// basic constructor, used from SdrObject.
explicit ViewContactOfSdrCaptionObj(SdrCaptionObj& rCaptionObj);
virtual ~ViewContactOfSdrCaptionObj() override;
- protected:
+ private:
// This method is responsible for creating the graphical
visualisation data
// ONLY based on model data
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
index c6dbce55ad35..e70f64faa362 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -28,13 +28,12 @@ class Graphic;
namespace sdr { namespace contact {
-class ViewContactOfSdrOle2Obj : public ViewContactOfSdrRectObj
+class ViewContactOfSdrOle2Obj final : public ViewContactOfSdrRectObj
{
private:
// #i123539# allow local buffering of chart data (if chart)
drawinglayer::primitive2d::Primitive2DReference mxChartContent;
-protected:
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
@@ -64,7 +63,7 @@ public:
virtual basegfx::B2DRange getRange( const
drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const override;
-protected:
+private:
// This method is responsible for creating the graphical visualisation data
// ONLY based on model data, just wraps to call
createPrimitive2DSequenceWithParameters(false)
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index 3ce3d3d95272..e877b61d37a4 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -41,9 +41,8 @@ public:
const SdrPage& getPage() const;
};
-class ViewContactOfPageBackground : public ViewContactOfPageSubObject
+class ViewContactOfPageBackground final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
@@ -52,9 +51,8 @@ public:
virtual ~ViewContactOfPageBackground() override;
};
-class ViewContactOfPageShadow : public ViewContactOfPageSubObject
+class ViewContactOfPageShadow final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
@@ -63,9 +61,8 @@ public:
virtual ~ViewContactOfPageShadow() override;
};
-class ViewContactOfPageFill : public ViewContactOfPageSubObject
+class ViewContactOfPageFill final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
@@ -74,9 +71,8 @@ public:
virtual ~ViewContactOfPageFill() override;
};
-class ViewContactOfMasterPage : public ViewContactOfPageSubObject
+class ViewContactOfMasterPage final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
@@ -85,9 +81,8 @@ public:
virtual ~ViewContactOfMasterPage() override;
};
-class ViewContactOfOuterPageBorder : public ViewContactOfPageSubObject
+class ViewContactOfOuterPageBorder final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
@@ -96,9 +91,8 @@ public:
virtual ~ViewContactOfOuterPageBorder() override;
};
-class ViewContactOfInnerPageBorder : public ViewContactOfPageSubObject
+class ViewContactOfInnerPageBorder final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
@@ -114,9 +108,8 @@ public:
* view contact of the SdrObject instance associated with the identifier
* passed to the method.
*/
-class ViewContactOfPageHierarchy : public ViewContactOfPageSubObject
+class ViewContactOfPageHierarchy final : public ViewContactOfPageSubObject
{
-protected:
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer
createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
index 132ec9997380..2174462c6cf9 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfE3dScene : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfE3dScene final : public
ViewObjectContactOfSdrObj
{
- protected:
// 2d primitive creator
virtual drawinglayer::primitive2d::Primitive2DContainer
createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
index 04d8d49209c9..3dc8873bcd43 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
@@ -26,7 +26,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfGroup : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfGroup final : public ViewObjectContactOfSdrObj
{
public:
// basic constructor.
diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 7cef6d77b71e..8b30d772ea03 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -30,7 +30,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfMasterPageDescriptor : public
ViewObjectContact
+ class ViewObjectContactOfMasterPageDescriptor final : public
ViewObjectContact
{
public:
ViewObjectContactOfMasterPageDescriptor(ObjectContact&
rObjectContact, ViewContact& rViewContact);
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 76eaeaa128da..6b0b4c476262 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -34,7 +34,7 @@ namespace sdr
{
class SdrMediaWindow;
- class ViewObjectContactOfSdrMediaObj : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfSdrMediaObj final : public
ViewObjectContactOfSdrObj
{
public:
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 31d5be79f163..c88d8b98bf16 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -26,9 +26,8 @@ class SdrOle2Obj;
namespace sdr { namespace contact {
-class ViewObjectContactOfSdrOle2Obj : public ViewObjectContactOfSdrObj
+class ViewObjectContactOfSdrOle2Obj final : public ViewObjectContactOfSdrObj
{
-protected:
// This method is responsible for creating the graphical visualisation data
virtual drawinglayer::primitive2d::Primitive2DContainer
createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
index db8e0b33aed9..758b0bfb0c56 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -47,9 +47,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfPageBackground : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageBackground final : public
ViewObjectContactOfPageSubObject
{
- protected:
virtual drawinglayer::primitive2d::Primitive2DContainer
createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
public:
@@ -65,7 +64,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfMasterPage : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfMasterPage final : public
ViewObjectContactOfPageSubObject
{
protected:
public:
@@ -81,9 +80,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfPageFill : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageFill final : public
ViewObjectContactOfPageSubObject
{
- protected:
virtual drawinglayer::primitive2d::Primitive2DContainer
createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
public:
@@ -99,7 +97,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfPageShadow : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageShadow final : public
ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfPageShadow(ObjectContact& rObjectContact,
ViewContact& rViewContact);
@@ -114,7 +112,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfOuterPageBorder : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfOuterPageBorder final : public
ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact,
ViewContact& rViewContact);
@@ -129,7 +127,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfInnerPageBorder : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfInnerPageBorder final : public
ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact,
ViewContact& rViewContact);
@@ -144,7 +142,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfPageHierarchy : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageHierarchy final : public
ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact,
ViewContact& rViewContact);
@@ -159,9 +157,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfPageGrid : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageGrid final : public
ViewObjectContactOfPageSubObject
{
- protected:
virtual drawinglayer::primitive2d::Primitive2DContainer
createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
public:
@@ -177,9 +174,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfPageHelplines : public
ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageHelplines final : public
ViewObjectContactOfPageSubObject
{
- protected:
virtual drawinglayer::primitive2d::Primitive2DContainer
createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
public:
@@ -195,7 +191,7 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfSdrPage : public ViewObjectContact
+ class ViewObjectContactOfSdrPage final : public ViewObjectContact
{
public:
ViewObjectContactOfSdrPage(ObjectContact& rObjectContact,
ViewContact& rViewContact);
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index 1936afc1160a..da4f0e0741fb 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -103,7 +103,7 @@ namespace sdr { namespace contact {
ViewObjectContactOfUnoControl& operator=( const
ViewObjectContactOfUnoControl& ) = delete;
};
- class UnoControlPrintOrPreviewContact : public
ViewObjectContactOfUnoControl
+ class UnoControlPrintOrPreviewContact final : public
ViewObjectContactOfUnoControl
{
public:
UnoControlPrintOrPreviewContact( ObjectContactOfPageView&
_rObjectContact, ViewContactOfUnoControl& _rViewContact );
diff --git a/svx/inc/sdr/overlay/overlaycrosshair.hxx
b/svx/inc/sdr/overlay/overlaycrosshair.hxx
index c2db22950e86..e297f4a4fb4d 100644
--- a/svx/inc/sdr/overlay/overlaycrosshair.hxx
+++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace overlay
{
- class OverlayCrosshairStriped : public OverlayObjectWithBasePosition
+ class OverlayCrosshairStriped final : public
OverlayObjectWithBasePosition
{
- protected:
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer
createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx
b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 42e1afed720e..f03f7bd9b9bb 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -27,7 +27,7 @@ namespace sdr
{
namespace overlay
{
- class OverlayRectangle : public OverlayObjectWithBasePosition
+ class OverlayRectangle final : public OverlayObjectWithBasePosition
{
// geometric definitions
basegfx::B2DPoint const maSecondPosition;
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx
b/svx/inc/sdr/overlay/overlaytools.hxx
index 05b397845de3..e394381da758 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -26,7 +26,7 @@
namespace drawinglayer { namespace primitive2d {
-class OverlayStaticRectanglePrimitive : public
DiscreteMetricDependentPrimitive2D
+class OverlayStaticRectanglePrimitive final : public
DiscreteMetricDependentPrimitive2D
{
private:
basegfx::B2DPoint const maPosition;
@@ -40,7 +40,6 @@ private:
// the rotation of the primitive itself
double const mfRotation;
-protected:
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const
geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -68,7 +67,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class OverlayBitmapExPrimitive : public
DiscreteMetricDependentPrimitive2D
+ class OverlayBitmapExPrimitive final : public
DiscreteMetricDependentPrimitive2D
{
private:
// The BitmapEx to use, PixelSize is used
@@ -86,7 +85,6 @@ namespace drawinglayer
double const mfShearX;
double const mfRotation;
- protected:
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -120,7 +118,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class OverlayCrosshairPrimitive : public ViewportDependentPrimitive2D
+ class OverlayCrosshairPrimitive final : public
ViewportDependentPrimitive2D
{
private:
// The logic position
@@ -131,7 +129,6 @@ namespace drawinglayer
basegfx::BColor const maRGBColorB;
double const mfDiscreteDashLength;
- protected:
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -162,7 +159,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class OverlayRectanglePrimitive : public
DiscreteMetricDependentPrimitive2D
+ class OverlayRectanglePrimitive final : public
DiscreteMetricDependentPrimitive2D
{
private:
// the logic rectangle definition
@@ -179,7 +176,6 @@ namespace drawinglayer
// the rotation of the primitive itself
double const mfRotation;
- protected:
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -221,7 +217,7 @@ namespace drawinglayer
HELPLINESTYLE_HORIZONTAL
};
- class OverlayHelplineStripedPrimitive : public
ViewportDependentPrimitive2D
+ class OverlayHelplineStripedPrimitive final : public
ViewportDependentPrimitive2D
{
private:
// The logic position
@@ -235,7 +231,6 @@ namespace drawinglayer
basegfx::BColor const maRGBColorB;
double const mfDiscreteDashLength;
- protected:
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -269,7 +264,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class OverlayRollingRectanglePrimitive : public
ViewportDependentPrimitive2D
+ class OverlayRollingRectanglePrimitive final : public
ViewportDependentPrimitive2D
{
private:
// The logic range
@@ -280,7 +275,6 @@ namespace drawinglayer
basegfx::BColor const maRGBColorB;
double const mfDiscreteDashLength;
- protected:
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
public:
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index fa9d2ae9f4c9..bd235e917287 100644
--- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -33,7 +33,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrCaptionPrimitive2D : public BufferedDecompositionPrimitive2D
+ class SdrCaptionPrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
::basegfx::B2DHomMatrix const maTransform;
@@ -42,7 +42,6 @@ namespace drawinglayer
double const mfCornerRadiusX; //
[0.0..1.0] relative to 1/2 width
double const mfCornerRadiusY; //
[0.0..1.0] relative to 1/2 height
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index dab0bce74560..99970f58c9d1 100644
--- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -32,13 +32,12 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrConnectorPrimitive2D : public BufferedDecompositionPrimitive2D
+ class SdrConnectorPrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
attribute::SdrLineShadowTextAttribute const
maSdrLSTAttribute;
::basegfx::B2DPolygon const maUnitPolygon;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 837eda4361dd..ef5cd2184783 100644
--- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -38,7 +38,6 @@ namespace drawinglayer
::basegfx::B2DHomMatrix const maTransform;
attribute::SdrLineFillShadowTextAttribute const
maSdrLFSTAttribute;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -65,7 +64,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrEllipseSegmentPrimitive2D : public SdrEllipsePrimitive2D
+ class SdrEllipseSegmentPrimitive2D final : public SdrEllipsePrimitive2D
{
private:
double const mfStartAngle;
@@ -74,7 +73,6 @@ namespace drawinglayer
bool const mbCloseSegment :
1;
bool const
mbCloseUsingCenter : 1;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 38d334604fba..d60fc2c457b4 100644
--- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -33,7 +33,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrGrafPrimitive2D : public BufferedDecompositionPrimitive2D
+ class SdrGrafPrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
::basegfx::B2DHomMatrix const maTransform;
@@ -41,7 +41,6 @@ namespace drawinglayer
GraphicObject const maGraphicObject;
GraphicAttr maGraphicAttr;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index b28158895b2d..88149d811370 100644
--- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -45,7 +45,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrMeasurePrimitive2D : public BufferedDecompositionPrimitive2D
+ class SdrMeasurePrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
attribute::SdrLineShadowTextAttribute const
maSdrLSTAttribute;
@@ -72,7 +72,6 @@ namespace drawinglayer
bool bLeftActive,
bool bRightActive) const;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
index 53eec99cb9e6..13b1e1d1ec8d 100644
--- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrOle2Primitive2D : public BasePrimitive2D
+ class SdrOle2Primitive2D final : public BasePrimitive2D
{
private:
Primitive2DContainer const maOLEContent;
diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 28b0d3016bcf..a88d0c2de7ad 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrOleContentPrimitive2D : public
BufferedDecompositionPrimitive2D
+ class SdrOleContentPrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
tools::WeakReference<SdrOle2Obj> mpSdrOle2Obj;
@@ -45,7 +45,6 @@ namespace drawinglayer
// be expensive, e.g. triggering chart creation)
sal_uInt32 const mnGraphicVersion;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
index 9f7b1d0f020d..d5e28a3314c5 100644
--- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -33,7 +33,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrPathPrimitive2D : public BufferedDecompositionPrimitive2D
+ class SdrPathPrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
basegfx::B2DHomMatrix const maTransform;
@@ -51,7 +51,6 @@ namespace drawinglayer
// when applying the also given transformation (maTransform)
basegfx::B2DPolyPolygon const
maUnitDefinitionPolyPolygon;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index ea8567acdf57..19eb1978e198 100644
--- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrRectanglePrimitive2D : public BufferedDecompositionPrimitive2D
+ class SdrRectanglePrimitive2D final : public
BufferedDecompositionPrimitive2D
{
private:
basegfx::B2DHomMatrix const maTransform;
@@ -43,7 +43,6 @@ namespace drawinglayer
// flag which decides if the HitArea should be the filled geometry
bool const
mbForceFillForHitTest : 1;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index ce4c91050074..de54ba0b6d12 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -105,7 +105,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrContourTextPrimitive2D : public SdrTextPrimitive2D
+ class SdrContourTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
// unit contour polygon (scaled to [0.0 .. 1.0])
@@ -114,7 +114,6 @@ namespace drawinglayer
// complete contour polygon transform (scale, rotate, shear,
translate)
basegfx::B2DHomMatrix const maObjectTransform;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -146,7 +145,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrPathTextPrimitive2D : public SdrTextPrimitive2D
+ class SdrPathTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
// the path to use. Each paragraph will use one Polygon.
@@ -155,7 +154,6 @@ namespace drawinglayer
// the Fontwork parameters
attribute::SdrFormTextAttribute const maSdrFormTextAttribute;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -187,7 +185,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrBlockTextPrimitive2D : public SdrTextPrimitive2D
+ class SdrBlockTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
// text range transformation from unit range ([0.0 .. 1.0]) to
text range
@@ -203,7 +201,6 @@ namespace drawinglayer
bool const mbWordWrap : 1;
// for CustomShapes text layout
bool const mbClipOnBounds : 1;
// for CustomShapes text layout
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -247,7 +244,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrStretchTextPrimitive2D : public SdrTextPrimitive2D
+ class SdrStretchTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
// text range transformation from unit range ([0.0 .. 1.0]) to
text range
@@ -255,7 +252,6 @@ namespace drawinglayer
bool const mbFixedCellHeight :
1;
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -287,14 +283,13 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrAutoFitTextPrimitive2D : public SdrTextPrimitive2D
+ class SdrAutoFitTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
::basegfx::B2DHomMatrix const
maTextRangeTransform; // text range transformation from unit range ([0.0 ..
1.0]) to text range
bool const mbWordWrap : 1;
// for CustomShapes text layout
- protected:
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -325,13 +320,13 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrChainedTextPrimitive2D : public SdrTextPrimitive2D
+ class SdrChainedTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
// XXX: might have position of overflowing text
::basegfx::B2DHomMatrix const maTextRangeTransform; // text
range transformation from unit range ([0.0 .. 1.0]) to text range
- protected:
+
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer&
rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/properties/captionproperties.hxx
b/svx/inc/sdr/properties/captionproperties.hxx
index 67fd1dd77a3b..6e313daa3b92 100644
--- a/svx/inc/sdr/properties/captionproperties.hxx
+++ b/svx/inc/sdr/properties/captionproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class CaptionProperties : public RectangleProperties
+ class CaptionProperties final : public RectangleProperties
{
- protected:
// create a new itemset
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& rPool) override;
diff --git a/svx/inc/sdr/properties/circleproperties.hxx
b/svx/inc/sdr/properties/circleproperties.hxx
index a4a0cfdd7267..eb5c1980d957 100644
--- a/svx/inc/sdr/properties/circleproperties.hxx
+++ b/svx/inc/sdr/properties/circleproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class CircleProperties : public RectangleProperties
+ class CircleProperties final : public RectangleProperties
{
- protected:
// create a new itemset
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& rPool) override;
diff --git a/svx/inc/sdr/properties/connectorproperties.hxx
b/svx/inc/sdr/properties/connectorproperties.hxx
index 3ef330c31c57..f5d5c3892522 100644
--- a/svx/inc/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/sdr/properties/connectorproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class ConnectorProperties : public TextProperties
+ class ConnectorProperties final : public TextProperties
{
- protected:
// create a new itemset
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& rPool) override;
diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx
b/svx/inc/sdr/properties/customshapeproperties.hxx
index 3bd0085931c9..696243bb3585 100644
--- a/svx/inc/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/sdr/properties/customshapeproperties.hxx
@@ -27,12 +27,11 @@ namespace sdr
{
namespace properties
{
- class CustomShapeProperties : public TextProperties
+ class CustomShapeProperties final : public TextProperties
{
private:
void UpdateTextFrameStatus(bool bInvalidateRenderGeometry);
- protected:
// create a new itemset
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& rPool) override;
diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx
b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
index bbc9bf06b015..b614a9082a31 100644
--- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class E3dExtrudeProperties : public E3dCompoundProperties
+ class E3dExtrudeProperties final : public E3dCompoundProperties
{
- protected:
// Called after ItemChange() is done for all items.
virtual void PostItemChange(const sal_uInt16 nWhich) override;
diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx
b/svx/inc/sdr/properties/e3dlatheproperties.hxx
index 1de98de9a75e..8b803005208d 100644
--- a/svx/inc/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class E3dLatheProperties : public E3dCompoundProperties
+ class E3dLatheProperties final : public E3dCompoundProperties
{
- protected:
// Called after ItemChange() is done for all items.
virtual void PostItemChange(const sal_uInt16 nWhich) override;
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx
b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index e0cded4b1be3..269ecf83d020 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class E3dSceneProperties : public E3dProperties
+ class E3dSceneProperties final : public E3dProperties
{
- protected:
// Called after ItemChange() is done for all items.
virtual void PostItemChange(const sal_uInt16 nWhich) override;
diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx
b/svx/inc/sdr/properties/e3dsphereproperties.hxx
index 4af384325e44..b1ef923cb42f 100644
--- a/svx/inc/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class E3dSphereProperties : public E3dCompoundProperties
+ class E3dSphereProperties final : public E3dCompoundProperties
{
- protected:
// Called after ItemChange() is done for all items.
virtual void PostItemChange(const sal_uInt16 nWhich) override;
diff --git a/svx/inc/sdr/properties/graphicproperties.hxx
b/svx/inc/sdr/properties/graphicproperties.hxx
index d8744dcb645b..018c7643585c 100644
--- a/svx/inc/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/sdr/properties/graphicproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class GraphicProperties : public RectangleProperties
+ class GraphicProperties final : public RectangleProperties
{
- protected:
// apply the correct SfyStyleSheet from SdrObject's SdrModel
virtual void applyDefaultStyleSheetFromSdrModel() override;
diff --git a/svx/inc/sdr/properties/groupproperties.hxx
b/svx/inc/sdr/properties/groupproperties.hxx
index 1c524f61eb1e..412881708eac 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class GroupProperties : public DefaultProperties
+ class GroupProperties final : public DefaultProperties
{
- protected:
// create a new itemset
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& rPool) override;
diff --git a/svx/inc/sdr/properties/measureproperties.hxx
b/svx/inc/sdr/properties/measureproperties.hxx
index e133828e8265..70f3812e3888 100644
--- a/svx/inc/sdr/properties/measureproperties.hxx
+++ b/svx/inc/sdr/properties/measureproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class MeasureProperties : public TextProperties
+ class MeasureProperties final : public TextProperties
{
- protected:
// create a new itemset
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& rPool) override;
diff --git a/svx/inc/sdr/properties/oleproperties.hxx
b/svx/inc/sdr/properties/oleproperties.hxx
index 2aa081d6658a..49629be3dd9d 100644
--- a/svx/inc/sdr/properties/oleproperties.hxx
+++ b/svx/inc/sdr/properties/oleproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class OleProperties : public RectangleProperties
+ class OleProperties final : public RectangleProperties
{
- protected:
// apply the correct SfyStyleSheet from SdrObject's SdrModel
virtual void applyDefaultStyleSheetFromSdrModel() override;
diff --git a/svx/inc/sdr/properties/pageproperties.hxx
b/svx/inc/sdr/properties/pageproperties.hxx
index 81c389f907cc..1aab9c2f6d3c 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace properties
{
- class PageProperties : public EmptyProperties
+ class PageProperties final : public EmptyProperties
{
- protected:
// create a new object specific itemset with object specific
ranges.
virtual std::unique_ptr<SfxItemSet>
CreateObjectSpecificItemSet(SfxItemPool& pPool) override;
diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx
index 208ede07e6c7..914553c5c5e7 100644
--- a/svx/inc/sxmsitm.hxx
+++ b/svx/inc/sxmsitm.hxx
@@ -25,7 +25,7 @@
// Measure scale setting
// We do not overwrite a measure scale (UIScale), If the model already has one
set.
// Instead, we multiply them with each other.
-class SdrMeasureScaleItem: public SdrScaleItem {
+class SdrMeasureScaleItem final : public SdrScaleItem {
public:
SdrMeasureScaleItem() :
SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {}
virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override
diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx
index a658fd97c828..5c224d489951 100644
--- a/svx/inc/sxmtaitm.hxx
+++ b/svx/inc/sxmtaitm.hxx
@@ -36,7 +36,7 @@ public:
// Preferred perspective for reading text is only evaluated if
TextAutoAngle=TRUE.
// Angle in 1/100deg from viewpoint of the user.
-class SdrMeasureTextAutoAngleViewItem: public SdrAngleItem {
+class SdrMeasureTextAutoAngleViewItem final : public SdrAngleItem {
public:
SdrMeasureTextAutoAngleViewItem(long nVal=31500):
SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal) {}
virtual SdrMeasureTextAutoAngleViewItem* Clone(SfxItemPool*) const override
diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx
index 5dadbde33f8b..dde8f989cde1 100644
--- a/svx/inc/sxroaitm.hxx
+++ b/svx/inc/sxroaitm.hxx
@@ -22,7 +22,7 @@
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
-class SdrRotateAllItem: public SdrAngleItem {
+class SdrRotateAllItem final : public SdrAngleItem {
public:
SdrRotateAllItem(): SdrAngleItem(SDRATTR_ROTATEALL,0) {}
virtual SdrRotateAllItem* Clone(SfxItemPool*) const override
diff --git a/svx/inc/uiobject.hxx b/svx/inc/uiobject.hxx
index 6805e35646f6..c07b90cbf074 100644
--- a/svx/inc/uiobject.hxx
+++ b/svx/inc/uiobject.hxx
@@ -15,7 +15,7 @@
class SvxShowCharSet;
-class SvxShowCharSetUIObject : public WindowUIObject
+class SvxShowCharSetUIObject final : public WindowUIObject
{
SvxShowCharSet* mpCharSet;
@@ -27,7 +27,7 @@ public:
static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
-protected:
+private:
OUString get_name() const override;
};
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index d9b3747dfe24..af2559fa09b4 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
@@ -25,7 +25,7 @@
class SdrObject;
-class SvxUnoShapeModifyListener : public ::cppu::WeakAggImplHelper1<
css::util::XModifyListener >
+class SvxUnoShapeModifyListener final : public ::cppu::WeakAggImplHelper1<
css::util::XModifyListener >
{
SdrObject* mpObj;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
