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 --- sw/inc/cellfml.hxx | 2 +- sw/inc/dcontact.hxx | 2 +- sw/inc/drawdoc.hxx | 2 +- sw/inc/format.hxx | 4 ++-- sw/inc/frmfmt.hxx | 2 +- sw/inc/shellio.hxx | 2 +- sw/qa/extras/inc/swmodeltestbase.hxx | 2 +- sw/source/core/access/acccontext.cxx | 12 ++++++------ sw/source/core/attr/cellatr.cxx | 2 +- sw/source/core/attr/format.cxx | 4 ++-- sw/source/core/draw/dcontact.cxx | 4 ++-- sw/source/core/draw/dview.cxx | 2 +- sw/source/core/inc/dflyobj.hxx | 2 +- sw/source/core/inc/dview.hxx | 4 ++-- sw/source/core/inc/swcache.hxx | 3 ++- sw/source/core/layout/atrfrm.cxx | 2 +- sw/source/filter/basflt/shellio.cxx | 2 +- sw/source/filter/writer/writer.cxx | 2 +- sw/source/filter/ww8/escher.hxx | 2 +- sw/source/filter/ww8/wrtww8.hxx | 3 +-- sw/source/uibase/app/docsh.cxx | 2 +- sw/source/uibase/app/docst.cxx | 2 +- sw/source/uibase/docvw/AnnotationMenuButton.hxx | 4 ++-- 23 files changed, 34 insertions(+), 34 deletions(-) (limited to 'sw') diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index 9e6523ca4919..9f06a1afbb3a 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -92,7 +92,7 @@ protected: // find the node in which the formula is located // TextFeld -> TextNode, // BoxAttribut -> BoxStartNode - // !!! has to be overloaded by every derivation !!! + // !!! every derived class must override this !!! virtual const SwNode* GetNodeOfFormula() const = 0; SwTableFormula( const OUString& rFormula ); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 5dcc8ca3e691..fedf84454b19 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -272,7 +272,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; - /// All overloaded methods which need to use the offset + /// All overridden methods which need to use the offset virtual void RecalcBoundRect() SAL_OVERRIDE; virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index 2bc65c6c0362..6afd3fd042fe 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -43,7 +43,7 @@ public: virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const SAL_OVERRIDE; protected: - /// overload of is needed to provide corresponding uno model. + /// override of is needed to provide corresponding uno model. virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE; }; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 321bd8846dee..6fe3f0a76c11 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -311,7 +311,7 @@ public: /** SwFmt::IsBackgroundTransparent Virtual method to determine, if background of format is transparent. - Default implementation returns false. Thus, subclasses have to overload + Default implementation returns false. Thus, subclasses have to override method, if the specific subclass can have a transparent background. @author OD @@ -323,7 +323,7 @@ public: /** SwFmt::IsShadowTransparent Virtual method to determine, if shadow of format is transparent. - Default implementation returns false. Thus, subclasses have to overload + Default implementation returns false. Thus, subclasses have to override method, if the specific subclass can have a transparent shadow. @author OD diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index e4c6e58b61ad..84baec5e1a86 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -197,7 +197,7 @@ public: /** SwFlyFrmFmt::IsBackgroundTransparent - Overloading virtual method and its default implementation, + Override virtual method and its default implementation, because format of fly frame provides transparent backgrounds. Method determines, if background of fly frame is transparent. diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 6b97b2f739e3..b7b33e258f11 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -263,7 +263,7 @@ private: virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &)=0; // Everyone who does not need the streams / storages open - // has to overload the method (W4W!!). + // has to override the method (W4W!!). virtual bool SetStrmStgPtr(); }; diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 30b642cc5d42..e1840dd3054a 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -268,7 +268,7 @@ protected: } /** - * Function overloaded by unit test. See DECLARE_SW_*_TEST macros + * Function overridden by unit test. See DECLARE_SW_*_TEST macros */ virtual void verify() { diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 8021c1908a98..414bf5141473 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -680,8 +680,8 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void) OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void) throw (uno::RuntimeException, std::exception) { - OSL_ENSURE( false, "description needs to be overloaded" ); - THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" ); + OSL_ENSURE(false, "description needs to be overriden"); + THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overridden)" ); } OUString SAL_CALL SwAccessibleContext::getAccessibleName (void) @@ -988,9 +988,9 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground() OUString SAL_CALL SwAccessibleContext::getImplementationName() throw( uno::RuntimeException, std::exception ) { - OSL_ENSURE( false, "implementation name needs to be overloaded" ); + OSL_ENSURE( false, "implementation name needs to be overridden" ); - THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" ) + THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overridden" ) } sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName) @@ -1002,8 +1002,8 @@ sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceN uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - OSL_ENSURE( false, "supported services names needs to be overloaded" ); - THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overloaded" ) + OSL_ENSURE( false, "supported services names needs to be overridden" ); + THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overridden" ) } void SwAccessibleContext::DisposeShape( const SdrObject *pObj, diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 8586cdf480da..2ef00af60f7e 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -75,7 +75,7 @@ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const E.g. TextFeld -> TextNode, or BoxAttribute -> BoxStartNode - Caution: Has to be overloaded when inheriting. + Caution: Must override when inheriting. */ const SwNode* SwTblBoxFormula::GetNodeOfFormula() const { diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 036f9451ffab..0a2d85d7b3fe 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -766,7 +766,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet ) /** SwFmt::IsBackgroundTransparent Virtual method to determine, if background of format is transparent. - Default implementation returns false. Thus, subclasses have to overload + Default implementation returns false. Thus, subclasses have to override method, if the specific subclass can have a transparent background. @return false, default implementation @@ -779,7 +779,7 @@ bool SwFmt::IsBackgroundTransparent() const /** SwFmt::IsShadowTransparent Virtual method to determine, if shadow of format is transparent. - Default implementation returns false. Thus, subclasses have to overload + Default implementation returns false. Thus, subclasses have to override method, if the specific subclass can have a transparent shadow. @return false, default implementation diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 7d9364287ae5..9d10d293bee7 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -753,7 +753,7 @@ SdrObject* SwDrawContact::GetMaster() } /** - * @note Overloading in order to assert, if the + * @note Override in order to assert, if the * 'master' drawing object is replaced. The latter is correctly handled, * if handled by method . Thus, * assert only, if a debug level is given. @@ -2525,7 +2525,7 @@ bool SwDrawVirtObj::HasTextEdit() const return rRefObj.HasTextEdit(); } -// overloaded 'layer' methods for 'virtual' drawing object to assure, +// override 'layer' methods for 'virtual' drawing object to assure // that layer of 'virtual' object is the layer of the referenced object. SdrLayerID SwDrawVirtObj::GetLayer() const { diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 77355c3ec781..b7f28fcb6bd4 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -192,7 +192,7 @@ SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTo if(pRetval) { - // overloaded to allow extra handling when picking SwVirtFlyDrawObj's + // override to allow extra handling when picking SwVirtFlyDrawObj's pRetval = impLocalHitCorrection(pRetval, rPnt, nTol, GetMarkedObjectList()); } diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 058e64c13d8e..4afba0e1b51a 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -83,7 +83,7 @@ public: SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly); virtual ~SwVirtFlyDrawObj(); - // overloaded method of base class SdrVirtObj + // override method of base class SdrVirtObj virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE; // we treat the size calculation completely on ourself here diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index f556a8bca5dc..4c5ec084dcb1 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -71,7 +71,7 @@ protected: // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl() SAL_OVERRIDE; - // overloaded to allow extra handling when picking SwVirtFlyDrawObj's + // override to allow extra handling when picking SwVirtFlyDrawObj's using FmFormView::CheckSingleSdrObjectHit; virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE; @@ -87,7 +87,7 @@ public: virtual void MarkListHasChanged() SAL_OVERRIDE; // #i7672# - // Overload to resue edit background color in active text edit view (OutlinerView) + // Override to resue edit background color in active text edit view (OutlinerView) virtual void ModelHasChanged() SAL_OVERRIDE; virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 0eee0c13f982..6657b1ca85f7 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -215,7 +215,8 @@ public: virtual bool IsAvailable() const; - /// Shorthand for those who know, that they did not overload isAvailable() + /// Shorthand for those who know that they did not override isAvailable() + /// FIXME: wtf? bool IsAvail() const { return pObj != 0; } }; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index a0f0bd2eb487..ec3c2945f2ff 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3093,7 +3093,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657# - OD 22.08.2002 - overloading virtual method and its default implementation, + OD 22.08.2002 - overriding virtual method and its default implementation, because format of fly frame provides transparent backgrounds. Method determines, if background of fly frame is transparent. diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 5065816cdff3..29e88fc1bf31 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -573,7 +573,7 @@ void Reader::MakeHTMLDummyTemplateDoc() } // Users that do not need to open these Streams / Storages, -// have to overload this method +// have to override this method bool Reader::SetStrmStgPtr() { OSL_ENSURE( pMedium, "Where is the Media??" ); diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 8b5b0ed8f291..d71d7c3bba7e 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -283,7 +283,7 @@ void Writer::SetupFilterOptions(SfxMedium& /*rMedium*/) sal_uLong Writer::Write( SwPaM& rPam, SfxMedium& rMedium, const OUString* pFileName ) { SetupFilterOptions(rMedium); - // This method must be overloaded in SwXMLWriter a storage from medium will be used there. + // This method must be overridden in SwXMLWriter a storage from medium will be used there. // The microsoft format can write to storage but the storage will be based on the stream. return Write( rPam, *rMedium.GetOutStream(), pFileName ); } diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index a03ff22cdfe9..5c345615b179 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -80,7 +80,7 @@ public: virtual ~SwEscherExGlobal(); private: - /** Overloaded to create a new memory stream for picture data. */ + /** Override to create a new memory stream for picture data. */ virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; private: diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 09dd0dca96bd..2e405b083486 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1431,8 +1431,7 @@ public: }; /** The class MSWordAttrIter is a helper class to build the Fkp.chpx. - This class may be overloaded for output the SwTxtAttrs and the - EditEngineTxtAttrs. + This is a base class to output the SwTxtAttrs and the EditEngineTxtAttrs. */ class MSWordAttrIter { diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index bcaa39ca24c1..285b5a07d1d0 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -799,7 +799,7 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor return bRet; } -// Draw()-Overload for OLE2 (Sfx) +// Draw()-Override for OLE2 (Sfx) void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, sal_uInt16 nAspect ) { diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 05914a78b074..dcd14a2341e7 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -1247,7 +1247,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocu This method is called by SFx if Styles have to be reloaded from a document-template. Existing Styles should be overwritten by that. That's why the document has to be reformatted. Therefore applications - will usually overload this method and call the baseclass' implementation + will usually override this method and call the baseclass' implementation in their implementation. */ // When the source is our document, we do the checking ourselves diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index 603dbb62c26b..1bc2c13a56c1 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -34,10 +34,10 @@ class AnnotationMenuButton : public MenuButton AnnotationMenuButton( sw::sidebarwindows::SwSidebarWin& rSidebarWin ); virtual ~AnnotationMenuButton(); - // overloaded methods + // override MenuButton methods virtual void Select() SAL_OVERRIDE; - // overloaded methods + // override vcl::Window methods virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; -- cgit