diff options
Diffstat (limited to 'svx')
23 files changed, 38 insertions, 38 deletions
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 90706b99e3de..c5e07fa0d946 100644 --- a/svx/inc/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx @@ -123,10 +123,10 @@ namespace sdr // high contrast display mode virtual bool isDrawModeHighContrast() const SAL_OVERRIDE; - // overloaded access to SdrPageView + // override access to SdrPageView virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE; - // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. + // access to OutputDevice. May return 0L like the default implementations do. Override as needed. virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; /** sets all UNO controls which are associated with this ObjectContact to diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx index 5965dcd0505c..47746ebc6d2b 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx @@ -204,7 +204,7 @@ public: // React on changes of the object of this ViewContact virtual void ActionChanged() SAL_OVERRIDE; - // overload for acessing the SdrPage + // override for acessing the SdrPage virtual SdrPage* TryToGetSdrPage() const SAL_OVERRIDE; protected: diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx index fc8cbfb93e15..56276f199b87 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx @@ -51,7 +51,7 @@ namespace sdr // This method will not handle included hierarchies and not check geometric visibility. drawinglayer::primitive3d::Primitive3DSequence createPrimitive3DSequence(const DisplayInfo& rDisplayInfo) const; - // also overload the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to + // also override the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to // answer the get2DRange question accordingly virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index fa62dd687344..c73e0814d35d 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx @@ -52,7 +52,7 @@ namespace sdr virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may - // be overloaded e.g for group objects to return a merged ItemSet of the object. + // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SfxItemState::DONTCARE which means there were several such items with different // values. diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 9e26c37ba9dc..6d20504eb861 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -50,8 +50,8 @@ namespace sdr // get itemset virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; - // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may - // be overloaded e.g for group objects to return a merged ItemSet of the object. + // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may + // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SfxItemState::DONTCARE which means there were several such items with different // values. diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index 1e842af16586..b4aef60f0ff0 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -63,7 +63,7 @@ namespace sdr virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may - // be overloaded e.g for group objects to return a merged ItemSet of the object. + // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SfxItemState::DONTCARE which means there were several such items with different // values. diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index 0ae85f674711..7de1a930abea 100644 --- a/svx/inc/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx @@ -53,7 +53,7 @@ namespace sdr // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; - // get itemset. Overloaded here to allow creating the empty itemset + // get itemset. Override here to allow creating the empty itemset // without asserting virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 72106d4a52d5..01d34f4660fe 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -70,7 +70,7 @@ void SpellDialogChildWindow::AddAutoCorrection( const OUString& /*rNew*/, LanguageType /*eLanguage*/) { - OSL_FAIL("AutoCorrection should have been overloaded - if available"); + OSL_FAIL("AutoCorrection should have been overridden - if available"); } bool SpellDialogChildWindow::HasGrammarChecking() @@ -80,13 +80,13 @@ bool SpellDialogChildWindow::HasGrammarChecking() bool SpellDialogChildWindow::IsGrammarChecking() { - OSL_FAIL("Grammar checking should have been overloaded - if available"); + OSL_FAIL("Grammar checking should have been overridden - if available"); return false; } void SpellDialogChildWindow::SetGrammarChecking(bool ) { - OSL_FAIL("Grammar checking should have been overloaded - if available"); + OSL_FAIL("Grammar checking should have been overridden - if available"); } } // end of namespace ::svx diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index a7b287a52465..b8696891fc0b 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2541,7 +2541,7 @@ void SvxRuler::EvalModifier() void SvxRuler::Click() { - /* Overloaded handler SV; sets Tab per dispatcher call */ + /* Override handler SV; sets Tab per dispatcher call */ Ruler::Click(); if( bActive ) { @@ -2595,7 +2595,7 @@ bool SvxRuler::CalcLimits ( long& nMax1, // minimum value to be set { /* Default implementation of the virtual function; the application can be - overloaded to implement customized limits. The values are based on the page. + overridden to implement customized limits. The values are based on the page. */ nMax1 = LONG_MIN; nMax2 = LONG_MAX; @@ -3346,7 +3346,7 @@ void SvxRuler::EndDrag() void SvxRuler::ExtraDown() { - /* Overloaded SV method, sets the new type for the Default tab. */ + /* Override SV method, sets the new type for the Default tab. */ // Switch Tab Type if(mpTabStopItem.get() && diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 71eda450209e..d746f4ecce4c 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -601,7 +601,7 @@ OUString E3dScene::TakeObjNamePlural() const return ImpGetResStr(STR_ObjNamePluralScene3d); } -// The NbcRotate routine overloads the one of the SdrObject. The idea is +// The NbcRotate routine overrides the one of the SdrObject. The idea is // to be able to rotate the scene relative to the position of the scene // and then the objects in the scene diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index e1e47c7ca4f5..1a506e05081c 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -230,7 +230,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) : InitView (); } -// DrawMarkedObj overloaded, since possibly only a single 3D object is to be +// DrawMarkedObj override, since possibly only a single 3D object is to be // drawn void E3dView::DrawMarkedObj(OutputDevice& rOut) const @@ -317,7 +317,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const } } -// Get overloaded model, since in some 3D objects an additional scene +// override get model, since in some 3D objects an additional scene // must be pushed in SdrModel* E3dView::GetMarkedObjModel() const diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index e0b756c0b6af..6e2627e3f12a 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -686,7 +686,7 @@ void FmFormObj::BrkCreate( SdrDragStat& rStat ) } -// #i70852# overload Layer interface to force to FormColtrol layer +// #i70852# override Layer interface to force to FormControl layer SdrLayerID FmFormObj::GetLayer() const { diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 96297639dbef..8663bc9e1b5d 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -100,7 +100,7 @@ protected: SAL_DLLPRIVATE virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual void BrkCreate( SdrDragStat& rStat ) SAL_OVERRIDE; - // #i70852# overload Layer interface to force to FormColtrol layer + // #i70852# override Layer interface to force to FormControl layer SAL_DLLPRIVATE virtual SdrLayerID GetLayer() const SAL_OVERRIDE; SAL_DLLPRIVATE virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index d3dfe2d240ef..949ac76952a8 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -163,7 +163,7 @@ namespace sdr // #114359# save old and set clip region OutputDevice* pOutDev = TryToGetOutputDevice(); - OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overloaded TryToGetOutputDevice wrong (!)"); + OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)"); bool bClipRegionPushed(false); const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea()); diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 7d0c249225ff..39053e8be4a9 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -186,7 +186,7 @@ bool ViewContact::isAnimatedInAnyViewObjectContact() const // Access to possible sub-hierarchy and parent. GetObjectCount() default is 0L // and GetViewContact default pops up an assert since it's an error if -// GetObjectCount has a result != 0 and it's not overloaded. +// GetObjectCount has a result != 0 and it's not overridden. sal_uInt32 ViewContact::GetObjectCount() const { // no sub-objects @@ -196,7 +196,7 @@ sal_uInt32 ViewContact::GetObjectCount() const ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const { // This is the default implementation; call would be an error - OSL_FAIL("ViewContact::GetViewContact: This call needs to be overloaded when GetObjectCount() can return results != 0 (!)"); + OSL_FAIL("ViewContact::GetViewContact: This call needs to be overridden when GetObjectCount() can return results != 0 (!)"); return (ViewContact&)(*this); } @@ -240,7 +240,7 @@ void ViewContact::ActionChanged() } // access to SdrObject and/or SdrPage. May return 0L like the default -// implementations do. Needs to be overloaded as needed. +// implementations do. Override as needed. SdrObject* ViewContact::TryToGetSdrObject() const { return 0L; diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index ac74b2f22d48..5e457dc4908a 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -127,7 +127,7 @@ void ViewContactOfSdrObj::ActionChanged() ViewContact::ActionChanged(); } -// overload for acessing the SdrObject +// override for acessing the SdrObject SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const { return &GetSdrObject(); diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index e1c652b21617..9ead73a18c88 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -579,7 +579,7 @@ void ViewContactOfSdrPage::ActionChanged() maViewContactOfHelplinesFront.ActionChanged(); } -// overload for acessing the SdrPage +// override for acessing the SdrPage SdrPage* ViewContactOfSdrPage::TryToGetSdrPage() const { return &GetSdrPage(); diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index d80b309207a2..9164d7512905 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -44,7 +44,7 @@ const SdrOle2Obj& ViewObjectContactOfSdrOle2Obj::getSdrOle2Object() const drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence( const DisplayInfo& /*rDisplayInfo*/) const { - // this method is overloaded to do some things the old SdrOle2Obj::DoPaintObject did. + // override this method to do some things the old SdrOle2Obj::DoPaintObject did. // In the future, some of these may be solved different, but ATM try to stay compatible // with the old behaviour drawinglayer::primitive2d::Primitive2DSequence xRetval; diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index bb09f9e602ba..6e3604648742 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -31,7 +31,7 @@ namespace sdr // create a new itemset SfxItemSet* PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - // overloaded to legally return a valid ItemSet + // override to legally return a valid ItemSet return new SfxItemSet(rPool); } @@ -54,7 +54,7 @@ namespace sdr return *(new PageProperties(*this, rObj)); } - // get itemset. Overloaded here to allow creating the empty itemset + // get itemset. Override here to allow creating the empty itemset // without asserting const SfxItemSet& PageProperties::GetObjectItemSet() const { @@ -75,7 +75,7 @@ namespace sdr SfxStyleSheet* PageProperties::GetStyleSheet() const { - // overloaded to legally return a 0L pointer here + // override to legally return a 0L pointer here return 0L; } diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index f4fd9c881b23..f95b83e4f0c2 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -86,27 +86,27 @@ namespace sdr void BaseProperties::Scale(const Fraction& /*rScale*/) { - // default implementation does nothing; overload where + // default implementation does nothing; override where // an ItemSet is implemented. } void BaseProperties::MoveToItemPool(SfxItemPool* /*pSrcPool*/, SfxItemPool* /*pDestPool*/, SdrModel* /*pNewModel*/) { // Move properties to a new ItemPool. Default implementation does nothing. - // Overload where an ItemSet is implemented. + // Override where an ItemSet is implemented. } void BaseProperties::SetModel(SdrModel* /*pOldModel*/, SdrModel* /*pNewModel*/) { // Set new model. Default implementation does nothing. - // Overload where an ItemSet is implemented. + // Override where an ItemSet is implemented. } void BaseProperties::ForceStyleToHardAttributes() { // force all attributes which come from styles to hard attributes // to be able to live without the style. Default implementation does nothing. - // Overload where an ItemSet is implemented. + // Override where an ItemSet is implemented. } void BaseProperties::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems) diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 4845fba2c3bf..b49aa0eb2945 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -33,7 +33,7 @@ class SdrDragView; class SdrDragMovHdl : public SdrDragMethod { protected: - // define nothing, overload to do so + // define nothing, override to do so virtual void createSdrDragEntries() SAL_OVERRIDE; public: diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 048ceb911455..264c6179b7a4 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -1378,7 +1378,7 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const // #i97878# // TRGetBaseGeometry/TRSetBaseGeometry needs to be based on two positions, -// same as line geometry in SdrPathObj. Thus needs to be overloaded and +// same as line geometry in SdrPathObj. Thus needs to be overridden and // implemented since currently it is derived from SdrTextObj which uses // a functionality based on SnapRect which is not useful here diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 33c0d67c918f..ebbacf522052 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -352,8 +352,8 @@ bool SdrUnoObj::hasSpecialDrag() const bool SdrUnoObj::supportsFullDrag() const { - // overloaded to have the possibility to enable/disable in debug and - // to ckeck some things out. Current solution is working, so default is + // override to have the possibility to enable/disable in debug and + // to check some things out. Current solution is working, so default is // enabled static bool bDoSupportFullDrag(true); |