From 2f69e16c723aab48ad59d17397d8946ec0a48138 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 8 Jan 2015 23:08:34 +0100 Subject: override the overloading of "overload" to decrease cognitive (over-)load Change-Id: I4d0e1de89d0bbdbea23bc5a46bf75ae0ce4e2796 --- forms/source/component/ImageControl.cxx | 3 ++- forms/source/component/clickableimage.cxx | 2 +- forms/source/inc/FormComponent.hxx | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'forms') diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 01bc858da06f..fa12c3ce0c4e 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -345,7 +345,8 @@ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [out] */ o_rAggregateProperties ) const { OBoundControlModel::describeAggregateProperties( o_rAggregateProperties ); - // remove ImageURL and Graphic properties, we "overload" them. This is because our aggregate synchronizes those + // remove ImageURL and Graphic properties, we "override" them. + // This is because our aggregate synchronizes those // two, but we have an own sychronization mechanism. RemoveProperty( o_rAggregateProperties, PROPERTY_IMAGE_URL ); RemoveProperty( o_rAggregateProperties, PROPERTY_GRAPHIC ); diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 71ad12e50887..d111fc8616fe 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -588,7 +588,7 @@ namespace frm Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { // order matters: - // we definitely want to "overload" the XImageProducer interface of our aggregate, + // we definitely want to "override" the XImageProducer interface of our aggregate, // thus check OClickableImageBaseModel_Base (which provides this) first Any aReturn = OClickableImageBaseModel_Base::queryInterface( _rType ); diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 21ca7fd44e41..e5b5ffc59ff7 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -499,8 +499,8 @@ protected: The default implementation simply asks m_xAggregateSet for its properties. - You usually only need to overload this method if you want to filter the aggregate - properties. + You usually only need to override this method if you want to filter the + aggregate properties. */ virtual void describeAggregateProperties( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps -- cgit