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 --- chart2/inc/ChartModel.hxx | 2 +- chart2/source/controller/accessibility/AccessibleChartElement.cxx | 4 ++-- chart2/source/controller/accessibility/AccessibleChartElement.hxx | 4 ++-- chart2/source/controller/inc/AccessibleBase.hxx | 2 +- chart2/source/controller/main/CommandDispatch.hxx | 2 +- chart2/source/inc/OPropertySet.hxx | 2 +- chart2/source/model/template/ChartTypeTemplate.hxx | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'chart2') diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 0b06d0b46f58..5b08111097b9 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -408,7 +408,7 @@ public: const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XTypeProvider (overloaded method of WeakImplHelper) + // lang::XTypeProvider (override method of WeakImplHelper) virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 1379b7cb2421..b92b64cd6bba 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -152,7 +152,7 @@ OUString SAL_CALL AccessibleChartElement::getImplementationName() return OUString( "AccessibleChartElement" ); } -// ________ AccessibleChartElement::XAccessibleContext (overloaded) ________ +// ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -160,7 +160,7 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName() GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ); } -// ________ AccessibleChartElement::XAccessibleContext (overloaded) ________ +// ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 18788dc81749..cfcb1594599e 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -53,7 +53,7 @@ namespace chart
  • define the getAccessibleName() method of XAccessibleContext
  • set the ChartModel using SetChartModel() for the first node before creating any children
    • -
  • overload UpdateChildren()
    • +
  • override UpdateChildren()
    • */ @@ -100,7 +100,7 @@ public: // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus - // these methods have to be overloaded and forward to AccessibleBase + // these methods have to be overridden and forward to AccessibleBase // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 5487a3bdfa29..a0794da69994 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -144,7 +144,7 @@ protected: */ void RemoveState( sal_Int16 aState ) throw (::com::sun::star::uno::RuntimeException); - /** has to be overloaded by derived classes that support child elements. + /** has to be overridden by derived classes that support child elements. With this method a rescan is initiated that should result in a correct list of children. diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index e28ec3ee96bc..e4255b2fc044 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -59,7 +59,7 @@ protected: /** sends a status event for a specific command to all registered listeners or only the one given when set. - This method should be overloaded. The implementation should call + This method should be overridden. The implementation should call fireStatusEventForURL and pass the xSingleListener argument to this method unchanged. diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 9fbe44106318..697f6cfaf225 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -82,7 +82,7 @@ protected: /** Try to convert the value rValue to the type required by the property associated with nHandle. - Overload this method to take influence in modification of properties. + Override this method to take influence in modification of properties. If the conversion changed , is returned and the converted value is in rConvertedValue. The former value is contained in diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index d37e870f16fe..4835b6785fa0 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -42,7 +42,7 @@ namespace chart createDiagramByDataSource This does the following steps using some virtual helper-methods, that may be - overloaded by derived classes: + overridden by derived classes: * creates an XDiagram via service-factory. @@ -124,7 +124,7 @@ protected: virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // Methods to overload for automatic creation + // Methods to override for automatic creation /// returns 2 by default. Supported are 2 and 3 virtual sal_Int32 getDimension() const; -- cgit