[Libreoffice-commits] core.git: forms/source framework/inc framework/source
Noel Grandin
noel at peralex.com
Wed Oct 5 11:56:05 UTC 2016
forms/source/component/Currency.cxx | 6 ------
forms/source/component/Currency.hxx | 3 ---
forms/source/component/Edit.cxx | 12 ------------
forms/source/component/Edit.hxx | 4 ----
forms/source/component/FormattedField.cxx | 10 ----------
forms/source/component/FormattedField.hxx | 4 ----
forms/source/component/Numeric.cxx | 6 ------
forms/source/component/Numeric.hxx | 2 --
forms/source/component/Pattern.cxx | 6 ------
forms/source/component/Pattern.hxx | 3 ---
forms/source/component/RadioButton.cxx | 21 ---------------------
forms/source/component/RadioButton.hxx | 4 ----
framework/inc/services/layoutmanager.hxx | 3 ---
framework/source/layoutmanager/layoutmanager.cxx | 5 -----
14 files changed, 89 deletions(-)
New commits:
commit 7cf9028d3b735c5a1929897e556357b5d18573a2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 5 13:51:46 2016 +0200
loplugin:unnecessaryoverride in forms/framework
Change-Id: Ia2aabec5af5559903be09e1ef81d156a7538ab3f
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index fe0005a..552b94e 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 2a61cd3..e09c3f2 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 e3dffb1..d082fc9 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 a828600..6a0b95a 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 174964f..6154097 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 beb5e70..e3d1f21 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 76a9156..9045f05 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 1403ee1..fff9bbc 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 ba27f23..9c2778e 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 6600e91..8c9b94c 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 6192383..863d0a2 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 ac1a31d..0f14839 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 c6699b3..7a895cc 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 e5e0e09..6c5c669 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
More information about the Libreoffice-commits
mailing list