summaryrefslogtreecommitdiff
path: root/svx/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-23 13:07:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-24 07:59:06 +0200
commitac45764b05385a51d469fda2e4bf9233904ca5a9 (patch)
tree94605a61e6933b3e8f1d0073b790645f04a51d5e /svx/inc
parentfe22bdc3b537afa8ebcb5cb057542b762c770722 (diff)
loplugin:finalclasses in svx
Change-Id: I74296e2185902498cd569ecde83905f718a41e84 Reviewed-on: https://gerrit.libreoffice.org/43715 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/inc')
-rw-r--r--svx/inc/AccessibleTableShape.hxx7
-rw-r--r--svx/inc/sdr/contact/objectcontactofpageview.hxx3
-rw-r--r--svx/inc/sdr/contact/viewcontactofgroup.hxx15
-rw-r--r--svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx3
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx15
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx15
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx15
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx15
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrpage.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx15
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofe3d.hxx3
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx4
-rw-r--r--svx/inc/sdr/overlay/overlayhandle.hxx3
-rw-r--r--svx/inc/sdr/overlay/overlayhelpline.hxx3
-rw-r--r--svx/inc/sdr/overlay/overlayline.hxx3
-rw-r--r--svx/inc/sdr/overlay/overlaymanagerbuffered.hxx3
-rw-r--r--svx/inc/sdr/overlay/overlayrollingrectangle.hxx3
-rw-r--r--svx/inc/svdibrow.hxx5
18 files changed, 57 insertions, 79 deletions
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 041457f3a6ba..7f119bcb27a8 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -47,9 +47,7 @@ namespace accessibility
css::accessibility::XAccessibleTable,
css::view::XSelectionChangeListener
> AccessibleTableShape_Base;
-/** @descr
-*/
-class AccessibleTableShape : public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
+class AccessibleTableShape final : public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
{
public:
AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo );
@@ -130,7 +128,7 @@ public:
// Get the currently active cell which is text editing
AccessibleCell* GetActiveAccessibleCell();
-protected:
+private:
virtual OUString CreateAccessibleBaseName() override;
sdr::table::SvxTableController* getTableController();
@@ -138,7 +136,6 @@ protected:
/// @throws css::lang::IndexOutOfBoundsException
void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow );
-private:
rtl::Reference< AccessibleTableShapeImpl > mxImpl;
sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
};
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index 043fed599065..3f081299e926 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -30,9 +30,8 @@ namespace sdr
{
namespace contact
{
- class ObjectContactOfPageView : public ObjectContact, public Idle
+ class ObjectContactOfPageView final : public ObjectContact, public Idle
{
- protected:
// the owner of this ObjectContactOfPageView. Set from constructor and not
// to be changed in any way.
SdrPageWindow& mrPageWindow;
diff --git a/svx/inc/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx
index 48c113dbaf20..2dafa4ae9a47 100644
--- a/svx/inc/sdr/contact/viewcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx
@@ -28,9 +28,14 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfGroup : public ViewContactOfSdrObj
+ class ViewContactOfGroup final : public ViewContactOfSdrObj
{
- protected:
+ public:
+ // basic constructor, used from SdrObject.
+ explicit ViewContactOfGroup(SdrObjGroup& rGroup);
+ virtual ~ViewContactOfGroup() override;
+
+ private:
// Create a Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something. Default is to create
// a standard ViewObjectContact containing the given ObjectContact and *this
@@ -42,12 +47,6 @@ namespace sdr
return static_cast<const SdrObjGroup&>(GetSdrObject());
}
- public:
- // basic constructor, used from SdrObject.
- explicit ViewContactOfGroup(SdrObjGroup& rGroup);
- virtual ~ViewContactOfGroup() override;
-
- protected:
// 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/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index fec21ed720d6..488fe4812ca4 100644
--- a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -32,9 +32,8 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfMasterPageDescriptor : public ViewContact
+ class ViewContactOfMasterPageDescriptor final : public ViewContact
{
- protected:
// the owner of this ViewContact. Set from constructor and not
// to be changed in any way.
sdr::MasterPageDescriptor& mrMasterPageDescriptor;
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
index d48ba3b172bb..d5b42b7e5bdd 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
@@ -28,21 +28,20 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfSdrCircObj : public ViewContactOfSdrRectObj
+ class ViewContactOfSdrCircObj final : public ViewContactOfSdrRectObj
{
- protected:
+ public:
+ // basic constructor, used from SdrObject.
+ explicit ViewContactOfSdrCircObj(SdrCircObj& rCircObj);
+ virtual ~ViewContactOfSdrCircObj() override;
+
+ private:
// internal access to SdrCircObj
const SdrCircObj& GetCircObj() const
{
return static_cast<const SdrCircObj&>(GetSdrObject());
}
- public:
- // basic constructor, used from SdrObject.
- explicit ViewContactOfSdrCircObj(SdrCircObj& rCircObj);
- virtual ~ViewContactOfSdrCircObj() override;
-
- protected:
// 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/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
index 89b72ef1f3b6..a8ad594019ab 100644
--- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
@@ -28,21 +28,20 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfSdrEdgeObj : public ViewContactOfTextObj
+ class ViewContactOfSdrEdgeObj final : public ViewContactOfTextObj
{
- protected:
+ public:
+ // basic constructor, used from SdrObject.
+ explicit ViewContactOfSdrEdgeObj(SdrEdgeObj& rEdgeObj);
+ virtual ~ViewContactOfSdrEdgeObj() override;
+
+ private:
// internal access to SdrEdgeObj
const SdrEdgeObj& GetEdgeObj() const
{
return static_cast<const SdrEdgeObj&>(GetSdrObject());
}
- public:
- // basic constructor, used from SdrObject.
- explicit ViewContactOfSdrEdgeObj(SdrEdgeObj& rEdgeObj);
- virtual ~ViewContactOfSdrEdgeObj() override;
-
- protected:
// 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/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 2b5dd31c2eac..f0c351c45672 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
@@ -28,21 +28,20 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfSdrMeasureObj : public ViewContactOfTextObj
+ class ViewContactOfSdrMeasureObj final : public ViewContactOfTextObj
{
- protected:
+ public:
+ // basic constructor, used from SdrObject.
+ explicit ViewContactOfSdrMeasureObj(SdrMeasureObj& rMeasureObj);
+ virtual ~ViewContactOfSdrMeasureObj() override;
+
+ private:
// internal access to SdrMeasureObj
const SdrMeasureObj& GetMeasureObj() const
{
return static_cast<const SdrMeasureObj&>(GetSdrObject());
}
- public:
- // basic constructor, used from SdrObject.
- explicit ViewContactOfSdrMeasureObj(SdrMeasureObj& rMeasureObj);
- virtual ~ViewContactOfSdrMeasureObj() override;
-
- protected:
// 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/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 35d9db98b340..acaf4c1b8fce 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
@@ -28,9 +28,14 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfSdrObjCustomShape : public ViewContactOfTextObj
+ class ViewContactOfSdrObjCustomShape final : public ViewContactOfTextObj
{
- protected:
+ public:
+ // basic constructor, used from SdrObject.
+ explicit ViewContactOfSdrObjCustomShape(SdrObjCustomShape& rCustomShape);
+ virtual ~ViewContactOfSdrObjCustomShape() override;
+
+ private:
// internal access to SdrObjCustomShape
const SdrObjCustomShape& GetCustomShapeObj() const
{
@@ -40,12 +45,6 @@ namespace sdr
// #i101684# internal tooling
basegfx::B2DRange getCorrectedTextBoundRect() const;
- public:
- // basic constructor, used from SdrObject.
- explicit ViewContactOfSdrObjCustomShape(SdrObjCustomShape& rCustomShape);
- virtual ~ViewContactOfSdrObjCustomShape() override;
-
- protected:
// 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/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index 2342b78aae84..0021148bc56c 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -129,9 +129,8 @@ public:
virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override;
};
-class ViewContactOfGrid : public ViewContactOfPageSubObject
+class ViewContactOfGrid final : public ViewContactOfPageSubObject
{
-protected:
bool mbFront : 1;
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
@@ -144,9 +143,8 @@ public:
bool getFront() const { return mbFront; }
};
-class ViewContactOfHelplines : public ViewContactOfPageSubObject
+class ViewContactOfHelplines final : public ViewContactOfPageSubObject
{
-protected:
bool mbFront : 1;
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
index bda545795f76..bbb7d264704f 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
@@ -28,21 +28,20 @@ namespace sdr
{
namespace contact
{
- class ViewContactOfSdrPathObj : public ViewContactOfTextObj
+ class ViewContactOfSdrPathObj final : public ViewContactOfTextObj
{
- protected:
+ public:
+ // basic constructor, used from SdrObject.
+ explicit ViewContactOfSdrPathObj(SdrPathObj& rTextObj);
+ virtual ~ViewContactOfSdrPathObj() override;
+
+ private:
// internal access to SdrPathObj
const SdrPathObj& GetPathObj() const
{
return static_cast<const SdrPathObj&>(GetSdrObject());
}
- public:
- // basic constructor, used from SdrObject.
- explicit ViewContactOfSdrPathObj(SdrPathObj& rTextObj);
- virtual ~ViewContactOfSdrPathObj() override;
-
- protected:
// 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/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
index 957b2665b2a7..9a50c59fa7d1 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
@@ -31,9 +31,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfE3d : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfE3d final : public ViewObjectContactOfSdrObj
{
- protected:
// Primitive3D sequence of the ViewContact. This contains all necessary information
// for the graphical visualisation and needs to be supported by all VCs which
// can be visualized.
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
index 4ea4ed8e82c3..40c57cb0eacd 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
@@ -33,9 +33,8 @@ namespace sdr
{
namespace contact
{
- class ViewObjectContactOfGraphic : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfGraphic final : public ViewObjectContactOfSdrObj
{
- private:
// allow async loading event helper to call tooling methods
friend class sdr::event::AsynchGraphicLoadingEvent;
@@ -50,7 +49,6 @@ namespace sdr
void doAsynchGraphicLoading();
void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent const * pEvent);
- protected:
const SdrGrafObj& getSdrGrafObj() const;
SdrGrafObj& getSdrGrafObj();
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx
index 3f76836f8577..ec7f89b47785 100644
--- a/svx/inc/sdr/overlay/overlayhandle.hxx
+++ b/svx/inc/sdr/overlay/overlayhandle.hxx
@@ -17,9 +17,8 @@
namespace sdr { namespace overlay {
-class SVX_DLLPUBLIC OverlayHandle : public OverlayObjectWithBasePosition
+class SVX_DLLPUBLIC OverlayHandle final : public OverlayObjectWithBasePosition
{
-protected:
basegfx::B2DSize maSize;
Color maStrokeColor;
diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx
index 47783121f142..84077f10367d 100644
--- a/svx/inc/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/sdr/overlay/overlayhelpline.hxx
@@ -28,9 +28,8 @@ namespace sdr
{
namespace overlay
{
- class OverlayHelplineStriped : public OverlayObjectWithBasePosition
+ class OverlayHelplineStriped final : public OverlayObjectWithBasePosition
{
- protected:
// remember HelpLineKind
SdrHelpLineKind meKind;
diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx
index ba5acb35504d..33ec22c0e25d 100644
--- a/svx/inc/sdr/overlay/overlayline.hxx
+++ b/svx/inc/sdr/overlay/overlayline.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace overlay
{
- class OverlayLineStriped : public OverlayObjectWithBasePosition
+ class OverlayLineStriped final : public OverlayObjectWithBasePosition
{
- protected:
// second position in pixel
basegfx::B2DPoint maSecondPosition;
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 0ca7953f0810..0810927a965e 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -30,9 +30,8 @@ namespace sdr
{
namespace overlay
{
- class OverlayManagerBuffered : public OverlayManager
+ class OverlayManagerBuffered final : public OverlayManager
{
- protected:
// The VirtualDevice for draw window content buffering, this
// is the view content without overlay
ScopedVclPtr<VirtualDevice> mpBufferDevice;
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index d00598f30a02..7a18f1cb4b8f 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -27,9 +27,8 @@ namespace sdr
{
namespace overlay
{
- class OverlayRollingRectangleStriped : public OverlayObjectWithBasePosition
+ class OverlayRollingRectangleStriped final : public OverlayObjectWithBasePosition
{
- protected:
// second position in pixel
basegfx::B2DPoint maSecondPosition;
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index c97671e2ffbe..a9cea4f085a9 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -30,7 +30,7 @@ class SfxItemSet;
class ImpItemListRow;
class BrowserMouseEvent;
-class SdrItemBrowserControl: public BrowseBox
+class SdrItemBrowserControl final : public BrowseBox
{
friend class ImpItemEdit;
std::vector<std::unique_ptr<ImpItemListRow>> aList;
@@ -46,7 +46,6 @@ friend class ImpItemEdit;
bool bDontHideIneffectiveItems;
bool bDontSortItems;
-private:
void ImpCtor();
void ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum);
void ImpSaveWhich();
@@ -54,7 +53,6 @@ private:
std::size_t GetCurrentPos() const;
bool BeginChangeEntry(std::size_t nPos);
-protected:
virtual long GetRowCount() const override;
virtual bool SeekRow(long nRow) override;
virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override;
@@ -64,6 +62,7 @@ protected:
void SetDirty(); // is called for example in mode switches
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
+
public:
SdrItemBrowserControl(vcl::Window* pParent);
virtual ~SdrItemBrowserControl() override;