Kaydet (Commit) 2f69e16c authored tarafından Michael Stahl's avatar Michael Stahl

override the overloading of "overload" to decrease cognitive (over-)load

Change-Id: I4d0e1de89d0bbdbea23bc5a46bf75ae0ce4e2796
üst d7bebc89
......@@ -47,7 +47,7 @@ public:
virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE;
protected:
// overloaded to handle HitTest for some objects special
/// override to handle HitTest for some objects specially
using SdrView::CheckSingleSdrObjectHit;
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE;
};
......
......@@ -24,7 +24,7 @@
#include <basic/sbmeth.hxx>
// basic module for JavaScript sources
// All the basic-specific methods must be overloaded virtually and must
// All the basic-specific methods must be overridden virtually and must
// be deactivated. The differentiation of normal modules is done by RTTI.
class SbJScriptMethod : public SbMethod
......
......@@ -23,7 +23,7 @@
#include <basic/sbmod.hxx>
// basic module for JavaScript sources
// All the basic-specific methods must be overloaded virtually and must
// All the basic-specific methods must be overridden virtually and must
// be deactivated. The differentiation of normal modules is done by RTTI.
class SbJScriptModule : public SbModule
......
......@@ -88,7 +88,7 @@ public:
SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
virtual ~SbUnoStructRefObject();
// Find overloaded to support e. g. NameAccess
// override Find to support e. g. NameAccess
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
// Force creation of all properties for debugging
......@@ -128,7 +128,7 @@ public:
// #76470 do introspection on demand
void doIntrospection( void );
// Find overloaded to support e. g. NameAccess
// override Find to support e. g. NameAccess
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
// Force creation of all properties for debugging
......
......@@ -295,7 +295,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
}
// Abbreviated version: The parent-string will be searched
// The whole thing recursive, because Call() might be overloaded
// The whole thing recursive, because Call() might be overridden
// Qualified names are allowed
bool SbxObject::Call( const OUString& rName, SbxArray* pParam )
......
......@@ -644,10 +644,7 @@ namespace vclcanvas
sal_Int32 nCount(0);
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
OUString text(
OUString::number(
// disambiguate overload...
nCount ) );
OUString text( OUString::number(nCount) );
// pad with leading space
while( text.getLength() < 3 )
......
......@@ -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;
......
......@@ -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)
{
......
......@@ -53,7 +53,7 @@ namespace chart
<li>define the getAccessibleName() method of XAccessibleContext</li>
<li>set the ChartModel using SetChartModel() for the first node before
creating any children</li>
<li>overload UpdateChildren()</li>
<li>override UpdateChildren()</li>
</ul>
*/
......@@ -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;
......
......@@ -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.
......
......@@ -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.
......
......@@ -82,7 +82,7 @@ protected:
/** Try to convert the value <code>rValue</code> to the type required by the
property associated with <code>nHandle</code>.
Overload this method to take influence in modification of properties.
Override this method to take influence in modification of properties.
If the conversion changed , </sal_True> is returned and the converted value
is in <code>rConvertedValue</code>. The former value is contained in
......
......@@ -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;
......
......@@ -66,7 +66,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
{
SAL_WARN( "connectivity.drivers","Should be overloaded!");
SAL_WARN("connectivity.drivers", "ODatabaseMetaData::getColumns() should be overridden!");
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
}
......
......@@ -567,7 +567,7 @@ void OCollection::disposeElements()
Reference< XPropertySet > OCollection::createDescriptor()
{
OSL_FAIL("Need to be overloaded when used!");
OSL_FAIL("createDescriptor() needs to be overridden when used!");
throw SQLException();
}
......
......@@ -297,8 +297,8 @@ void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference<
OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
// this is only correct for tables who haven't a schema or catalog name
OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to overload getName()!");
OSL_ENSURE(m_SchemaName.isEmpty(),"getName(): forgot to overload getName()!");
OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to override getName()!");
OSL_ENSURE(m_SchemaName.isEmpty(),"getName(): forgot to override getName()!");
return m_Name;
}
......
......@@ -985,7 +985,7 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt )
* FIXME: LoseFocus and GetFocus are signals from vcl that
* a window actually got/lost the focus, it never should be
* forwarded from another window, that is simply wrong.
* FIXME: overloading the virtual methods GetFocus and LoseFocus
* FIXME: overriding the virtual methods GetFocus and LoseFocus
* in SpellDialogChildWindow by making them pure is at least questionable.
* The only sensible thing would be to call the new Method differently,
* e.g. DialogGot/LostFocus or so.
......
......@@ -60,7 +60,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
SetExchangeSupport ();
// overload handlers
// set handlers
m_pBtFileopen->SetClickHdl ( LINK ( this, SvxHyperlinkDocTp, ClickFileopenHdl_Impl ) );
m_pBtBrowse->SetClickHdl ( LINK ( this, SvxHyperlinkDocTp, ClickTargetHdl_Impl ) );
m_pCbbPath->SetModifyHdl ( LINK ( this, SvxHyperlinkDocTp, ModifiedPathHdl_Impl ) );
......
......@@ -69,7 +69,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
m_pBtBrowse->Enable( true );
// overload handlers
// set handlers
Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
m_pRbtLinktypInternet->SetClickHdl( aLink );
m_pRbtLinktypFTP->SetClickHdl ( aLink );
......
......@@ -63,7 +63,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
// set defaults
m_pRbtMail->Check ();
// overload handlers
// set handlers
m_pRbtMail->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
m_pRbtNews->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
m_pBtAdrBook->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
......
......@@ -340,7 +340,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs()
void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick()
{
// sorting is stopped by this overloading
// sorting is stopped by this override
}
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
......
......@@ -800,7 +800,7 @@ SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry
void OfaACorrCheckListBox::HBarClick()
{
// sorting is stopped by this overload
// sorting is stopped by this override
}
void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
......
......@@ -368,7 +368,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
// overload handler
// set handler
m_pLbColor->SetSelectHdl(
LINK( this, SvxColorTabPage, SelectColorLBHdl_Impl ) );
m_pValSetColorList->SetSelectHdl(
......
......@@ -108,7 +108,7 @@ SvxGradientTabPage::SvxGradientTabPage
rXFSet.Put( aXGradientItem );
m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() );
// overload the handler
// set handler
m_pLbGradients->SetSelectHdl(
LINK( this, SvxGradientTabPage, ChangeGradientHdl_Impl ) );
m_pBtnAdd->SetClickHdl( LINK( this, SvxGradientTabPage, ClickAddHdl_Impl ) );
......
......@@ -303,7 +303,8 @@ private:
void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
/** approve that the object given may be inserted into the container. Should be overloaded by derived classes,
/** approve that the object given may be inserted into the container.
Should be overridden by derived classes,
the default implementation just checks the object to be non-void.
@throws IllegalArgumentException
......
......@@ -68,7 +68,7 @@ namespace dbaui
public:
OPreviewWindow(vcl::Window* _pParent);
// window overloads
// Window overrides
virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); }
......@@ -170,7 +170,7 @@ namespace dbaui
OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
virtual ~OAppDetailPageHelper();
// window overloads
// Window overrides
virtual void Resize() SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
......
......@@ -56,7 +56,7 @@ namespace dbaui
public:
OCreationList( OTasksWindow& _rParent );
// window overloads
// Window overrides
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
......@@ -125,7 +125,7 @@ namespace dbaui
OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView);
virtual ~OTasksWindow();
// window overloads
// Window overrides
virtual void Resize() SAL_OVERRIDE;
OApplicationDetailView* getDetailView() const { return m_pDetailView; }
......@@ -160,7 +160,7 @@ namespace dbaui
public:
OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode);
virtual ~OApplicationDetailView();
// window overloads
// Window overrides
virtual void GetFocus() SAL_OVERRIDE;
/** creates the tables page
......
......@@ -43,7 +43,7 @@ namespace dbaui
public:
OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow );
virtual ~OApplicationSwapWindow();
// window overloads
// Window overrides
virtual void Resize() SAL_OVERRIDE;
bool isCutAllowed() SAL_OVERRIDE { return false; }
......
......@@ -37,7 +37,7 @@ namespace dbaui
OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
virtual ~OTitleWindow();
// window overloads
// Window overrides
virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
......
......@@ -56,7 +56,7 @@ namespace dbaui
OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode);
virtual ~OAppBorderWindow();
// window overloads
// Window overrides
virtual void GetFocus() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
......@@ -110,7 +110,7 @@ namespace dbaui
/// automatically creates mnemonics for the texts in our task pane
void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics );
// window overloads
// Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
......
......@@ -67,7 +67,7 @@ public:
virtual ~OUserAdmin();
OUString GetUser();
// must be overloaded by subclasses, but it isn't pure virtual
// subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
......
......@@ -116,7 +116,7 @@ namespace dbaui
// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~GeneratedValuesPage();
// must be overloaded by subclasses, but it isn't pure virtual
// subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
......
......@@ -75,7 +75,7 @@ namespace dbaui
virtual ~OCommonBehaviourTabPage();
// must be overloaded by subclasses, but it isn't pure virtual
// subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
......
......@@ -96,7 +96,7 @@ namespace dbaui
/// late construction
virtual void Construct() SAL_OVERRIDE;
virtual void initialize() SAL_OVERRIDE;
// window overloads
// Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
......
......@@ -67,7 +67,7 @@ namespace dbaui
{
}
// Window overload
// Window overrides
// virtual bool PreNotify( NotifyEvent& rNEvt );
// Edit
virtual void Modify() SAL_OVERRIDE;
......@@ -88,7 +88,7 @@ namespace dbaui
{
}
// Window overload
// Window overrides
// Edit
virtual void Modify() SAL_OVERRIDE;
};
......
......@@ -44,7 +44,7 @@ namespace dbaui
public:
OTableBorderWindow(vcl::Window* pParent);
virtual ~OTableBorderWindow();
// window overloads
// Window overrides
virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
......@@ -78,7 +78,7 @@ namespace dbaui
OTableController& _rController);
virtual ~OTableDesignView();
// window overloads
// Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
......
......@@ -39,7 +39,7 @@ namespace dbaui
public:
OSplitterView(vcl::Window* _pParent,bool _bVertical = true);
virtual ~OSplitterView();
// window overloads
// Window overrides
virtual void GetFocus() SAL_OVERRIDE;
void setSplitter(Splitter* _pSplitter);
......
......@@ -233,7 +233,7 @@ namespace dbaui
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > CreateForm();
// our default implementation simply instantiates a stardiv.one.form.component.Form service
// (probably this needs not to be overloaded, but you may return anything you want as long as it
// (probably this needs not to be overridden, but you may return anything you want as long as it
// supports the ::com::sun::star::form::DatabaseForm service. For instance you may want to create an adapter here which
// is synchronized with a foreign ::com::sun::star::form::DatabaseForm you got elsewhere)
virtual bool InitializeForm(
......
......@@ -163,7 +163,7 @@ namespace dbaui
bool IsReadOnly() { return bReadOnly;}
OFieldDescription* GetFieldDescr( long nRow );
// window overloads
// Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
// IClipboardTest
......
......@@ -62,7 +62,7 @@ namespace dbaui
void SaveData( OFieldDescription* pFieldDescr );
void SetReadOnly( bool bReadOnly );
// window overloads
// Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
......
......@@ -531,7 +531,7 @@ namespace drawinglayer
used to support the old XOR paint-'trick'.
It does not need an own identifier since a renderer who wants to interpret
it itself may do so. It just overloads the decomposition of the C++
it itself may do so. It just overrides the decomposition of the C++
implementation class to do an alternative decomposition.
*/
class NonOverlappingFillGradientPrimitive2D : public FillGradientPrimitive2D
......
......@@ -1941,7 +1941,7 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
{
// derived objects may overload this function to give access to
// derived objects may override this function to give access to
// bullet information (see Outliner)
(void) nPara;
return 0;
......
......@@ -4233,7 +4233,8 @@ const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode
DBG_ASSERT( nPara < EE_PARA_NOT_FOUND, "node not found in array" );
if (nPara < EE_PARA_NOT_FOUND)
{
// the called function may be overloaded by an OutlinerEditEng object to provide
// the called function may be overridden by an OutlinerEditEng
// object to provide
// access to the SvxNumberFormat of the Outliner.
// The EditEngine implementation will just return 0.
pRes = pEditEngine->GetNumberFormat( nPara );
......
......@@ -43,7 +43,7 @@ public class NativeView extends java.awt.Canvas
* ctor
* Does nothing really.
* We can use our JNI mechanism for an already visible
* canvas only. So we overload the method for showing ( "setVisible()" )
* canvas only. So we override the method for showing ( "setVisible()" )
* and make our intialization there. BUt we try to show an empty clean
* window till there.
*/
......@@ -57,7 +57,7 @@ public class NativeView extends java.awt.Canvas
/**
* Overload this method to make necessary initializations here.
* Override this method to make necessary initializations here.
* ( e.g. get the window handle and necessary system information )
*
* Why here?
......@@ -96,7 +96,7 @@ public class NativeView extends java.awt.Canvas
/**
* overload paint routine to show provide against
* override paint routine to show provide against
* repaint errors if no office view is really plugged
* into this canvas.
* If handle is present - we shouldn't paint anything further.
......
......@@ -65,7 +65,7 @@ public:
class declaration ProviderOleWrapper_Impl
Provides an UNO service provider as OLE class factory. Handle the
OLE registration by overloading the abstract methods from
OLE registration by overriding the abstract methods from
IClassFactoryWrapper.
Acts as a COM class factory. When IClassFactory::CreateInstance is being called
......@@ -109,7 +109,7 @@ protected:
class declaration OneInstanceOleWrapper_Impl
Provides an single UNO object as OLE object. Handle the
OLE registration by overloading the abstract methods from
OLE registration by overriding the abstract methods from
IClassFactoryWrapper.
Acts as a COM class factory. When IClassFactory::CreateInstance is being called
......
......@@ -6476,7 +6476,7 @@ bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader& /* rHd */ , void* /* pData */, DffObjData& /* rObj */ )
{
return; // will be overloaded by SJ in Draw
return; // will be overridden by SJ in Draw
}
bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SvStorageRef&, uno::Reference < embed::XStorage >& ) const
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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
......