summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-25 15:53:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-26 08:47:11 +0200
commitb4e235a925b5c73a2220f57cdb8b85379fb3bac1 (patch)
tree224ab0d69c63b1843808f6eb44a6326bcad8db4c /sd/source/ui
parentcb151051d79a7ec176e769a33a56e7d906fc1425 (diff)
loplugin:finalclasses in sd
Change-Id: I0947aa295ba1859ebc1e7ce9ce2e621f02d399ce Reviewed-on: https://gerrit.libreoffice.org/43846 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/animations/motionpathtag.hxx5
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx5
-rw-r--r--sd/source/ui/inc/AccessibleDrawDocumentView.hxx8
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx6
-rw-r--r--sd/source/ui/inc/AccessibleViewForwarder.hxx5
-rw-r--r--sd/source/ui/inc/BezierObjectBar.hxx12
-rw-r--r--sd/source/ui/inc/DrawController.hxx5
-rw-r--r--sd/source/ui/inc/GraphicObjectBar.hxx12
-rw-r--r--sd/source/ui/inc/GraphicViewShell.hxx12
-rw-r--r--sd/source/ui/inc/LayerTabBar.hxx4
-rw-r--r--sd/source/ui/inc/MediaObjectBar.hxx13
-rw-r--r--sd/source/ui/inc/Ruler.hxx5
-rw-r--r--sd/source/ui/inc/SdUnoDrawView.hxx20
-rw-r--r--sd/source/ui/inc/TabControl.hxx11
-rw-r--r--sd/source/ui/inc/docprev.hxx3
-rw-r--r--sd/source/ui/inc/fuconarc.hxx4
-rw-r--r--sd/source/ui/inc/fuconbez.hxx7
-rw-r--r--sd/source/ui/inc/fuconcs.hxx5
-rw-r--r--sd/source/ui/inc/fuconrec.hxx4
-rw-r--r--sd/source/ui/inc/fuconuno.hxx8
-rw-r--r--sd/source/ui/inc/fudspord.hxx5
-rw-r--r--sd/source/ui/inc/fuediglu.hxx7
-rw-r--r--sd/source/ui/inc/fuhhconv.hxx5
-rw-r--r--sd/source/ui/inc/fuoltext.hxx4
-rw-r--r--sd/source/ui/inc/fusearch.hxx5
-rw-r--r--sd/source/ui/inc/fusel.hxx6
-rw-r--r--sd/source/ui/inc/fuzoom.hxx5
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx7
-rw-r--r--sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx4
-rw-r--r--sd/source/ui/inc/unosrch.hxx3
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.hxx5
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx5
-rw-r--r--sd/source/ui/table/tableobjectbar.hxx13
-rw-r--r--sd/source/ui/unoidl/unopback.hxx3
35 files changed, 99 insertions, 136 deletions
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index 2d2933bb2aa1..54ba50d03617 100644
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -35,7 +35,7 @@ class View;
class CustomAnimationPane;
/// Base class for all functions.
-class MotionPathTag : public SmartTag, public IPolyPolygonEditorController, public SfxListener, public css::util::XChangesListener
+class MotionPathTag final : public SmartTag, public IPolyPolygonEditorController, public SfxListener, public css::util::XChangesListener
{
public:
MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect );
@@ -91,7 +91,7 @@ public:
virtual void SAL_CALL acquire( ) throw () override;
virtual void SAL_CALL release( ) throw () override;
-protected:
+private:
virtual void addCustomHandles( SdrHdlList& rHandlerList ) override;
virtual bool getContext( SdrViewContext& rContext ) override;
virtual void disposing() override;
@@ -100,7 +100,6 @@ protected:
void updatePathAttributes();
void selectionChanged();
-private:
CustomAnimationPane& mrPane;
CustomAnimationEffectPtr mpEffect;
::basegfx::B2DPolyPolygon mxPolyPoly;
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 53f9cbf73613..9be1541bf988 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -31,7 +31,7 @@ class View;
class AnnotationManagerImpl;
class AnnotationWindow;
-class AnnotationTag : public SmartTag
+class AnnotationTag final : public SmartTag
{
public:
AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const css::uno::Reference< css::office::XAnnotation >& xAnnotation, Color const & rColor, int nIndex, const vcl::Font& rFont );
@@ -66,7 +66,7 @@ public:
void OpenPopup( bool bEdit );
void ClosePopup();
-protected:
+private:
virtual void addCustomHandles( SdrHdlList& rHandlerList ) override;
virtual bool getContext( SdrViewContext& rContext ) override;
virtual void disposing() override;
@@ -76,7 +76,6 @@ protected:
DECL_LINK( WindowEventHandler, VclWindowEvent&, void );
DECL_LINK( ClosePopupHdl, void*, void );
-private:
AnnotationManagerImpl& mrManager;
css::uno::Reference< css::office::XAnnotation > mxAnnotation;
VclPtr<AnnotationWindow> mpAnnotationWindow;
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index 1408d90d3ac0..ecde467c37ae 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -34,7 +34,7 @@ namespace accessibility {
Please see the documentation of the base class for further
explanations of the individual methods.
*/
-class AccessibleDrawDocumentView :
+class AccessibleDrawDocumentView final :
public AccessibleDocumentViewBase
,public css::accessibility::XAccessibleGroupPosition
{
@@ -94,7 +94,7 @@ public:
getGroupPosition( const css::uno::Any& rAny ) override;
virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) override;
-protected:
+private:
//===== XServiceInfo ====================================================
@@ -122,10 +122,9 @@ protected:
*/
virtual void
implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override;
-private:
+
::sd::ViewShell* mpSdViewSh;
-protected:
/** This object manages the shapes of the represented draw page. It is
responsible to determine the visible shapes and create on demand the
accessible objects representing them.
@@ -168,7 +167,6 @@ protected:
css::uno::Reference< css::accessibility::XAccessible >
GetSelAccContextInTable();
-private:
void UpdateAccessibleName();
};
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index bcaadb755557..7972ad684df3 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -34,7 +34,7 @@ namespace accessibility {
wrapper around the AccessibleTextHelper class; as basically the
Outline View is a big Outliner.
*/
-class AccessibleOutlineView
+class AccessibleOutlineView final
: public AccessibleDocumentViewBase
{
public:
@@ -89,7 +89,7 @@ public:
virtual void SAL_CALL
propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override;
-protected:
+private:
// overridden to detect focus changes
virtual void Activated() override;
@@ -113,8 +113,6 @@ protected:
virtual OUString
CreateAccessibleDescription () override;
-private:
-
/// Invalidate text helper, updates visible children
void UpdateChildren();
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index de378a61670b..4a32cdd6be8d 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -38,7 +38,7 @@ namespace accessibility {
different transformations between internal and screen coordinates or
change the validity of the forwarder have to be signaled separately.
*/
-class AccessibleViewForwarder
+class AccessibleViewForwarder final
: public IAccessibleViewForwarder
{
public:
@@ -81,11 +81,10 @@ public:
*/
virtual Size LogicToPixel (const Size& rSize) const override;
-protected:
+private:
SdrPaintView* mpView;
sal_uInt16 mnWindowId;
-private:
AccessibleViewForwarder (AccessibleViewForwarder&) = delete;
AccessibleViewForwarder& operator= (AccessibleViewForwarder&) = delete;
};
diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx
index 4e025dd0f490..d6aab2bf9747 100644
--- a/sd/source/ui/inc/BezierObjectBar.hxx
+++ b/sd/source/ui/inc/BezierObjectBar.hxx
@@ -29,24 +29,22 @@ namespace sd {
class View;
class ViewShell;
-class BezierObjectBar
+class BezierObjectBar final
: public SfxShell
{
public:
SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR)
-private:
- /// SfxInterface initializer.
- static void InitInterface_Impl();
-
-public:
BezierObjectBar(ViewShell* pSdViewShell, View* pSdView);
virtual ~BezierObjectBar() override;
void GetAttrState(SfxItemSet& rSet);
void Execute(SfxRequest &rReq);
-protected:
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
View* mpView;
ViewShell* mpViewSh;
};
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 98d932e47e1f..7eb8d2c0fe79 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -74,7 +74,7 @@ class ViewShell;
The implementation of the XControllerManager interface is not yet in its
final form.
*/
-class DrawController
+class DrawController final
: public DrawControllerInterfaceBase,
private BroadcastHelperOwner,
public ::cppu::OPropertySetHelper
@@ -226,7 +226,7 @@ public:
virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override;
-protected:
+private:
/** This method must return the name to index table. This table
contains all property names and types of this object.
*/
@@ -280,7 +280,6 @@ protected:
using cppu::OPropertySetHelper::disposing;
using cppu::OPropertySetHelper::getFastPropertyValue;
-private:
const css::uno::Type m_aSelectionTypeIdentifier;
/** This pointer to the ViewShellBase can be NULL (after a call to
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index 37b1852b6c34..76c560c49224 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -29,17 +29,12 @@ namespace sd {
class View;
class ViewShell;
-class GraphicObjectBar
+class GraphicObjectBar final
: public SfxShell
{
public:
SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR )
-private:
- /// SfxInterface initializer.
- static void InitInterface_Impl();
-
-public:
GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
virtual ~GraphicObjectBar() override;
@@ -49,7 +44,10 @@ public:
void GetFilterState( SfxItemSet& rSet );
void ExecuteFilter( SfxRequest const & rReq );
-protected:
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
::sd::View* mpView;
ViewShell* mpViewSh;
};
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index 34b858df94b8..aea154e7059f 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -35,7 +35,7 @@ namespace sd {
ViewShell that turns off some of the features for GraphicViewShell
instances.</p>
*/
-class GraphicViewShell
+class GraphicViewShell final
: public DrawViewShell
{
public:
@@ -43,11 +43,6 @@ public:
SFX_DECL_VIEWFACTORY(GraphicViewShell);
SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL)
-private:
- /// SfxInterface initializer.
- static void InitInterface_Impl();
-
-public:
/** Create a new view shell for the Draw application.
@param rViewShellBase
The new object will be stacked on this view shell base.
@@ -66,7 +61,10 @@ public:
*/
virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive) override;
-protected:
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
void ConstructGraphicViewShell();
virtual void ArrangeGUIElements() override;
};
diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx
index b373a6fcb594..496f3e9b7865 100644
--- a/sd/source/ui/inc/LayerTabBar.hxx
+++ b/sd/source/ui/inc/LayerTabBar.hxx
@@ -30,7 +30,7 @@ namespace sd {
*/
class DrawViewShell;
-class LayerTabBar
+class LayerTabBar final
: public TabBar,
public DropTargetHelper
{
@@ -53,7 +53,7 @@ public:
*/
void SendDeactivatePageEvent();
-protected:
+private:
DrawViewShell* pDrViewSh;
// TabBar
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index c46e0b2fbd4f..70d42b6ea19d 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -29,25 +29,22 @@ namespace sd {
class View;
class ViewShell;
-class MediaObjectBar
+class MediaObjectBar final
: public SfxShell
{
public:
SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR )
-private:
- /// SfxInterface initializer.
- static void InitInterface_Impl();
-
-public:
-
MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
virtual ~MediaObjectBar() override;
void GetState( SfxItemSet& rSet );
void Execute( SfxRequest const & rReq );
-protected:
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
::sd::View* mpView;
ViewShell* mpViewSh;
};
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx
index 0624a750e62a..56cb4c930196 100644
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@ -29,7 +29,7 @@ class RulerCtrlItem;
class View;
class Window;
-class Ruler
+class Ruler final
: public SvxRuler
{
public:
@@ -48,7 +48,8 @@ public:
bool IsHorizontal() const { return bHorz; }
using ::Ruler::SetNullOffset;
-protected:
+
+private:
DrawViewShell* pDrViewShell;
RulerCtrlItem* pCtrlItem;
bool bHorz;
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 8e9e2b927a35..eadc506bedd1 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -36,7 +36,7 @@ class DrawViewShell;
/** This class implements the DrawViewShell specific part of the controller.
*/
-class SdUnoDrawView
+class SdUnoDrawView final
: private cppu::BaseMutex,
public DrawSubControllerInterfaceBase
{
@@ -80,19 +80,18 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
-protected:
- bool getMasterPageMode() const throw();
- void setMasterPageMode(bool MasterPageMode_) throw();
- bool getLayerMode() const throw();
- void setLayerMode(bool LayerMode_) throw();
-public:
/** Return a reference to the active layer object.
@return
The returned value may be empty when the internal state of this
view is not valid (like during destruction.)
*/
css::uno::Reference< css::drawing::XLayer> getActiveLayer() throw ();
-protected:
+
+private:
+ bool getMasterPageMode() const throw();
+ void setMasterPageMode(bool MasterPageMode_) throw();
+ bool getLayerMode() const throw();
+ void setLayerMode(bool LayerMode_) throw();
/** Make the specified object the active layer.
@param rxLayer
The new layer object.
@@ -110,11 +109,10 @@ protected:
css::uno::Any getDrawViewMode() const;
-private:
+ SdXImpressDocument* GetModel() const throw();
+
DrawViewShell& mrDrawViewShell;
sd::View& mrView;
-
- SdXImpressDocument* GetModel() const throw();
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx
index e72e1a2fe100..32ccc6741a7a 100644
--- a/sd/source/ui/inc/TabControl.hxx
+++ b/sd/source/ui/inc/TabControl.hxx
@@ -31,13 +31,11 @@ namespace sd {
class DrawViewShell;
-class TabControl
+class TabControl final
: public TabBar,
public DragSourceHelper,
public DropTargetHelper
{
- //declare bIsMarked variable
- sal_uInt16 RrePageID;
public:
TabControl (DrawViewShell* pDrViewSh, vcl::Window* pParent);
virtual void dispose() override;
@@ -55,8 +53,9 @@ public:
*/
void SendDeactivatePageEvent();
-protected:
- DrawViewShell* pDrViewSh;
+private:
+ sal_uInt16 RrePageID;
+ DrawViewShell* pDrViewSh;
bool bInternalMove;
// TabBar
@@ -80,7 +79,6 @@ protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
-private:
// nested class to implement the TransferableHelper
class TabControlTransferable : public TransferableHelper
{
@@ -103,7 +101,6 @@ private:
void DragFinished();
-private:
using TabBar::StartDrag;
};
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index cdfdd5297337..8f0a28dad280 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -35,9 +35,8 @@ namespace sd {
class SlideShow;
}
-class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener
+class SD_DLLPUBLIC SdDocPreviewWin final : public Control, public SfxListener
{
-protected:
Color maDocumentColor;
rtl::Reference< sd::SlideShow > mxSlideShow;
diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx
index 4a2f1239b2ac..828bdea99234 100644
--- a/sd/source/ui/inc/fuconarc.hxx
+++ b/sd/source/ui/inc/fuconarc.hxx
@@ -24,7 +24,7 @@
namespace sd {
-class FuConstructArc
+class FuConstructArc final
: public FuConstruct
{
public:
@@ -40,7 +40,7 @@ public:
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const ::tools::Rectangle& rRectangle) override;
-protected:
+private:
FuConstructArc (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index ebf9bc32e00f..8bb42e88da86 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -27,7 +27,7 @@ class SdDrawDocument;
namespace sd {
-class FuConstructBezierPolygon
+class FuConstructBezierPolygon final
: public FuConstruct
{
public:
@@ -49,7 +49,7 @@ public:
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const ::tools::Rectangle& rRectangle) override;
-protected:
+private:
FuConstructBezierPolygon (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -57,8 +57,7 @@ protected:
SdDrawDocument* pDoc,
SfxRequest& rReq);
- sal_uInt16 nEditMode;
-
+ sal_uInt16 nEditMode;
css::uno::Any maTargets; // used for creating a path for custom animations
};
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index a9928e060b0d..0d54581fecf0 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -28,7 +28,7 @@ class SdrObject;
namespace sd {
-class FuConstructCustomShape
+class FuConstructCustomShape final
: public FuConstruct
{
public:
@@ -50,7 +50,7 @@ public:
// #i33136#
virtual bool doConstructOrthogonal() const override;
-protected:
+private:
FuConstructCustomShape (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -58,7 +58,6 @@ protected:
SdDrawDocument* pDoc,
SfxRequest& rReq);
-private:
OUString aCustomShape;
};
diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx
index 4402599851e2..02a3478c55dd 100644
--- a/sd/source/ui/inc/fuconrec.hxx
+++ b/sd/source/ui/inc/fuconrec.hxx
@@ -32,7 +32,7 @@ namespace sd {
/**
* draw rectangle
*/
-class FuConstructRectangle
+class FuConstructRectangle final
: public FuConstruct
{
public:
@@ -52,7 +52,7 @@ public:
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const ::tools::Rectangle& rRectangle) override;
-protected:
+private:
FuConstructRectangle (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index 6c7a2862721a..fa337df75d71 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -30,7 +30,7 @@ namespace sd {
/**
* draw control
*/
-class FuConstructUnoControl
+class FuConstructUnoControl final
: public FuConstruct
{
public:
@@ -47,7 +47,7 @@ public:
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const ::tools::Rectangle& rRectangle) override;
-protected:
+private:
FuConstructUnoControl(
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -55,9 +55,7 @@ protected:
SdDrawDocument* pDoc,
SfxRequest& rReq);
- OUString aOldLayer;
-
-private:
+ OUString aOldLayer;
SdrInventor nInventor;
sal_uInt16 nIdentifier;
};
diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx
index 0b73be462ef2..65ae23b86a71 100644
--- a/sd/source/ui/inc/fudspord.hxx
+++ b/sd/source/ui/inc/fudspord.hxx
@@ -28,7 +28,7 @@ class SdrObject;
namespace sd {
-class FuDisplayOrder
+class FuDisplayOrder final
: public FuPoor
{
public:
@@ -43,7 +43,7 @@ public:
virtual void Activate() override;
virtual void Deactivate() override;
-protected:
+private:
virtual ~FuDisplayOrder() override;
void implClearOverlay();
@@ -51,7 +51,6 @@ protected:
SdrObject* mpRefObj;
SdrDropMarkerOverlay* mpOverlay;
-private:
FuDisplayOrder (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 3abdd8a300fb..d373598efc71 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -24,7 +24,7 @@
namespace sd {
-class FuEditGluePoints
+class FuEditGluePoints final
: public FuDraw
{
public:
@@ -46,10 +46,11 @@ public:
//Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
//and SHIFT+ENTER key to decide the position and draw the new insert point
virtual void ForcePointer(const MouseEvent* pMEvt = nullptr) override;
+
private:
- bool bBeginInsertPoint;
+ bool bBeginInsertPoint;
Point oldPoint;
-protected:
+
FuEditGluePoints (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx
index 44a9cdc15870..80a8e2d4f961 100644
--- a/sd/source/ui/inc/fuhhconv.hxx
+++ b/sd/source/ui/inc/fuhhconv.hxx
@@ -26,7 +26,7 @@ class SdOutliner;
namespace sd {
-class FuHangulHanjaConversion : public FuPoor
+class FuHangulHanjaConversion final : public FuPoor
{
public:
@@ -39,13 +39,12 @@ public:
void ConvertStyles( LanguageType nTargetLanguage, const vcl::Font *pTargetFont );
-protected:
+private:
virtual ~FuHangulHanjaConversion() override;
SdOutliner* pSdOutliner;
bool bOwnOutliner;
-private:
FuHangulHanjaConversion (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx
index 3c9d6de44cf7..37742eeb6ab6 100644
--- a/sd/source/ui/inc/fuoltext.hxx
+++ b/sd/source/ui/inc/fuoltext.hxx
@@ -37,7 +37,7 @@ class OutlineViewShell;
/**
* text functions in outline mode
*/
-class FuOutlineText
+class FuOutlineText final
: public FuPoor
{
public:
@@ -62,7 +62,7 @@ public:
*/
void UpdateForKeyPress (const KeyEvent& rEvent);
-protected:
+private:
FuOutlineText (
ViewShell* pViewShell,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx
index 1c1b4dee39d8..98351a25734b 100644
--- a/sd/source/ui/inc/fusearch.hxx
+++ b/sd/source/ui/inc/fusearch.hxx
@@ -27,7 +27,7 @@ class SdOutliner;
namespace sd {
-class FuSearch : public FuPoor
+class FuSearch final : public FuPoor
{
public:
@@ -36,13 +36,12 @@ public:
void SearchAndReplace( const SvxSearchItem* pSearchItem );
-protected:
+private:
virtual ~FuSearch() override;
SdOutliner* pSdOutliner;
bool bOwnOutliner;
-private:
FuSearch (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 3ad084b475e8..10904a9cd892 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -29,7 +29,7 @@ class SdrObject;
namespace sd {
-class FuSelection
+class FuSelection final
: public FuDraw
{
public:
@@ -62,7 +62,8 @@ public:
//let mouse cursor move
virtual void ForcePointer(const MouseEvent* pMEvt = nullptr) override;
-protected:
+
+private:
FuSelection (ViewShell* pViewSh,
::sd::Window* pWin,
::sd::View* pView,
@@ -79,7 +80,6 @@ protected:
sal_uInt16 nEditMode;
css::uno::Reference< css::media::XPlayer > mxPlayer;
-private:
/** This pointer stores a canidate for assigning a style in the water
can mode between mouse button down and mouse button up.
*/
diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx
index 4b968d16c59e..1dfefb204735 100644
--- a/sd/source/ui/inc/fuzoom.hxx
+++ b/sd/source/ui/inc/fuzoom.hxx
@@ -27,7 +27,7 @@ namespace sd {
extern const sal_uInt16 SidArrayZoom[];
-class FuZoom
+class FuZoom final
: public FuPoor
{
public:
@@ -42,7 +42,7 @@ public:
virtual void Activate() override; ///< activates the function
virtual void Deactivate() override; ///< deactivates the function
-protected:
+private:
virtual ~FuZoom() override;
Point aBeginPosPix;
@@ -53,7 +53,6 @@ protected:
bool bStartDrag;
Pointer aPtr;
-private:
FuZoom (
ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 0cbe35df96e7..6f9887ecd40e 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -57,16 +57,15 @@ namespace svt {
/**
* Effect-Tab-Dialog
*/
-class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox
+class SD_DLLPUBLIC SdPageObjsTLB final : public SvTreeListBox
{
-private:
-
static bool SAL_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag
// set contenttree in SdNavigatorWin
bool bisInSdNavigatorWin;
::std::unique_ptr< ::svt::AcceleratorExecute> m_pAccel;
+
public:
// nested class to implement the TransferableHelper
@@ -121,7 +120,7 @@ public:
*/
bool PageBelongsToCurrentShow (const SdPage* pPage) const;
-protected:
+private:
VclPtr<vcl::Window> mpParent;
const SdDrawDocument* mpDoc;
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 66c28fdeb2be..f75023e74966 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -54,7 +54,7 @@ public:
it to destroy the resource when the sd module is at the end of its
lifetime.
*/
-class SdGlobalResourceContainer
+class SdGlobalResourceContainer final
{
public:
static SdGlobalResourceContainer& Instance();
@@ -81,7 +81,7 @@ public:
*/
void AddResource (const css::uno::Reference<css::uno::XInterface>& rxResource);
-protected:
+private:
friend class SdGlobalResourceContainerInstance;
friend struct ::std::default_delete<SdGlobalResourceContainer>;
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index f7b7921c0e34..4945366e01a8 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -118,9 +118,8 @@ public:
/** this class holds a sequence that is a result from a find all and
lets people access it through the XIndexAccess Interface. */
-class SdUnoFindAllAccess : public ::cppu::WeakImplHelper< css::container::XIndexAccess > // public css::container::XElementAccess
+class SdUnoFindAllAccess final : public ::cppu::WeakImplHelper< css::container::XIndexAccess > // public css::container::XElementAccess
{
-protected:
css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > maSequence;
public:
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 44cff1de9e88..923e2ab569bd 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -26,7 +26,7 @@ namespace sd { namespace sidebar {
/** Show the recently used master pages (that are not currently used).
*/
-class RecentMasterPagesSelector
+class RecentMasterPagesSelector final
: public MasterPagesSelector
{
friend class VclPtrInstance<RecentMasterPagesSelector>;
@@ -36,7 +36,7 @@ public:
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
-protected:
+private:
DECL_LINK(MasterPageListListener, LinkParamNone*, void);
virtual void Fill (ItemList& rItemList) override;
@@ -58,7 +58,6 @@ protected:
virtual void ProcessPopupMenu (Menu& rMenu) override;
-private:
RecentMasterPagesSelector (
vcl::Window* pParent,
SdDrawDocument& rDocument,
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index d330accb58c4..c92b170c3bf4 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -96,7 +96,7 @@ struct WrappedMouseMotionEvent : public css::lang::EventObject
// SlideShowViewListeners
typedef std::vector< css::uno::WeakReference< css::util::XModifyListener > > ViewListenerVector;
-class SlideShowViewListeners
+class SlideShowViewListeners final
{
public:
SlideShowViewListeners( ::osl::Mutex& rMutex );
@@ -107,7 +107,7 @@ public:
void notify( const css::lang::EventObject& _rEvent );
void disposing( const css::lang::EventObject& _rEventSource );
-protected:
+private:
ViewListenerVector maListeners;
::osl::Mutex& mrMutex;
};
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index ddd54035eb93..998837c0409b 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -35,7 +35,7 @@ namespace sd { namespace slidesorter { namespace controller {
class SlideSorterController;
-class SelectionFunction
+class SelectionFunction final
: public FuPoor
{
public:
@@ -97,7 +97,7 @@ public:
*/
void ResetMouseAnchor();
-protected:
+private:
SlideSorter& mrSlideSorter;
SlideSorterController& mrController;
@@ -107,7 +107,6 @@ protected:
virtual ~SelectionFunction() override;
-private:
/** Remember the slide where the shift key was pressed and started a
multiselection via keyboard.
*/
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index dcc66b846494..32aa85f0e675 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -33,17 +33,11 @@ class ViewShell;
namespace sd { namespace ui { namespace table {
-class TableObjectBar : public SfxShell
+class TableObjectBar final : public SfxShell
{
public:
SFX_DECL_INTERFACE( SD_IF_SDDRAWTABLEOBJECTBAR )
-private:
- /// SfxInterface initializer.
- static void InitInterface_Impl();
-
-public:
-
TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView);
virtual ~TableObjectBar() override;
@@ -51,7 +45,10 @@ public:
void GetAttrState( SfxItemSet& rSet );
void Execute( SfxRequest& rReq );
-protected:
+private:
+ /// SfxInterface initializer.
+ static void InitInterface_Impl();
+
::sd::View* mpView;
::sd::ViewShell* mpViewSh;
};
diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx
index 0c611f472ace..642ceee2ef0f 100644
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@@ -39,14 +39,13 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet();
class SdDrawDocument;
class SfxItemSet;
-class SdUnoPageBackground : public ::cppu::WeakImplHelper<
+class SdUnoPageBackground final : public ::cppu::WeakImplHelper<
css::beans::XPropertySet,
css::lang::XServiceInfo,
css::beans::XPropertyState,
css::lang::XUnoTunnel>,
public SfxListener
{
-protected:
const SvxItemPropertySet* mpPropSet;
std::unique_ptr<SfxItemSet> mpSet;
SdrModel* mpDoc;