From d9e478330243cbd120f2de33df3333fec2ef9217 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 3 Apr 2020 10:16:22 +0200 Subject: loplugin:finalclasses in xmlsecurity..UnoControls Change-Id: I8e942bf37c9173a01bef6e1403ca21f579e7f608 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91612 Tested-by: Jenkins Reviewed-by: Noel Grandin --- UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 2 +- UnoControls/source/inc/OConnectionPointHelper.hxx | 2 +- UnoControls/source/inc/framecontrol.hxx | 7 +++---- UnoControls/source/inc/progressbar.hxx | 5 ++--- UnoControls/source/inc/progressmonitor.hxx | 6 ++---- UnoControls/source/inc/statusindicator.hxx | 5 ++--- 6 files changed, 11 insertions(+), 16 deletions(-) (limited to 'UnoControls') diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index 45579f33f200..a1a8a34178a7 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -27,7 +27,7 @@ namespace com::sun::star::lang { class XConnectionPoint; } namespace unocontrols { -class OConnectionPointContainerHelper : public css::lang::XConnectionPointContainer +class OConnectionPointContainerHelper final : public css::lang::XConnectionPointContainer , public ::cppu::OWeakObject { public: diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 9cd5a7907396..f075b071a3cb 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -28,7 +28,7 @@ namespace unocontrols { class OConnectionPointContainerHelper; } namespace unocontrols { -class OConnectionPointHelper : public css::lang::XConnectionPoint +class OConnectionPointHelper final : public css::lang::XConnectionPoint , public ::cppu::OWeakObject { public: diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index 2261490421b8..dad27d8f8f2f 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -31,7 +31,7 @@ namespace unocontrols { class OConnectionPointContainerHelper; } namespace unocontrols { -class FrameControl : public css::awt::XControlModel +class FrameControl final : public css::awt::XControlModel , public css::lang::XConnectionPointContainer , public BaseControl // This order is necessary for right initialization of m_aMutex! , public ::cppu::OBroadcastHelper @@ -130,7 +130,8 @@ public: static OUString impl_getStaticImplementationName(); -protected: +private: + using OPropertySetHelper::getFastPropertyValue; // OPropertySetHelper @@ -162,8 +163,6 @@ protected: const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer ) override; -private: - void impl_createFrame( const css::uno::Reference< css::awt::XWindowPeer >& xPeer , const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ); diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index 8a3f4db1b181..a85fd731de4a 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -39,7 +39,7 @@ namespace unocontrols { #define PROGRESSBAR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white #define PROGRESSBAR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black -class ProgressBar : public css::awt::XControlModel +class ProgressBar final : public css::awt::XControlModel , public css::awt::XProgressBar , public BaseControl { @@ -118,7 +118,7 @@ public: static OUString impl_getStaticImplementationName(); -protected: +private: virtual void impl_paint( sal_Int32 nX , sal_Int32 nY , @@ -127,7 +127,6 @@ protected: void impl_recalcRange(); -private: bool m_bHorizontal; // orientation for steps [true=horizontal/false=vertical] css::awt::Size m_aBlockSize; // width and height of a block [>=0,0] Color m_nForegroundColor; // (alpha,r,g,b) diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index bbb4837347a6..77927020582f 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -51,7 +51,7 @@ struct IMPL_TextlistItem OUString sText; /// Right site of textline in dialog }; -class ProgressMonitor : public css::awt::XLayoutConstrains +class ProgressMonitor final : public css::awt::XLayoutConstrains , public css::awt::XButton , public css::awt::XProgressMonitor , public BaseContainerControl @@ -212,12 +212,11 @@ public: static OUString impl_getStaticImplementationName(); -protected: +private: virtual void impl_paint( sal_Int32 nX , sal_Int32 nY , const css::uno::Reference< css::awt::XGraphics >& xGraphics ) override; -private: using BaseControl::impl_recalcLayout; void impl_recalcLayout(); @@ -230,7 +229,6 @@ private: // debug methods -private: static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText ); // addText, updateText static bool impl_debug_checkParameter( const OUString& rTopic ); // removeText diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index 7676f12902d3..658062c1512c 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -42,7 +42,7 @@ class ProgressBar; #define STATUSINDICATOR_DEFAULT_WIDTH 300 #define STATUSINDICATOR_DEFAULT_HEIGHT 25 -class StatusIndicator : public css::awt::XLayoutConstrains +class StatusIndicator final : public css::awt::XLayoutConstrains , public css::task::XStatusIndicator , public BaseContainerControl { @@ -154,7 +154,7 @@ public: static OUString impl_getStaticImplementationName(); -protected: +private: virtual css::awt::WindowDescriptor impl_getWindowDescriptor( const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer ) override; @@ -167,7 +167,6 @@ protected: virtual void impl_recalcLayout( const css::awt::WindowEvent& aEvent ) override; -private: css::uno::Reference< css::awt::XFixedText > m_xText; rtl::Reference m_xProgressBar; -- cgit