Kaydet (Commit) 7cf9028d authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unnecessaryoverride in forms/framework

Change-Id: Ia2aabec5af5559903be09e1ef81d156a7538ab3f
üst f1a8c311
...@@ -59,12 +59,6 @@ css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames ...@@ -59,12 +59,6 @@ css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames
// OCurrencyModel // OCurrencyModel
Sequence<Type> OCurrencyModel::_getTypes()
{
return OEditBaseModel::_getTypes();
}
void OCurrencyModel::implConstruct() void OCurrencyModel::implConstruct()
{ {
if (m_xAggregateSet.is()) if (m_xAggregateSet.is())
......
...@@ -31,9 +31,6 @@ class OCurrencyModel ...@@ -31,9 +31,6 @@ class OCurrencyModel
{ {
css::uno::Any m_aSaveValue; css::uno::Any m_aSaveValue;
protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
public: public:
DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel ); DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel );
......
...@@ -265,12 +265,6 @@ void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, ...@@ -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) OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, true, true ) :OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, true, true )
,m_bMaxTextLenModified(false) ,m_bMaxTextLenModified(false)
...@@ -645,12 +639,6 @@ bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType ) ...@@ -645,12 +639,6 @@ bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType )
} }
void OEditModel::resetNoBroadcast()
{
OEditBaseModel::resetNoBroadcast();
}
bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
{ {
Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) ); Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
......
...@@ -43,8 +43,6 @@ public: ...@@ -43,8 +43,6 @@ public:
DECLARE_DEFAULT_LEAF_XTOR( OEditModel ); DECLARE_DEFAULT_LEAF_XTOR( OEditModel );
protected: protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
void enableFormattedWriteFake() { m_bWritingFormattedFake = true; } void enableFormattedWriteFake() { m_bWritingFormattedFake = true; }
void disableFormattedWriteFake() { m_bWritingFormattedFake = false; } void disableFormattedWriteFake() { m_bWritingFormattedFake = false; }
bool lastReadWasFormattedFake() const { return (getLastReadVersion() & PF_FAKE_FORMATTED_FIELD) != 0; } bool lastReadWasFormattedFake() const { return (getLastReadVersion() & PF_FAKE_FORMATTED_FIELD) != 0; }
...@@ -103,8 +101,6 @@ protected: ...@@ -103,8 +101,6 @@ protected:
virtual bool approveDbColumnType( sal_Int32 _nColumnType ) override; virtual bool approveDbColumnType( sal_Int32 _nColumnType ) override;
virtual void resetNoBroadcast() override;
protected: protected:
virtual sal_uInt16 getPersistenceFlags() const override; virtual sal_uInt16 getPersistenceFlags() const override;
......
...@@ -371,16 +371,6 @@ void OFormattedModel::describeAggregateProperties( Sequence< Property >& _rAggre ...@@ -371,16 +371,6 @@ void OFormattedModel::describeAggregateProperties( Sequence< Property >& _rAggre
// arbitrary formatted control // 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) void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle)
{ {
if (nHandle == PROPERTY_ID_FORMATSSUPPLIER) if (nHandle == PROPERTY_ID_FORMATSSUPPLIER)
......
...@@ -81,10 +81,6 @@ class OFormattedModel ...@@ -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 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; 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 // XLoadListener
virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) override;
......
...@@ -55,12 +55,6 @@ css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() throw(s ...@@ -55,12 +55,6 @@ css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() throw(s
// ONumericModel // ONumericModel
Sequence<Type> ONumericModel::_getTypes()
{
return OEditBaseModel::_getTypes();
}
ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory) ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD, true, true ) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD, true, true )
// use the old control name for compytibility reasons // use the old control name for compytibility reasons
......
...@@ -31,8 +31,6 @@ class ONumericModel ...@@ -31,8 +31,6 @@ class ONumericModel
{ {
private: private:
css::uno::Any m_aSaveValue; css::uno::Any m_aSaveValue;
protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
public: public:
DECLARE_DEFAULT_LEAF_XTOR( ONumericModel ); DECLARE_DEFAULT_LEAF_XTOR( ONumericModel );
......
...@@ -56,12 +56,6 @@ css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(s ...@@ -56,12 +56,6 @@ css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(s
// OPatternModel // OPatternModel
Sequence<Type> OPatternModel::_getTypes()
{
return OEditBaseModel::_getTypes();
}
OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory) OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD, false, false ) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD, false, false )
// use the old control name for compytibility reasons // use the old control name for compytibility reasons
......
...@@ -38,9 +38,6 @@ private: ...@@ -38,9 +38,6 @@ private:
::std::unique_ptr< ::dbtools::FormattedColumnValue > ::std::unique_ptr< ::dbtools::FormattedColumnValue >
m_pFormattedValue; m_pFormattedValue;
protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
public: public:
DECLARE_DEFAULT_LEAF_XTOR( OPatternModel ); DECLARE_DEFAULT_LEAF_XTOR( OPatternModel );
......
...@@ -61,27 +61,6 @@ ORadioButtonControl::ORadioButtonControl(const Reference<XComponentContext>& _rx ...@@ -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) ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFactory)
:OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON ) :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON )
// use the old control name for compytibility reasons // use the old control name for compytibility reasons
......
...@@ -83,10 +83,6 @@ public: ...@@ -83,10 +83,6 @@ public:
{ return OUString("com.sun.star.form.ORadioButtonControl"); } { return OUString("com.sun.star.form.ORadioButtonControl"); }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; 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;
}; };
......
...@@ -250,9 +250,6 @@ namespace framework ...@@ -250,9 +250,6 @@ namespace framework
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; 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 ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
......
...@@ -3145,11 +3145,6 @@ void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32 n ...@@ -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 namespace detail
{ {
class InfoHelperBuilder class InfoHelperBuilder
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment