diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-05 08:23:23 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-05 09:10:18 +0000 |
commit | bbefa7589633d1c88f1c12d75b1e820666119c3a (patch) | |
tree | 4666b4b305808647b0c9dc2e8362ccb51f3b0b60 /sfx2 | |
parent | e065531d44f168151f5605c3e666e6c7ba1d9b33 (diff) |
sfx2: clean up redundant virtual keywords in classificationcontroller
Change-Id: I7ac297a675034e64dcd629bf8243d9579bbeec6e
Reviewed-on: https://gerrit.libreoffice.org/29535
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/view/classificationcontroller.cxx | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 78b2b0dc2dc0..6ef356dd63fc 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -44,7 +44,7 @@ class ClassificationPropertyListener : public ClassificationPropertyListenerBase public: ClassificationPropertyListener(const rtl::Reference<comphelper::ConfigurationListener>& xListener, ClassificationCategoriesController& rController); - virtual void setProperty(const uno::Any& rProperty) override; + void setProperty(const uno::Any& rProperty) override; }; using ClassificationCategoriesControllerBase = cppu::ImplInheritanceHelper<svt::ToolboxController, lang::XServiceInfo>; @@ -62,21 +62,21 @@ class ClassificationCategoriesController : public ClassificationCategoriesContro public: explicit ClassificationCategoriesController(const uno::Reference<uno::XComponentContext>& rContext); - virtual ~ClassificationCategoriesController() override; + ~ClassificationCategoriesController() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override; + uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override; // XToolbarController - virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override; + uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override; + void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override; void removeEntries(); }; @@ -87,13 +87,13 @@ class SAL_WARN_UNUSED ClassificationControl : public vcl::Window std::map<SfxClassificationPolicyType, VclPtr<FixedText>> m_pLabels; std::map<SfxClassificationPolicyType, VclPtr<ListBox>> m_pCategories; void SetOptimalSize(); - virtual void DataChanged(const DataChangedEvent& rEvent) override; + void DataChanged(const DataChangedEvent& rEvent) override; public: explicit ClassificationControl(vcl::Window* pParent); - virtual ~ClassificationControl() override; - virtual void dispose() override; - virtual void Resize() override; + ~ClassificationControl() override; + void dispose() override; + void Resize() override; const VclPtr<ListBox>& getCategories(SfxClassificationPolicyType eType); std::size_t getLabelsSize(); OUString getCategoryType(ListBox& rCategory); @@ -120,9 +120,7 @@ ClassificationCategoriesController::ClassificationCategoriesController(const uno } -ClassificationCategoriesController::~ClassificationCategoriesController() -{ -} +ClassificationCategoriesController::~ClassificationCategoriesController() = default; OUString ClassificationCategoriesController::getImplementationName() throw (uno::RuntimeException, std::exception) { |