diff options
author | Noel Grandin <noel@peralex.com> | 2016-10-05 13:51:46 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-10-05 13:53:28 +0200 |
commit | 7cf9028d3b735c5a1929897e556357b5d18573a2 (patch) | |
tree | a8f138bf09de2376fc9f83c6fac3c07f3fb8bf64 | |
parent | f1a8c3119f5c5cef8f3a421dace54237ac8794d3 (diff) |
loplugin:unnecessaryoverride in forms/framework
Change-Id: Ia2aabec5af5559903be09e1ef81d156a7538ab3f
-rw-r--r-- | forms/source/component/Currency.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Currency.hxx | 3 | ||||
-rw-r--r-- | forms/source/component/Edit.cxx | 12 | ||||
-rw-r--r-- | forms/source/component/Edit.hxx | 4 | ||||
-rw-r--r-- | forms/source/component/FormattedField.cxx | 10 | ||||
-rw-r--r-- | forms/source/component/FormattedField.hxx | 4 | ||||
-rw-r--r-- | forms/source/component/Numeric.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Numeric.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/Pattern.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Pattern.hxx | 3 | ||||
-rw-r--r-- | forms/source/component/RadioButton.cxx | 21 | ||||
-rw-r--r-- | forms/source/component/RadioButton.hxx | 4 | ||||
-rw-r--r-- | framework/inc/services/layoutmanager.hxx | 3 | ||||
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 5 |
14 files changed, 0 insertions, 89 deletions
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index fe0005a543ba..552b94ef735b 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -59,12 +59,6 @@ css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames // OCurrencyModel -Sequence<Type> OCurrencyModel::_getTypes() -{ - return OEditBaseModel::_getTypes(); -} - - void OCurrencyModel::implConstruct() { if (m_xAggregateSet.is()) diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index 2a61cd339138..e09c3f2cb78a 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -31,9 +31,6 @@ class OCurrencyModel { css::uno::Any m_aSaveValue; -protected: - virtual css::uno::Sequence< css::uno::Type> _getTypes() override; - public: DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel ); diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index e3dffb1ff966..d082fc98f792 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -265,12 +265,6 @@ void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, } -Sequence<Type> OEditModel::_getTypes() -{ - return OEditBaseModel::_getTypes(); -} - - OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, true, true ) ,m_bMaxTextLenModified(false) @@ -645,12 +639,6 @@ bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType ) } -void OEditModel::resetNoBroadcast() -{ - OEditBaseModel::resetNoBroadcast(); -} - - bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) { Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) ); diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index a8286005e25c..6a0b95aa4189 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -43,8 +43,6 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OEditModel ); protected: - virtual css::uno::Sequence< css::uno::Type> _getTypes() override; - void enableFormattedWriteFake() { m_bWritingFormattedFake = true; } void disableFormattedWriteFake() { m_bWritingFormattedFake = false; } bool lastReadWasFormattedFake() const { return (getLastReadVersion() & PF_FAKE_FORMATTED_FIELD) != 0; } @@ -103,8 +101,6 @@ protected: virtual bool approveDbColumnType( sal_Int32 _nColumnType ) override; - virtual void resetNoBroadcast() override; - protected: virtual sal_uInt16 getPersistenceFlags() const override; diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 174964f35d56..61540977d345 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -371,16 +371,6 @@ void OFormattedModel::describeAggregateProperties( Sequence< Property >& _rAggre // arbitrary formatted control } -void OFormattedModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const -{ - OEditBaseModel::getFastPropertyValue(rValue, nHandle); -} - -void OFormattedModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception) -{ - OEditBaseModel::setFastPropertyValue_NoBroadcast(nHandle, rValue); -} - void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle) { if (nHandle == PROPERTY_ID_FORMATSSUPPLIER) diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index beb5e702bbfa..e3d1f21744e1 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -81,10 +81,6 @@ class OFormattedModel virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - // XPropertySet - virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; - // XLoadListener virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 76a9156660e1..9045f05f630f 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -55,12 +55,6 @@ css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() throw(s // ONumericModel -Sequence<Type> ONumericModel::_getTypes() -{ - return OEditBaseModel::_getTypes(); -} - - ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD, true, true ) // use the old control name for compytibility reasons diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index 1403ee128849..fff9bbc738bb 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -31,8 +31,6 @@ class ONumericModel { private: css::uno::Any m_aSaveValue; -protected: - virtual css::uno::Sequence< css::uno::Type> _getTypes() override; public: DECLARE_DEFAULT_LEAF_XTOR( ONumericModel ); diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index ba27f2337c6a..9c2778ea1807 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -56,12 +56,6 @@ css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(s // OPatternModel -Sequence<Type> OPatternModel::_getTypes() -{ - return OEditBaseModel::_getTypes(); -} - - OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD, false, false ) // use the old control name for compytibility reasons diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index 6600e91a0f61..8c9b94c656c0 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -38,9 +38,6 @@ private: ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pFormattedValue; -protected: - virtual css::uno::Sequence< css::uno::Type> _getTypes() override; - public: DECLARE_DEFAULT_LEAF_XTOR( OPatternModel ); diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 61923834b9db..863d0a21175e 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -61,27 +61,6 @@ ORadioButtonControl::ORadioButtonControl(const Reference<XComponentContext>& _rx } -void SAL_CALL ORadioButtonControl::createPeer(const Reference<css::awt::XToolkit>& _rxToolkit, const Reference<css::awt::XWindowPeer>& _rxParent) throw (RuntimeException, std::exception) -{ - OBoundControl::createPeer(_rxToolkit, _rxParent); - - // switch off the auto-toggle, we do this ourself .... - // (formerly this switch-off was done in the toolkit - but the correct place is here ...) -// Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY ); -// if (xVclWindowPeer.is()) -// xVclWindowPeer->setProperty(OUString("AutoToggle"), ::cppu::bool2any(sal_False)); - // new order: do _not_ switch off the auto toggle because: - // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it) - // * without auto toggle, the AccessibleEvents as fired by the radio buttons are - // a. newly checked button: "unchecked"->"checked" - // b. previously checked button: "checked"->"unchecked" - // This is deadly for AT-tools, which then get the "unchecked" event _immediately_ after the "checked" event, - // and only read the latter. This makes radio buttons pretty unusable in form documents. - // So we switched AutoToggle _on_, again, because then VCL can handle the notifications, and will send - // them in the proper order. -} - - ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFactory) :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON ) // use the old control name for compytibility reasons diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index ac1a31d85ccb..0f148397e4d7 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -83,10 +83,6 @@ public: { return OUString("com.sun.star.form.ORadioButtonControl"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - -protected: - // XControl - virtual void SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index c6699b30a4cf..7a895cc36763 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -250,9 +250,6 @@ namespace framework virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; - using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , - sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index e5e0e09518cf..6c5c6695740e 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -3145,11 +3145,6 @@ void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32 n } } -void SAL_CALL LayoutManager::getFastPropertyValue( uno::Any& aValue, sal_Int32 nHandle ) const -{ - LayoutManager_PBase::getFastPropertyValue( aValue, nHandle ); -} - namespace detail { class InfoHelperBuilder |