diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-22 10:04:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-28 12:56:17 +0000 |
| commit | 8a22bc93e0988188a87c0a787a9b32a7f74da84d (patch) | |
| tree | 5b0c9bd79ee88be0754687fe552729e8470f5db2 /forms | |
| parent | 99fbcffa3d85c00770977e205626493ec2be1883 (diff) | |
update unnecessaryoverride plugin to find pure forwarding methods
which can be replaced with using declarations.
Is there a more efficient way to code the search? Seems to slow the
build down a little.
Change-Id: I08cda21fa70dce6572e1acc71bf5e6df36bb951f
Reviewed-on: https://gerrit.libreoffice.org/30157
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Edit.cxx | 5 | ||||
| -rw-r--r-- | forms/source/component/Edit.hxx | 2 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 5 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.hxx | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index d082fc98f792..76a2ceaee79b 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -259,11 +259,6 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed, void*, void) } -void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, const Reference< XWindowPeer>& _rxParent ) throw ( RuntimeException, std::exception ) -{ - OBoundControl::createPeer(_rxToolkit, _rxParent); -} - OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, true, true ) diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 6a0b95aa4189..5430920ce335 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -161,7 +161,7 @@ public: virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; // XControl - virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rxParent ) throw ( css::uno::RuntimeException, std::exception ) override; + using OBoundControl::createPeer; private: DECL_LINK( OnKeyPressed, void*, void ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 61540977d345..d3841a1ea649 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -254,11 +254,6 @@ css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() thro return aSupported; } -void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( css::uno::RuntimeException, std::exception) -{ - OBoundControl::setDesignMode(bOn); -} - void OFormattedModel::implConstruct() { // members diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index e3d1f21744e1..53fc2ffde260 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -168,7 +168,7 @@ class OFormattedModel virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; // css::awt::XControl - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( css::uno::RuntimeException, std::exception) override; + using OBoundControl::setDesignMode; // disambiguation using OBoundControl::disposing; |