[Libreoffice-commits] core.git: 2 commits - comphelper/source forms/source include/comphelper include/toolkit
Stephan Bergmann
sbergman at redhat.com
Thu Mar 13 06:01:04 PDT 2014
comphelper/source/property/propagg.cxx | 8 ++++----
forms/source/component/DatabaseForm.cxx | 4 ++--
forms/source/component/DatabaseForm.hxx | 4 ++--
include/comphelper/propagg.hxx | 4 ++--
include/toolkit/awt/vclxgraphics.hxx | 12 ++++++------
5 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 22684273d58b1ae9146fcc6c8dfceb90ddf846d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 13 14:00:03 2014 +0100
forward*PropertyValue functions need not be SAL_CALL
...and _bSuccess parameter is unused
Change-Id: Iee5e1d5c2d4272f342b2867bfe76f8c87dcd69d4
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 5928578..545da88 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 64f098d..418701c 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 1e9386f..c26cebf 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 7765b6c..8ec9e4d 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 );
commit a60275ed8ca84a7fade2206bd8eed4e3bd7a8068
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 13 13:57:50 2014 +0100
...and now actually non-virtual
...as promised by 81c9fe933e4aed25b0fe801c1fea856f02381282 "Getter members of
VCLXGraphics not in XGraphics need not be virtual."
Change-Id: I18c89056af5d29504f107937b96af632887a4702
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index dea8264..7290e6a 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -95,17 +95,17 @@ public:
// ::com::sun::star::awt::XGraphics Attributes
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL;
+ ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL;
+ ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL;
+ ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL;
+ ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL;
+ ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > getFont() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > getFont() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception);
More information about the Libreoffice-commits
mailing list