[Libreoffice-commits] core.git: include/toolkit
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 30 09:26:00 UTC 2019
include/toolkit/awt/animatedimagespeer.hxx | 8 -
include/toolkit/awt/vclxgraphics.hxx | 2
include/toolkit/awt/vclxmenu.hxx | 4
include/toolkit/awt/vclxprinter.hxx | 6 -
include/toolkit/awt/vclxspinbutton.hxx | 5
include/toolkit/awt/vclxsystemdependentwindow.hxx | 2
include/toolkit/awt/vclxtabpagecontainer.hxx | 6 -
include/toolkit/awt/vclxwindows.hxx | 59 ++++-------
include/toolkit/controls/controlmodelcontainerbase.hxx | 2
include/toolkit/controls/dialogcontrol.hxx | 26 ++---
include/toolkit/controls/eventcontainer.hxx | 2
include/toolkit/controls/formattedcontrol.hxx | 2
include/toolkit/controls/geometrycontrolmodel.hxx | 5
include/toolkit/controls/roadmapcontrol.hxx | 6 -
include/toolkit/controls/tabpagecontainer.hxx | 9 -
include/toolkit/controls/tabpagemodel.hxx | 5
include/toolkit/controls/tkscrollbar.hxx | 5
include/toolkit/controls/unocontrolcontainermodel.hxx | 3
include/toolkit/controls/unocontrols.hxx | 87 ++++++-----------
include/toolkit/helper/macros.hxx | 4
20 files changed, 102 insertions(+), 146 deletions(-)
New commits:
commit 6d830c6e26b89a441c11731165eb4d9e0f0d3881
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Oct 30 09:40:47 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 30 10:24:42 2019 +0100
loplugin:finalclasses framework
Change-Id: Ide6531c29fd44003a3235dbd75af79fec0d94678
Reviewed-on: https://gerrit.libreoffice.org/81727
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index ebe1e41d1611..ee1747394ca6 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -43,12 +43,12 @@ namespace toolkit
css::util::XModifyListener
> AnimatedImagesPeer_Base;
- class AnimatedImagesPeer :public AnimatedImagesPeer_Base
+ class AnimatedImagesPeer final : public AnimatedImagesPeer_Base
{
public:
AnimatedImagesPeer();
- protected:
+ private:
virtual ~AnimatedImagesPeer() override;
public:
@@ -75,15 +75,13 @@ namespace toolkit
// XComponent
void SAL_CALL dispose( ) override;
- protected:
+ private:
void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) override;
- private:
/** updates our images with the ones from the given XAnimatedImages component
*/
void impl_updateImages_nolck( const css::uno::Reference< css::uno::XInterface >& i_animatedImages );
- private:
AnimatedImagesPeer(const AnimatedImagesPeer&) = delete;
AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) = delete;
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 85464ae37e56..264843dae6ae 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -54,7 +54,7 @@ namespace o3tl
// class VCLXGraphics
-class VCLXGraphics : public cppu::WeakImplHelper<
+class VCLXGraphics final : public cppu::WeakImplHelper<
css::awt::XGraphics2,
css::lang::XUnoTunnel>
{
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 61f5b7385604..34f5d8f2a58a 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -143,14 +143,14 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
-class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu
+class TOOLKIT_DLLPUBLIC VCLXMenuBar final : public VCLXMenu
{
public:
VCLXMenuBar();
VCLXMenuBar( MenuBar* pMenuBar );
};
-class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
+class TOOLKIT_DLLPUBLIC VCLXPopupMenu final : public VCLXMenu
{
public:
VCLXPopupMenu();
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index a22f52432136..81aebf443c6e 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -106,7 +106,7 @@ public:
typedef ::cppu::ImplInheritanceHelper < VCLXPrinterPropertySet
, css::awt::XPrinter
> VCLXPrinter_Base;
-class VCLXPrinter: public VCLXPrinter_Base
+class VCLXPrinter final : public VCLXPrinter_Base
{
std::shared_ptr<vcl::OldStylePrintAdaptor> mxListener;
JobSetup maInitJobSetup;
@@ -145,7 +145,7 @@ public:
typedef ::cppu::ImplInheritanceHelper < VCLXPrinterPropertySet
, css::awt::XInfoPrinter
> VCLXInfoPrinter_Base;
-class VCLXInfoPrinter: public VCLXInfoPrinter_Base
+class VCLXInfoPrinter final : public VCLXInfoPrinter_Base
{
public:
VCLXInfoPrinter( const OUString& rPrinterName );
@@ -178,7 +178,7 @@ public:
typedef ::cppu::WeakImplHelper < css::awt::XPrinterServer2,
css::lang::XServiceInfo
> VCLXPrinterServer_Base;
-class VCLXPrinterServer : public VCLXPrinterServer_Base
+class VCLXPrinterServer final : public VCLXPrinterServer_Base
{
public:
// css::awt::XPrinterServer2
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index b7237feee37f..5074c591645c 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.hxx
@@ -35,7 +35,7 @@ namespace toolkit
typedef ::cppu::ImplHelper1 < css::awt::XSpinValue
> VCLXSpinButton_Base;
- class VCLXSpinButton :public VCLXWindow
+ class VCLXSpinButton final : public VCLXWindow
,public VCLXSpinButton_Base
{
private:
@@ -44,7 +44,7 @@ namespace toolkit
public:
VCLXSpinButton();
- protected:
+ private:
virtual ~VCLXSpinButton( ) override;
// XInterface
@@ -78,7 +78,6 @@ namespace toolkit
// VCLXWindow
void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) override;
- private:
VCLXSpinButton( const VCLXSpinButton& ) = delete;
VCLXSpinButton& operator=( const VCLXSpinButton& ) = delete;
};
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index d53755aca336..186cb7b915b6 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -26,7 +26,7 @@
#include <toolkit/awt/vclxwindow.hxx>
-class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public css::awt::XSystemDependentWindowPeer,
+class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
public VCLXWindow
{
public:
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index be3a8b9674c1..ffb6feb5ad73 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -31,7 +31,7 @@ typedef cppu::ImplInheritanceHelper< VCLXContainer,
css::awt::tab::XTabPageContainer,
css::container::XContainerListener
> VCLXTabPageContainer_Base;
-class VCLXTabPageContainer : public VCLXTabPageContainer_Base
+class VCLXTabPageContainer final : public VCLXTabPageContainer_Base
{
public:
VCLXTabPageContainer();
@@ -59,9 +59,9 @@ public:
// css::awt::XVclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
-protected:
- virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
private:
+ virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+
TabPageListenerMultiplexer m_aTabPageListeners;
::std::vector< css::uno::Reference< css::awt::tab::XTabPage > > m_aTabPages;
};
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index eba13e505a41..6dd518296356 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -105,14 +105,13 @@ typedef cppu::ImplInheritanceHelper< VCLXGraphicControl,
css::awt::XButton,
css::awt::XToggleButton
> VCLXButton_Base;
-class VCLXButton :public VCLXButton_Base
+class VCLXButton final : public VCLXButton_Base
{
private:
OUString maActionCommand;
ActionListenerMultiplexer maActionListeners;
ItemListenerMultiplexer maItemListeners;
-protected:
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
@@ -150,7 +149,7 @@ public:
// class VCLXImageControl
-class VCLXImageControl : public VCLXGraphicControl
+class VCLXImageControl final : public VCLXGraphicControl
{
public:
VCLXImageControl();
@@ -168,14 +167,14 @@ public:
static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
-protected:
+private:
virtual void ImplSetNewImage() override;
};
// class VCLXCheckBox
-class SAL_DLLPUBLIC_RTTI VCLXCheckBox : public css::awt::XCheckBox,
+class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public css::awt::XCheckBox,
public css::awt::XButton,
public VCLXGraphicControl
{
@@ -184,7 +183,6 @@ private:
OUString maActionCommand;
ItemListenerMultiplexer maItemListeners;
-protected:
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
@@ -233,7 +231,7 @@ public:
// class VCLXRadioButton
-class SAL_DLLPUBLIC_RTTI VCLXRadioButton : public css::awt::XRadioButton,
+class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public css::awt::XRadioButton,
public css::awt::XButton,
public VCLXGraphicControl
{
@@ -242,7 +240,6 @@ private:
ActionListenerMultiplexer maActionListeners;
OUString maActionCommand;
-protected:
void ImplClickedOrToggled( bool bToggled );
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
@@ -291,7 +288,7 @@ public:
// class VCLXMessageBox
-class VCLXMessageBox : public css::awt::XMessageBox,
+class VCLXMessageBox final : public css::awt::XMessageBox,
public VCLXTopWindow
{
public:
@@ -324,9 +321,8 @@ public:
// class VCLXFrame
-class VCLXFrame : public VCLXContainer
+class VCLXFrame final : public VCLXContainer
{
-protected:
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
public:
@@ -353,7 +349,7 @@ public:
// class VCLXDialog
-class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2,
+class TOOLKIT_DLLPUBLIC VCLXDialog final : public css::awt::XDialog2,
public VCLXTopWindow
{
public:
@@ -395,7 +391,7 @@ public:
// class VCLXTabPage
-class VCLXTabPage : public VCLXContainer
+class VCLXTabPage final : public VCLXContainer
{
public:
VCLXTabPage();
@@ -420,11 +416,11 @@ public:
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
-class VCLXMultiPage : public css::awt::XSimpleTabController, public VCLXContainer
+class VCLXMultiPage final : public css::awt::XSimpleTabController, public VCLXContainer
{
TabListenerMultiplexer maTabListeners;
sal_Int32 mTabId;
-protected:
+
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
public:
VCLXMultiPage();
@@ -470,14 +466,13 @@ public:
// class VCLXFixedHyperlink
-class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink :
+class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink final :
public css::awt::XFixedHyperlink,
public VCLXWindow
{
private:
ActionListenerMultiplexer maActionListeners;
-protected:
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
@@ -525,10 +520,9 @@ public:
// class VCLXFixedText
-class VCLXFixedText : public css::awt::XFixedText,
+class VCLXFixedText final : public css::awt::XFixedText,
public VCLXWindow
{
-protected:
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
public:
@@ -562,13 +556,12 @@ public:
// class VCLXScrollBar
-class SAL_DLLPUBLIC_RTTI VCLXScrollBar : public css::awt::XScrollBar,
+class TOOLKIT_DLLPUBLIC VCLXScrollBar final : public css::awt::XScrollBar,
public VCLXWindow
{
private:
AdjustmentListenerMultiplexer maAdjustmentListeners;
-protected:
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
@@ -699,13 +692,12 @@ typedef cppu::ImplInheritanceHelper< VCLXWindow,
css::awt::XTextLayoutConstrains,
css::awt::XItemListListener
> VCLXListBox_Base;
-class VCLXListBox : public VCLXListBox_Base
+class VCLXListBox final : public VCLXListBox_Base
{
private:
ActionListenerMultiplexer maActionListeners;
ItemListenerMultiplexer maItemListeners;
-protected:
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
CreateAccessibleContext() override;
@@ -775,13 +767,12 @@ typedef cppu::ImplInheritanceHelper< VCLXEdit,
css::awt::XComboBox,
css::awt::XItemListListener
> VCLXComboBox_Base;
-class VCLXComboBox : public VCLXComboBox_Base
+class VCLXComboBox final : public VCLXComboBox_Base
{
private:
ActionListenerMultiplexer maActionListeners;
ItemListenerMultiplexer maItemListeners;
-protected:
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
@@ -950,10 +941,9 @@ public:
// class VCLXTimeField
-class VCLXTimeField : public css::awt::XTimeField,
+class VCLXTimeField final : public css::awt::XTimeField,
public VCLXFormattedSpinField
{
-protected:
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
public:
VCLXTimeField();
@@ -995,7 +985,7 @@ public:
// class VCLXNumericField
-class VCLXNumericField : public css::awt::XNumericField,
+class VCLXNumericField final : public css::awt::XNumericField,
public VCLXFormattedSpinField
{
public:
@@ -1042,7 +1032,7 @@ public:
class MetricFormatter;
class MetricField;
-class VCLXMetricField : public css::awt::XMetricField,
+class VCLXMetricField final : public css::awt::XMetricField,
public VCLXFormattedSpinField
{
/// @throws css::uno::RuntimeException
@@ -1094,7 +1084,7 @@ public:
// class VCLXCurrencyField
-class VCLXCurrencyField : public css::awt::XCurrencyField,
+class VCLXCurrencyField final : public css::awt::XCurrencyField,
public VCLXFormattedSpinField
{
public:
@@ -1140,7 +1130,7 @@ public:
// class VCLXPatternField
-class VCLXPatternField : public css::awt::XPatternField,
+class VCLXPatternField final : public css::awt::XPatternField,
public VCLXFormattedSpinField
{
public:
@@ -1176,11 +1166,8 @@ public:
// class VCLXToolBox
-class VCLXToolBox : public VCLXWindow
+class VCLXToolBox final : public VCLXWindow
{
-private:
-
-protected:
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
CreateAccessibleContext() override;
@@ -1189,7 +1176,7 @@ public:
virtual ~VCLXToolBox() override;
};
-class VCLXHeaderBar : public VCLXWindow
+class VCLXHeaderBar final : public VCLXWindow
{
public:
VCLXHeaderBar();
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index d7b914304b72..5a56b9b3a1f1 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -184,7 +184,7 @@ protected:
void implUpdateGroupStructure();
};
-class ResourceListener :public css::util::XModifyListener,
+class ResourceListener final : public css::util::XModifyListener,
public ::cppu::OWeakObject,
public ::cppu::BaseMutex
{
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 83e9b13b2800..223c50e927da 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -32,7 +32,7 @@ typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase
, css::awt::XUnoControlDialog
, css::awt::XWindowListener
> UnoDialogControl_Base;
-class UnoDialogControl : public UnoDialogControl_Base
+class UnoDialogControl final : public UnoDialogControl_Base
{
private:
css::uno::Reference< css::awt::XMenuBar > mxMenuBar;
@@ -152,13 +152,12 @@ public:
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-protected:
+private:
virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override;
virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) override;
-protected:
};
-class UnoMultiPageModel : public ControlModelContainerBase
+class UnoMultiPageModel final : public ControlModelContainerBase
{
public:
UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -180,13 +179,13 @@ public:
// Override the method of parent class
virtual sal_Bool SAL_CALL getGroupControl( ) override;
-protected:
+private:
virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
};
-class UnoMultiPageControl : public ControlContainerBase
+class UnoMultiPageControl final : public ControlContainerBase
,public css::awt::XSimpleTabController
,public css::awt::XTabListener
{
@@ -229,7 +228,7 @@ public:
// XComponent
void SAL_CALL dispose( ) override;
-protected:
+private:
virtual void impl_createControlPeerIfNecessary(
const css::uno::Reference< css::awt::XControl >& _rxControl
) override;
@@ -237,7 +236,7 @@ protected:
};
-class UnoPageModel : public ControlModelContainerBase
+class UnoPageModel final : public ControlModelContainerBase
{
public:
UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -257,13 +256,13 @@ public:
// Override the method of parent class
virtual sal_Bool SAL_CALL getGroupControl( ) override;
-protected:
+private:
virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
};
-class UnoPageControl : public ControlContainerBase
+class UnoPageControl final : public ControlContainerBase
{
public:
UnoPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -275,7 +274,7 @@ public:
DECLIMPL_SERVICEINFO_DERIVED( UnoPageControl, ControlContainerBase, "com.sun.star.awt.UnoControlPage" )
};
-class UnoFrameModel : public ControlModelContainerBase
+class UnoFrameModel final : public ControlModelContainerBase
{
public:
UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -293,14 +292,13 @@ public:
virtual OUString SAL_CALL getServiceName() override;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
-protected:
+private:
virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
};
-class UnoFrameControl : public ControlContainerBase
+class UnoFrameControl final : public ControlContainerBase
{
-protected:
virtual void ImplSetPosSize( css::uno::Reference< css::awt::XControl >& rxCtrl ) override;
public:
UnoFrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 29ce0beecf80..4804a2f2588b 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -31,7 +31,7 @@
namespace toolkit
{
-class ScriptEventContainer : public ::cppu::WeakImplHelper<
+class ScriptEventContainer final : public ::cppu::WeakImplHelper<
css::container::XNameContainer,
css::container::XContainer >
{
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index cf2cd9129bba..db75811b2cf7 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -101,7 +101,7 @@ namespace toolkit
// = UnoFormattedFieldControl
- class UnoFormattedFieldControl : public UnoSpinFieldControl
+ class UnoFormattedFieldControl final : public UnoSpinFieldControl
{
public:
UnoFormattedFieldControl();
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index be0daf863ad5..ded5b2a268da 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -169,7 +169,7 @@ namespace com { namespace sun { namespace star {
Reference< XAggregation > xIFace = new ::toolkit::OGeometryControlModel< UnoControlButtonModel > ();
*/
template <class CONTROLMODEL>
- class OGeometryControlModel
+ class OGeometryControlModel final
:public OGeometryControlModel_Base
,public ::comphelper::OAggregationArrayUsageHelper< OTemplateInstanceDisambiguation< CONTROLMODEL > >
{
@@ -179,7 +179,6 @@ namespace com { namespace sun { namespace star {
private:
OGeometryControlModel(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance);
- protected:
// OAggregationArrayUsageHelper overridables
virtual void fillProperties(
css::uno::Sequence< css::beans::Property >& _rProps,
@@ -203,7 +202,7 @@ namespace com { namespace sun { namespace star {
/** allows to extend an arbitrary com.sun.star.awt::UnoControlModel with geometry
information.
*/
- class OCommonGeometryControlModel
+ class OCommonGeometryControlModel final
:public OGeometryControlModel_Base
,public ::comphelper::OIdPropertyArrayUsageHelper< OCommonGeometryControlModel >
{
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index b73916d22c3b..e7b498fdb045 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -65,7 +65,7 @@ namespace toolkit
// = UnoControlRoadmapModel
- class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base,
+ class UnoControlRoadmapModel final : public UnoControlRoadmapModel_Base,
public UnoControlRoadmapModel_IBase
{
@@ -83,8 +83,6 @@ namespace toolkit
static sal_Int16 GetCurrentItemID( const css::uno::Reference< css::beans::XPropertySet >& xPropertySet );
sal_Int32 GetUniqueID();
-
- protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -141,7 +139,7 @@ namespace toolkit
// = UnoRoadmapControl
- class UnoRoadmapControl : public UnoControlRoadmap_Base,
+ class UnoRoadmapControl final : public UnoControlRoadmap_Base,
public UnoControlRoadmap_IBase
{
private:
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index e7ace6cd8980..2e071ae16f3c 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -38,12 +38,12 @@ namespace com { namespace sun { namespace star { namespace awt { namespace tab {
typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel
, css::awt::tab::XTabPageContainerModel
> UnoControlTabPageContainerModel_Base;
-class UnoControlTabPageContainerModel : public UnoControlTabPageContainerModel_Base
+class UnoControlTabPageContainerModel final : public UnoControlTabPageContainerModel_Base
{
private:
std::vector< css::uno::Reference< css::awt::tab::XTabPageModel > > m_aTabPageVector;
ContainerListenerMultiplexer maContainerListeners;
-protected:
+
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
// css::beans::XMultiPropertySet
@@ -91,7 +91,7 @@ public:
typedef ::cppu::AggImplInheritanceHelper1 < ControlContainerBase
, css::awt::tab::XTabPageContainer
> UnoControlTabPageContainer_Base;
-class UnoControlTabPageContainer : public UnoControlTabPageContainer_Base
+class UnoControlTabPageContainer final : public UnoControlTabPageContainer_Base
{
public:
UnoControlTabPageContainer( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -118,9 +118,8 @@ public:
DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, "com.sun.star.awt.tab.UnoControlTabPageContainer" )
// using UnoControl::getPeer;
-protected:
- virtual void updateFromModel() override;
private:
+ virtual void updateFromModel() override;
TabPageListenerMultiplexer m_aTabPageListeners;
};
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 422cd09cd738..49893cb805a7 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -24,9 +24,8 @@
#include <com/sun/star/awt/tab/XTabPage.hpp>
#include <cppuhelper/implbase2.hxx>
-class UnoControlTabPageModel : public ControlModelContainerBase
+class UnoControlTabPageModel final : public ControlModelContainerBase
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
public:
@@ -53,7 +52,7 @@ typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase
, css::awt::tab::XTabPage
, css::awt::XWindowListener
> UnoControlTabPage_Base;
-class UnoControlTabPage : public UnoControlTabPage_Base
+class UnoControlTabPage final : public UnoControlTabPage_Base
{
private:
bool m_bWindowListener;
diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index 3abd331de396..a59f8f44d720 100644
--- a/include/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.hxx
@@ -31,9 +31,8 @@ namespace toolkit
//= UnoControlScrollBarModel
- class UnoControlScrollBarModel : public UnoControlModel
+ class UnoControlScrollBarModel final : public UnoControlModel
{
- protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -58,7 +57,7 @@ namespace toolkit
//= UnoControlScrollBarModel
- class UnoScrollBarControl : public UnoControlBase,
+ class UnoScrollBarControl final : public UnoControlBase,
public css::awt::XAdjustmentListener,
public css::awt::XScrollBar
{
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index 1de5058dc90a..f24015b3e9b2 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -26,9 +26,8 @@
// class css::awt::UnoControlContainerModel
-class UnoControlContainerModel : public UnoControlModel
+class UnoControlContainerModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 5feb07b266c6..c3c16b2fe6c4 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -74,9 +74,8 @@ public:
// class UnoControlEditModel
-class UnoControlEditModel : public UnoControlModel
+class UnoControlEditModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -180,9 +179,8 @@ public:
// class UnoControlFileControlModel
-class UnoControlFileControlModel : public UnoControlModel
+class UnoControlFileControlModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -207,7 +205,7 @@ public:
// class UnoFileControl
-class UnoFileControl : public UnoEditControl
+class UnoFileControl final : public UnoEditControl
{
public:
UnoFileControl();
@@ -250,9 +248,8 @@ private:
// class UnoControlButtonModel
-class UnoControlButtonModel : public GraphicControlModel
+class UnoControlButtonModel final : public GraphicControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -283,7 +280,7 @@ typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase
, css::awt::XLayoutConstrains
, css::awt::XItemListener
> UnoButtonControl_Base;
-class UnoButtonControl : public UnoButtonControl_Base
+class UnoButtonControl final : public UnoButtonControl_Base
{
private:
ActionListenerMultiplexer maActionListeners;
@@ -329,12 +326,11 @@ public:
// class UnoControlImageControlModel
-class UnoControlImageControlModel : public GraphicControlModel
+class UnoControlImageControlModel final : public GraphicControlModel
{
private:
bool mbAdjustingImageScaleMode;
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -365,7 +361,7 @@ public:
typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase
, css::awt::XLayoutConstrains
> UnoImageControlControl_Base;
-class UnoImageControlControl : public UnoImageControlControl_Base
+class UnoImageControlControl final : public UnoImageControlControl_Base
{
private:
ActionListenerMultiplexer maActionListeners;
@@ -394,10 +390,8 @@ public:
// class UnoControlRadioButtonModel
-class UnoControlRadioButtonModel : public GraphicControlModel
-
+class UnoControlRadioButtonModel final : public GraphicControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -428,7 +422,7 @@ typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase
, css::awt::XItemListener
, css::awt::XLayoutConstrains
> UnoRadioButtonControl_Base;
-class UnoRadioButtonControl : public UnoRadioButtonControl_Base
+class UnoRadioButtonControl final : public UnoRadioButtonControl_Base
{
private:
ItemListenerMultiplexer maItemListeners;
@@ -476,9 +470,8 @@ public:
// class UnoControlCheckBoxModel
-class UnoControlCheckBoxModel : public GraphicControlModel
+class UnoControlCheckBoxModel final : public GraphicControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -509,7 +502,7 @@ typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase
, css::awt::XItemListener
, css::awt::XLayoutConstrains
> UnoCheckBoxControl_Base;
-class UnoCheckBoxControl : public UnoCheckBoxControl_Base
+class UnoCheckBoxControl final : public UnoCheckBoxControl_Base
{
private:
ItemListenerMultiplexer maItemListeners;
@@ -559,9 +552,8 @@ public:
// class UnoControlFixedTextModel
-class UnoControlFixedHyperlinkModel : public UnoControlModel
+class UnoControlFixedHyperlinkModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -584,7 +576,7 @@ public:
// class UnoFixedHyperlinkControl
-class UnoFixedHyperlinkControl : public UnoControlBase,
+class UnoFixedHyperlinkControl final : public UnoControlBase,
public css::awt::XFixedHyperlink,
public css::awt::XLayoutConstrains
{
@@ -633,9 +625,8 @@ public:
// class UnoControlFixedTextModel
-class UnoControlFixedTextModel : public UnoControlModel
+class UnoControlFixedTextModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -660,7 +651,7 @@ public:
// class UnoFixedTextControl
-class UnoFixedTextControl : public UnoControlBase,
+class UnoFixedTextControl final : public UnoControlBase,
public css::awt::XFixedText,
public css::awt::XLayoutConstrains
{
@@ -700,9 +691,8 @@ public:
// class UnoControlGroupBoxModel
-class UnoControlGroupBoxModel : public UnoControlModel
+class UnoControlGroupBoxModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -727,7 +717,7 @@ public:
// class UnoGroupBoxControl
-class UnoGroupBoxControl : public UnoControlBase
+class UnoGroupBoxControl final : public UnoControlBase
{
public:
UnoGroupBoxControl();
@@ -927,9 +917,8 @@ private:
// class UnoControlComboBoxModel
-class UnoControlComboBoxModel : public UnoControlListBoxModel
+class UnoControlComboBoxModel final : public UnoControlListBoxModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -956,7 +945,7 @@ public:
// class UnoComboBoxControl
-class UnoComboBoxControl : public UnoEditControl
+class UnoComboBoxControl final : public UnoEditControl
, public css::awt::XComboBox
, public css::awt::XItemListener
, public css::awt::XItemListListener
@@ -1014,7 +1003,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName( ) override;
css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-protected:
+private:
virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override;
virtual void updateFromModel() override;
@@ -1061,9 +1050,8 @@ public:
// class UnoControlDateFieldModel
-class UnoControlDateFieldModel : public UnoControlModel
+class UnoControlDateFieldModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1088,7 +1076,7 @@ public:
// class UnoDateFieldControl
-class UnoDateFieldControl : public UnoSpinFieldControl,
+class UnoDateFieldControl final : public UnoSpinFieldControl,
public css::awt::XDateField
{
private:
@@ -1140,9 +1128,8 @@ public:
// class UnoControlTimeFieldModel
-class UnoControlTimeFieldModel : public UnoControlModel
+class UnoControlTimeFieldModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1167,7 +1154,7 @@ public:
// class UnoTimeFieldControl
-class UnoTimeFieldControl : public UnoSpinFieldControl,
+class UnoTimeFieldControl final : public UnoSpinFieldControl,
public css::awt::XTimeField
{
private:
@@ -1217,9 +1204,8 @@ public:
// class UnoControlNumericFieldModel
-class UnoControlNumericFieldModel : public UnoControlModel
+class UnoControlNumericFieldModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1244,7 +1230,7 @@ public:
// class UnoNumericFieldControl
-class UnoNumericFieldControl : public UnoSpinFieldControl,
+class UnoNumericFieldControl final : public UnoSpinFieldControl,
public css::awt::XNumericField
{
private:
@@ -1296,9 +1282,8 @@ public:
// class UnoControlCurrencyFieldModel
-class UnoControlCurrencyFieldModel : public UnoControlModel
+class UnoControlCurrencyFieldModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1323,7 +1308,7 @@ public:
// class UnoCurrencyFieldControl
-class UnoCurrencyFieldControl : public UnoSpinFieldControl,
+class UnoCurrencyFieldControl final : public UnoSpinFieldControl,
public css::awt::XCurrencyField
{
private:
@@ -1375,9 +1360,8 @@ public:
// class UnoControlPatternFieldModel
-class UnoControlPatternFieldModel : public UnoControlModel
+class UnoControlPatternFieldModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1402,10 +1386,9 @@ public:
// class UnoPatternFieldControl
-class UnoPatternFieldControl : public UnoSpinFieldControl,
+class UnoPatternFieldControl final : public UnoSpinFieldControl,
public css::awt::XPatternField
{
-protected:
void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override;
public:
@@ -1438,9 +1421,8 @@ public:
// class UnoControlProgressBarModel
-class UnoControlProgressBarModel : public UnoControlModel
+class UnoControlProgressBarModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1465,7 +1447,7 @@ public:
// class UnoProgressBarControl
-class UnoProgressBarControl : public UnoControlBase,
+class UnoProgressBarControl final : public UnoControlBase,
public css::awt::XProgressBar
{
public:
@@ -1497,9 +1479,8 @@ public:
// class UnoControlFixedLineModel
-class UnoControlFixedLineModel : public UnoControlModel
+class UnoControlFixedLineModel final : public UnoControlModel
{
-protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -1524,7 +1505,7 @@ public:
// class UnoFixedLineControl
-class UnoFixedLineControl : public UnoControlBase
+class UnoFixedLineControl final : public UnoControlBase
{
public:
UnoFixedLineControl();
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index f7e7f8a26da3..1bfd46b1bd7e 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -32,7 +32,7 @@ css::uno::Sequence< sal_Int8 > ClassName::getImplementationId() \
#define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \
-class ClassName : public ListenerMultiplexerBase, public InterfaceName \
+class ClassName final : public ListenerMultiplexerBase, public InterfaceName \
{ \
public: \
ClassName( ::cppu::OWeakObject& rSource ); \
@@ -43,7 +43,7 @@ public: \
#define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \
-class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public InterfaceName \
+class TOOLKIT_DLLPUBLIC ClassName final : public ListenerMultiplexerBase, public InterfaceName \
{ \
public: \
ClassName( ::cppu::OWeakObject& rSource ); \
More information about the Libreoffice-commits
mailing list