summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-22 12:08:45 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-12 08:45:14 +0000
commit52b91f3454394a1792dec018804bf2c969f564e5 (patch)
treeb72a1bedae05e7e16268487e6d16773f8ee57674 /framework
parentc44726c48228d9c6a5960e302b1c0bd16b0099c4 (diff)
new loplugin fragiledestructor
fix up a small number of places that it finds Change-Id: Iedc91e141edfb28f727454f698cd2155a7fd5bf4 Reviewed-on: https://gerrit.libreoffice.org/26566 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/services/layoutmanager.hxx2
-rw-r--r--framework/source/jobs/jobexecutor.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx2
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 873f067b52ff..a6ba5c516c0d 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -110,7 +110,7 @@ namespace framework
virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
virtual css::awt::Rectangle SAL_CALL getCurrentDockingArea( ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDockingAreaAcceptor( const css::uno::Reference< css::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDockingAreaAcceptor( const css::uno::Reference< css::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (css::uno::RuntimeException, std::exception) final override;
virtual void SAL_CALL createElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL destroyElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 9ab48255f65d..ecf5b9134e07 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -79,7 +79,7 @@ private:
/** helper to allow us listen to the configuration without a cyclic dependency */
css::uno::Reference<css::container::XContainerListener> m_xConfigListener;
- virtual void SAL_CALL disposing() override;
+ virtual void SAL_CALL disposing() final override;
public:
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index cf97b6d981dd..40238c69105d 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -533,7 +533,7 @@ protected:
throw(css::uno::RuntimeException, std::exception) override;
private:
- virtual void SAL_CALL disposing() override;
+ virtual void SAL_CALL disposing() final override;
/** @short open the underlying configuration.
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 68dda4effb78..5b22b36b8aab 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -354,7 +354,7 @@ public:
void impl_readAll();
private:
- virtual void SAL_CALL disposing() override;
+ virtual void SAL_CALL disposing() final override;
OUString getStringProperty(const OUString& p1)
throw(css::uno::RuntimeException);
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index ebdf8277dcc1..2c707dc18325 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -89,7 +89,7 @@ public:
throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
private:
- virtual void SAL_CALL disposing() override;
+ virtual void SAL_CALL disposing() final override;
typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash > ModuleToModuleCfgMgr;
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 7d4809bcdcf6..fb6cdb48fb45 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -66,7 +66,7 @@ protected:
rtl::Reference<ConfigurationAccess_ControllerFactory> m_pConfigAccess;
private:
- virtual void SAL_CALL disposing() override;
+ virtual void SAL_CALL disposing() final override;
};
UIControllerFactory::UIControllerFactory(