diff options
| -rw-r--r-- | comphelper/source/property/propagg.cxx | 8 | ||||
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/DatabaseForm.hxx | 4 | ||||
| -rw-r--r-- | include/comphelper/propagg.hxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 5928578a1f2f..545da88d45f7 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -424,13 +424,13 @@ namespace internal } catch( const Exception& ) { - m_rAggregationHelper.forwardedPropertyValue( _nHandle, false ); + m_rAggregationHelper.forwardedPropertyValue( _nHandle ); throw; } m_nCurrentlyForwarding = -1; - m_rAggregationHelper.forwardedPropertyValue( _nHandle, true ); + m_rAggregationHelper.forwardedPropertyValue( _nHandle ); } } } @@ -1013,13 +1013,13 @@ void OPropertySetAggregationHelper::declareForwardedProperty( sal_Int32 _nHandle } -void SAL_CALL OPropertySetAggregationHelper::forwardingPropertyValue( sal_Int32 ) +void OPropertySetAggregationHelper::forwardingPropertyValue( sal_Int32 ) { // not interested in } -void SAL_CALL OPropertySetAggregationHelper::forwardedPropertyValue( sal_Int32, bool ) +void OPropertySetAggregationHelper::forwardedPropertyValue( sal_Int32 ) { // not interested in } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 64f098dd2925..418701c17be6 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1800,7 +1800,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A } -void SAL_CALL ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle ) +void ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle ) { OSL_ENSURE( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION, "ODatabaseForm::forwardingPropertyValue: unexpected property!" ); if ( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION ) @@ -1812,7 +1812,7 @@ void SAL_CALL ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle ) } -void SAL_CALL ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle, bool /*_bSuccess*/ ) +void ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle ) { OSL_ENSURE( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION, "ODatabaseForm::forwardedPropertyValue: unexpected property!" ); if ( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION ) diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 1e9386fd1cdd..c26cebf0e33f 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -443,8 +443,8 @@ public: protected: // OPropertySetAggregationHelper overridables - virtual void SAL_CALL forwardingPropertyValue( sal_Int32 _nHandle ); - virtual void SAL_CALL forwardedPropertyValue( sal_Int32 _nHandle, bool _bSuccess ); + virtual void forwardingPropertyValue( sal_Int32 _nHandle ) SAL_OVERRIDE; + virtual void forwardedPropertyValue( sal_Int32 _nHandle ) SAL_OVERRIDE; // OInterfaceContainer overridables virtual void implInserted( const ElementDescription* _pElement ); diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index 7765b6ca4656..8ec9e4d35f8d 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -301,7 +301,7 @@ protected: @see declareForwardedProperty @see forwardedPropertyValue */ - virtual void SAL_CALL forwardingPropertyValue( sal_Int32 _nHandle ); + virtual void forwardingPropertyValue( sal_Int32 _nHandle ); /** called immediately after a property value which is overwritten in this instance has been forwarded to the aggregate @@ -309,7 +309,7 @@ protected: @see declareForwardedProperty @see forwardingPropertyValue */ - virtual void SAL_CALL forwardedPropertyValue( sal_Int32 _nHandle, bool _bSuccess ); + virtual void forwardedPropertyValue( sal_Int32 _nHandle ); /// must be called before aggregation, if aggregation is used void setAggregation(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&) throw( ::com::sun::star::lang::IllegalArgumentException ); |