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

Change-Id: I4d0e1de89d0bbdbea23bc5a46bf75ae0ce4e2796

8 files changed, 16 insertions, 18 deletions

diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index f10cb4a6a55e..09b63255db00 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -188,10 +188,10 @@ public:
     // get Primitive2DParameters for this view
     const drawinglayer::geometry::ViewInformation2D& getViewInformation2D() const { return maViewInformation2D; }
 
-    // access to SdrPageView. May return 0L like the default implementations do. Needs to be overloaded as needed.
+    /// access to SdrPageView. May return 0L like the default implementations do. Override as needed.
     virtual SdrPageView* TryToGetSdrPageView() const;
 
-    // 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;
 
     // reset ViewPort at internal ViewInformation2D. This is needed when the OC is used
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 9ff322ff7e33..c3f55b884fc2 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -81,7 +81,6 @@ public:
     // pdf export? Default is false
     virtual bool isOutputToPDFFile() const SAL_OVERRIDE;
 
-    // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
     virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
 };
 
@@ -109,7 +108,6 @@ public:
     void SetStartPage(const SdrPage* pPage);
     const SdrPage* GetStartPage() const { return mxStartPage.get(); }
 
-    // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
     virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
 };
 
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index dae75a50e1ac..446fb15fc10a 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -110,7 +110,7 @@ public:
 
     // 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.
     virtual sal_uInt32 GetObjectCount() const;
     virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const;
     virtual ViewContact* GetParentContact() const;
@@ -123,7 +123,7 @@ public:
     virtual void 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.
     virtual SdrObject* TryToGetSdrObject() const;
     virtual SdrPage* TryToGetSdrPage() const;
 
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index e35cf85984a3..6d21e48b0e42 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -65,7 +65,7 @@ public:
     // React on changes of the object of this ViewContact
     virtual void ActionChanged() SAL_OVERRIDE;
 
-    // overload for acessing the SdrObject
+    /// override for accessing the SdrObject
     virtual SdrObject* TryToGetSdrObject() const SAL_OVERRIDE;
 
 
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 84b168946122..6dee41409975 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -42,7 +42,7 @@ public:
     virtual ~ViewObjectContactRedirector();
 
     // all default implementations just call the same methods at the original. To do something
-    // different, overload the method and at least do what the method does.
+    // different, override the method and at least do what the method does.
     virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence(
         const sdr::contact::ViewObjectContact& rOriginal,
         const sdr::contact::DisplayInfo& rDisplayInfo);
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index ec98225e0254..243b1c6c8a4a 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -99,7 +99,7 @@ namespace sdr
             bool                                            mbIsHittable : 1;
 
             // Flag to hold info if this objects supports animation. Default is
-            // false. If true, the Trigger() method should be overloaded
+            // false. If true, the Trigger() method should be overridden
             // to implement the animation effect and to re-initiate the event.
             bool                                            mbAllowsAnimation : 1;
 
@@ -126,7 +126,7 @@ namespace sdr
             OverlayManager* getOverlayManager() const { return mpOverlayManager; }
 
             // the access method for Primitive2DSequence. Will use createPrimitive2DSequence and
-            // setPrimitive2DSequence if needed. Overloading may be used to allow disposal of last
+            // setPrimitive2DSequence if needed. Overriding may be used to allow disposal of last
             // created primitives to react on changed circumstances and to re-create primitives
             virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const;
 
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index 1e4c136d7c00..846c6ba0ce12 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -71,7 +71,7 @@ namespace sdr
             const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; }
             bool getBorder() const { return mbBorder; }
 
-            // overloaded to check conditions for last createOverlayObjectPrimitive2DSequence
+            /// override to check conditions for last createOverlayObjectPrimitive2DSequence
             virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const SAL_OVERRIDE;
 
             // data write access
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 511b74956acc..d25970d46976 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -66,7 +66,7 @@ namespace sdr
             SdrObject& GetSdrObject();
 
             // Test changeability for a single item. If a implementation wants to prevent
-            // changing an item this method may be overloaded.
+            // changing an item it should override this method.
             virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const = 0;
 
             // Do the internal ItemChange. If only nWhich is given, the item needs to be cleared.
@@ -99,8 +99,8 @@ namespace sdr
             // merging of ItemSets is done for e.g. Group objects.
             virtual const SfxItemSet& GetObjectItemSet() const = 0;
 
-            // 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.
@@ -145,12 +145,12 @@ namespace sdr
             // Get the installed StyleSheet.
             virtual SfxStyleSheet* GetStyleSheet() const = 0;
 
-            // Scale the local ItemSet as far as it contains metric items. This needs to be
-            // overloaded to do it for hierarchical objects like e.g. groups.
+            // Scale the local ItemSet as far as it contains metric items.
+            // Override this to do it for hierarchical objects like e.g. groups.
             virtual void Scale(const Fraction& rScale);
 
-            // Move local items to a new ItemPool. This needs to be
-            // overloaded to do it for hierarchical objects like e.g. groups.
+            // Move local items to a new ItemPool.
+            // Override this to do it for hierarchical objects like e.g. groups.
             virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
 
             // Set new model.