diff options
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/sdr/contact/objectcontactofpageview.hxx | 4 | ||||
| -rw-r--r-- | svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/sdr/properties/e3dcompoundproperties.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/sdr/properties/e3dsceneproperties.hxx | 4 | ||||
| -rw-r--r-- | svx/inc/sdr/properties/groupproperties.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/sdr/properties/pageproperties.hxx | 2 |
7 files changed, 9 insertions, 9 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; |