diff options
Diffstat (limited to 'framework/inc/uielement')
5 files changed, 10 insertions, 14 deletions
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index cd3f61e45d3d..8842ad608c79 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -36,7 +36,7 @@ class ToolBox; namespace framework { -class AddonsToolBarManager : public ToolBarManager +class AddonsToolBarManager final : public ToolBarManager { public: AddonsToolBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -52,7 +52,7 @@ class AddonsToolBarManager : public ToolBarManager using ToolBarManager::FillToolbar; void FillToolbar( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rAddonToolbar ); - protected: + private: DECL_LINK(Click, ToolBox *, void); DECL_LINK(DoubleClick, ToolBox *, void); DECL_LINK(Select, ToolBox *, void); diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx index 87c71a24a624..95521d2a29e2 100644 --- a/framework/inc/uielement/genericstatusbarcontroller.hxx +++ b/framework/inc/uielement/genericstatusbarcontroller.hxx @@ -28,7 +28,7 @@ namespace framework struct AddonStatusbarItemData; -class GenericStatusbarController : public svt::StatusbarController +class GenericStatusbarController final : public svt::StatusbarController { public: GenericStatusbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -46,7 +46,7 @@ class GenericStatusbarController : public svt::StatusbarController const css::awt::Rectangle& rOutputRectangle, ::sal_Int32 nStyle ) override; - protected: + private: bool m_bEnabled; bool m_bOwnerDraw; AddonStatusbarItemData* m_pItemData; diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index c2711f1efc8c..13e32d48f250 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -31,7 +31,7 @@ class ToolBox; namespace framework { -class GenericToolbarController : public svt::ToolboxController +class GenericToolbarController final : public svt::ToolboxController { public: GenericToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -59,7 +59,7 @@ class GenericToolbarController : public svt::ToolboxController css::uno::Sequence< css::beans::PropertyValue > aArgs; }; - protected: + private: VclPtr<ToolBox> m_pToolbar; sal_uInt16 m_nID; bool m_bEnumCommand : 1, diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 68d445ff7881..ba77df9457ab 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -65,7 +65,7 @@ struct PopupControllerEntry typedef std::unordered_map< OUString, PopupControllerEntry > PopupControllerCache; -class MenuBarManager: +class MenuBarManager final : protected cppu::BaseMutex, public cppu::WeakComponentImplHelper< css::frame::XStatusListener, @@ -73,7 +73,6 @@ class MenuBarManager: css::ui::XUIConfigurationListener, css::awt::XSystemDependentMenuPeer> { - protected: MenuBarManager( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XFrame >& rFrame, @@ -134,7 +133,7 @@ class MenuBarManager: void SetItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemContainer ); void GetPopupController( PopupControllerCache& rPopupController ); - protected: + private: DECL_LINK( Activate, Menu *, bool ); DECL_LINK( Deactivate, Menu *, bool ); DECL_LINK( AsyncSettingsHdl, Timer *, void ); @@ -146,8 +145,6 @@ class MenuBarManager: static bool MustBeHidden( PopupMenu* pPopupMenu, const css::uno::Reference< css::util::XURLTransformer >& rTransformer ); OUString RetrieveLabelFromCommand(const OUString& rCmdURL); - private: - void Destroy(); struct MenuItemHandler diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index ce077301abef..b72591c2321c 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -46,7 +46,7 @@ typedef ::cppu::WeakImplHelper< css::lang::XSingleComponentFactory, css::lang::XUnoTunnel > RootItemContainer_BASE; -class RootItemContainer : private cppu::BaseMutex, +class RootItemContainer final : private cppu::BaseMutex, public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , public RootItemContainer_BASE @@ -98,7 +98,7 @@ class RootItemContainer : private cppu::BaseMutex, virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override; - protected: + private: // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , @@ -114,7 +114,6 @@ class RootItemContainer : private cppu::BaseMutex, static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); - private: RootItemContainer& operator=( const RootItemContainer& ) = delete; RootItemContainer( const RootItemContainer& ) = delete; |